From b4b4531570c08ab2b455ef23350ef7de99a77fcf Mon Sep 17 00:00:00 2001 From: mozul Date: Tue, 7 Mar 2017 09:05:38 +0100 Subject: [PATCH] [TUTORIALS] update notebooks --- .../Tutorials/pre/DK_BoxJC/DK_BoxJC.ipynb | 110 ++++++++-- examples/Tutorials/pre/Masonry/Masonry.ipynb | 100 ++++++--- .../Tutorials/pre/avatar/RigidAvatar.ipynb | 192 +++++++++++++----- .../Tutorials/pre/deposit/Deposit2D.ipynb | 45 +++- .../Tutorials/pre/granulo/granulometry.ipynb | 53 +++-- 5 files changed, 390 insertions(+), 110 deletions(-) diff --git a/examples/Tutorials/pre/DK_BoxJC/DK_BoxJC.ipynb b/examples/Tutorials/pre/DK_BoxJC/DK_BoxJC.ipynb index 588cfe0..a3421ba 100644 --- a/examples/Tutorials/pre/DK_BoxJC/DK_BoxJC.ipynb +++ b/examples/Tutorials/pre/DK_BoxJC/DK_BoxJC.ipynb @@ -3,6 +3,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -13,7 +15,10 @@ }, { "cell_type": "markdown", - "metadata": {}, + "metadata": { + "deletable": true, + "editable": true + }, "source": [ "F. Dubois - 2016" ] @@ -21,6 +26,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -32,6 +39,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -45,6 +54,8 @@ "execution_count": null, "metadata": { "collapsed": false, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -68,6 +79,8 @@ "cell_type": "markdown", "metadata": { "collapsed": true, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -81,6 +94,8 @@ "execution_count": null, "metadata": { "collapsed": true, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -101,6 +116,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -114,6 +131,8 @@ "execution_count": null, "metadata": { "collapsed": true, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -121,17 +140,19 @@ "outputs": [], "source": [ "# on cree un modele de rigide\n", - "mod = model(name='rigid', type='MECAx', element='Rxx2D', dimension=dim)\n", + "mod = model(name='rigid', physics='MECAx', element='Rxx2D', dimension=dim)\n", "\n", "# creations de deux materiaux\n", - "tdur = material(name='TDURx',type='RIGID',density=1000.)\n", - "plex = material(name='PLEXx',type='RIGID',density=100.)\n", + "tdur = material(name='TDURx',materialType='RIGID',density=1000.)\n", + "plex = material(name='PLEXx',materialType='RIGID',density=100.)\n", "mat.addMaterial(tdur,plex)" ] }, { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -145,6 +166,8 @@ "execution_count": null, "metadata": { "collapsed": true, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -165,6 +188,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -178,6 +203,8 @@ "execution_count": null, "metadata": { "collapsed": false, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -206,6 +233,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -218,7 +247,9 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": false + "collapsed": false, + "deletable": true, + "editable": true }, "outputs": [], "source": [ @@ -251,7 +282,10 @@ }, { "cell_type": "markdown", - "metadata": {}, + "metadata": { + "deletable": true, + "editable": true + }, "source": [ "Applying loads" ] @@ -260,18 +294,20 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": false + "collapsed": false, + "deletable": true, + "editable": true }, "outputs": [], "source": [ "# predefined : [ ct + amp * cos(omega*t+phi) ] * sgn(rampi + ramp*t) * min(abs(rampi + ramp*t), 1)\n", "\n", - "up.imposeDrivenDof(component=2, dofty='force',type='predefined',\n", + "up.imposeDrivenDof(component=2, dofty='force',description='predefined',\n", " ct=10.0, amp=0.0, omega=0.0, phi=0.0, rampi=1.0, ramp=0.0)\n", "\n", "# evolution : giving a file containing t,f(t)\n", "\n", - "right.imposeDrivenDof(component=1,dofty='vlocy',type='evolution',evolutionFile='vx.dat')\n", + "right.imposeDrivenDof(component=1,dofty='vlocy',description='evolution',evolutionFile='vx.dat')\n", "\n", "# more details:\n", "# help(up.imposeDrivenDof)" @@ -279,7 +315,10 @@ }, { "cell_type": "markdown", - "metadata": {}, + "metadata": { + "deletable": true, + "editable": true + }, "source": [ "Building an evolution file:" ] @@ -288,7 +327,9 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": false + "collapsed": false, + "deletable": true, + "editable": true }, "outputs": [], "source": [ @@ -313,6 +354,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -326,6 +369,8 @@ "execution_count": null, "metadata": { "collapsed": false, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -335,10 +380,10 @@ "# gestion des interactions :\n", "# * declaration des lois\n", "# - entre particules\n", - "ldkdk=tact_behav(name='iqsc0',type='IQS_CLB',fric=0.3)\n", + "ldkdk=tact_behav(name='iqsc0',law='IQS_CLB',fric=0.3)\n", "tacts+=ldkdk\n", "# - avec les parois\n", - "ldkjc=tact_behav(name='iqsc1',type='IQS_CLB',fric=0.5)\n", + "ldkjc=tact_behav(name='iqsc1',law='IQS_CLB',fric=0.5)\n", "tacts+=ldkjc\n", "\n", "# see possible tact_behav\n", @@ -349,7 +394,10 @@ }, { "cell_type": "markdown", - "metadata": {}, + "metadata": { + "deletable": true, + "editable": true + }, "source": [ "Defining see tables" ] @@ -358,7 +406,9 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": true + "collapsed": true, + "deletable": true, + "editable": true }, "outputs": [], "source": [ @@ -378,6 +428,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -391,6 +443,8 @@ "execution_count": null, "metadata": { "collapsed": false, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -411,6 +465,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -424,6 +480,8 @@ "execution_count": null, "metadata": { "collapsed": true, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -438,7 +496,10 @@ }, { "cell_type": "markdown", - "metadata": {}, + "metadata": { + "deletable": true, + "editable": true + }, "source": [ "postprocessing" ] @@ -447,12 +508,14 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": false + "collapsed": false, + "deletable": true, + "editable": true }, "outputs": [], "source": [ "post = postpro_commands()\n", - "my_command=postpro_command(type='SOLVER INFORMATIONS', step=1)\n", + "my_command=postpro_command(name='SOLVER INFORMATIONS', step=1)\n", "post.addCommand(my_command)\n", "#\n", "writePostpro(commands=post, parts=bodies, path='DATBOX/')\n", @@ -462,6 +525,15 @@ "# parameters of 'BODY TRACKING'\n", "print config.lmgc90dicts.commandOptions['BODY TRACKING']" ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": { + "collapsed": true + }, + "outputs": [], + "source": [] } ], "metadata": { @@ -481,7 +553,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython2", - "version": "2.7.11" + "version": "2.7.13" } }, "nbformat": 4, diff --git a/examples/Tutorials/pre/Masonry/Masonry.ipynb b/examples/Tutorials/pre/Masonry/Masonry.ipynb index b2facd7..9c09b01 100644 --- a/examples/Tutorials/pre/Masonry/Masonry.ipynb +++ b/examples/Tutorials/pre/Masonry/Masonry.ipynb @@ -3,6 +3,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -14,6 +16,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -25,6 +29,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -39,6 +45,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -51,7 +59,9 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": false + "collapsed": false, + "deletable": true, + "editable": true }, "outputs": [], "source": [ @@ -63,7 +73,10 @@ }, { "cell_type": "markdown", - "metadata": {}, + "metadata": { + "deletable": true, + "editable": true + }, "source": [ "Creating a brick generator" ] @@ -72,7 +85,9 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": false + "collapsed": false, + "deletable": true, + "editable": true }, "outputs": [], "source": [ @@ -88,7 +103,10 @@ }, { "cell_type": "markdown", - "metadata": {}, + "metadata": { + "deletable": true, + "editable": true + }, "source": [ "Creating a line of brick" ] @@ -97,14 +115,16 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": false + "collapsed": false, + "deletable": true, + "editable": true }, "outputs": [], "source": [ "nb_bricks = 12\n", "bodies = avatars()\n", - "mat = material(name='PLEXx',type='RIGID',density=2000.)\n", - "mod = model(name='rigid', type='MECAx', element='Rxx2D', dimension=dim)\n", + "mat = material(name='PLEXx',materialType='RIGID',density=2000.)\n", + "mod = model(name='rigid', physics='MECAx', element='Rxx2D', dimension=dim)\n", "\n", "for i in xrange(nb_bricks):\n", " bodies += brick.rigidBrick(center=[i*lx, ly/2.], model=mod, material=mat, color='BLUEx')\n", @@ -115,7 +135,10 @@ }, { "cell_type": "markdown", - "metadata": {}, + "metadata": { + "deletable": true, + "editable": true + }, "source": [ "Creating a wall with a window (pouah)" ] @@ -124,7 +147,9 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": false + "collapsed": false, + "deletable": true, + "editable": true }, "outputs": [], "source": [ @@ -136,8 +161,8 @@ "dim = 2\n", "\n", "bodies = avatars()\n", - "mat = material(name='PLEXx',type='RIGID',density=2000.)\n", - "mod = model(name='rigid', type='MECAx', element='Rxx2D', dimension=dim)\n", + "mat = material(name='PLEXx',materialType='RIGID',density=2000.)\n", + "mod = model(name='rigid', physics='MECAx', element='Rxx2D', dimension=dim)\n", "\n", "# bricks, half-brick, linteau and opening definition\n", "brick = brick2D('brick', 1.e-1, 5.e-2)\n", @@ -201,7 +226,7 @@ "svs = see_tables()\n", "tacts = tact_behavs()\n", "\n", - "mut = material(name='TDURx',type='RIGID',density=2500.)\n", + "mut = material(name='TDURx',materialType='RIGID',density=2500.)\n", "mats.addMaterial(mat,mut)\n", "\n", "floor = rigidJonc(axe1=3.e-1, axe2=2.5e-2, center=[2.5e-1, -2.5e-2], \n", @@ -216,9 +241,9 @@ " pass\n", "\n", "# interactions management :\n", - "lplpl=tact_behav(name='iqsc0',type='IQS_CLB',fric=0.3)\n", + "lplpl=tact_behav(name='iqsc0',law='IQS_CLB',fric=0.3)\n", "tacts+=lplpl\n", - "lpljc=tact_behav(name='iqsc1',type='IQS_CLB',fric=0.5)\n", + "lpljc=tact_behav(name='iqsc1',law='IQS_CLB',fric=0.5)\n", "tacts+=lpljc\n", "svbbbb = see_table(CorpsCandidat='RBDY2',candidat='POLYG', colorCandidat='BLEUx',behav=lplpl,\n", " CorpsAntagoniste='RBDY2', antagoniste='POLYG',colorAntagoniste='BLEUx',alert=5.e-3)\n", @@ -251,6 +276,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -261,7 +288,10 @@ }, { "cell_type": "markdown", - "metadata": {}, + "metadata": { + "deletable": true, + "editable": true + }, "source": [ "Creating a 3D brick generator" ] @@ -270,7 +300,9 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": true + "collapsed": true, + "deletable": true, + "editable": true }, "outputs": [], "source": [ @@ -278,15 +310,18 @@ "lx=0.22\n", "ly=0.11\n", "lz=0.06\n", - "mat = material(name='PLEXx',type='RIGID',density=2000.)\n", - "mod = model(name='rigid', type='MECAx', element='Rxx3D', dimension=dim)\n", + "mat = material(name='PLEXx',materialType='RIGID',density=2000.)\n", + "mod = model(name='rigid', physics='MECAx', element='Rxx3D', dimension=dim)\n", "\n", "simple_brick = brick3D(name='brique simple', lx=lx, ly=ly, lz=lz)" ] }, { "cell_type": "markdown", - "metadata": {}, + "metadata": { + "deletable": true, + "editable": true + }, "source": [ "Creating a wall with a builtin function" ] @@ -295,7 +330,9 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": false + "collapsed": false, + "deletable": true, + "editable": true }, "outputs": [], "source": [ @@ -308,7 +345,9 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": false + "collapsed": false, + "deletable": true, + "editable": true }, "outputs": [], "source": [ @@ -328,7 +367,9 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": true + "collapsed": true, + "deletable": true, + "editable": true }, "outputs": [], "source": [ @@ -340,7 +381,10 @@ }, { "cell_type": "markdown", - "metadata": {}, + "metadata": { + "deletable": true, + "editable": true + }, "source": [ "Da Silva le maçon" ] @@ -349,7 +393,9 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": false + "collapsed": false, + "deletable": true, + "editable": true }, "outputs": [], "source": [ @@ -367,8 +413,8 @@ "bodies4=copy.deepcopy(bodies3)\n", "bodies4.translate(dy=9.5*lx)\n", "\n", - "bodies3.rotate(type='axis', center=numpy.array([5*lx,5*lx,0.]), axis=[0.,0.,1.], alpha=math.pi/2.)\n", - "bodies4.rotate(type='axis', center=numpy.array([5*lx,5*lx,0.]), axis=[0.,0.,1.], alpha=math.pi/2.)\n", + "bodies3.rotate(description='axis', center=numpy.array([5*lx,5*lx,0.]), axis=[0.,0.,1.], alpha=math.pi/2.)\n", + "bodies4.rotate(description='axis', center=numpy.array([5*lx,5*lx,0.]), axis=[0.,0.,1.], alpha=math.pi/2.)\n", "\n", "bodies1 += bodies3\n", "bodies1 += bodies4\n", @@ -397,7 +443,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython2", - "version": "2.7.11" + "version": "2.7.13" } }, "nbformat": 4, diff --git a/examples/Tutorials/pre/avatar/RigidAvatar.ipynb b/examples/Tutorials/pre/avatar/RigidAvatar.ipynb index d353e0d..57f67e4 100644 --- a/examples/Tutorials/pre/avatar/RigidAvatar.ipynb +++ b/examples/Tutorials/pre/avatar/RigidAvatar.ipynb @@ -3,6 +3,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -14,6 +16,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -25,6 +29,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -39,6 +45,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -50,6 +58,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -63,6 +73,8 @@ "execution_count": null, "metadata": { "collapsed": false, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "subslide" } @@ -78,6 +90,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "subslide" } @@ -91,13 +105,15 @@ "execution_count": null, "metadata": { "collapsed": false, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } }, "outputs": [], "source": [ - "mat = material(name='TDURx',type='RIGID',density=1000.)\n", + "mat = material(name='TDURx',materialType='RIGID',density=1000.)\n", "#help(mat)\n", "\n", "#possible options:\n", @@ -110,6 +126,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "subslide" } @@ -123,13 +141,15 @@ "execution_count": null, "metadata": { "collapsed": false, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } }, "outputs": [], "source": [ - "mod = model(name='rigid', type='MECAx', element='Rxx2D', dimension=dim)\n", + "mod = model(name='rigid', physics='MECAx', element='Rxx2D', dimension=dim)\n", "\n", "#possible options:\n", "print config.lmgc90dicts.modelOptions.viewkeys()\n", @@ -141,6 +161,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "subslide" } @@ -154,13 +176,15 @@ "execution_count": null, "metadata": { "collapsed": false, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } }, "outputs": [], "source": [ - "disk = avatar(type='RBDY2',dimension=2)\n", + "disk = avatar(dimension=2)\n", "\n", "## some introspection\n", "## what is disk ? \n", @@ -176,6 +200,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "subslide" } @@ -189,13 +215,16 @@ "execution_count": null, "metadata": { "collapsed": false, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } }, "outputs": [], "source": [ - "no = node(type='NO2xx',coor=numpy.array([0.,0.1]),number=1)\n", + "help(node)\n", + "no = node(coor=numpy.array([0.,0.1]),number=1)\n", "\n", "## some introspection\n", "## what is no ? \n", @@ -226,6 +255,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "subslide" } @@ -239,6 +270,8 @@ "execution_count": null, "metadata": { "collapsed": false, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -259,6 +292,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "subslide" } @@ -272,6 +307,8 @@ "execution_count": null, "metadata": { "collapsed": false, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -301,6 +338,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "subslide" } @@ -314,6 +353,8 @@ "execution_count": null, "metadata": { "collapsed": false, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -327,6 +368,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "subslide" } @@ -340,6 +383,8 @@ "execution_count": null, "metadata": { "collapsed": false, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -348,18 +393,18 @@ "source": [ "con = 'DISKx'\n", "if con == 'DISKx':\n", - " disk.addContactors(type='DISKx', color='BLUEx', byrd=1.)\n", + " disk.addContactors(shape='DISKx', color='BLUEx', byrd=1.)\n", "elif con == 'DISKb': \n", - " disk.addContactors(type='DISKx', color='BLEUx', byrd=1., shift=[1., 0.])\n", + " disk.addContactors(shape='DISKx', color='BLEUx', byrd=1., shift=[1., 0.])\n", "elif con == 'xKSID':\n", - " disk.addContactors(type='xKSID', color='BLEUx', byrd=1.)\n", + " disk.addContactors(shape='xKSID', color='BLEUx', byrd=1.)\n", "elif con == 'JONCx':\n", - " disk.addContactors(type='JONCx', color='WALLx', axe1=1., axe2=0.01)\n", + " disk.addContactors(shape='JONCx', color='WALLx', axe1=1., axe2=0.01)\n", "elif con == 'POLYG':\n", - " disk.addContactors(type='POLYG', color='REDxx', nb_vertices=4, \n", + " disk.addContactors(shape='POLYG', color='REDxx', nb_vertices=4, \n", " vertices=np.array([[-1.,-1.],[1.,-1.],[1.,1.],[-1.,1.]]))\n", "elif con == 'PT2Dx':\n", - " disk.addContactors(type='PT2Dx', color='VERTx', shift=[1., 0.])\n", + " disk.addContactors(shape='PT2Dx', color='VERTx', shift=[1., 0.])\n", "\n", "# possible contactors\n", "print config.lmgc90dicts.contactorOptions.viewkeys()\n", @@ -370,6 +415,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "subslide" } @@ -383,6 +430,8 @@ "execution_count": null, "metadata": { "collapsed": true, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -395,6 +444,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "subslide" } @@ -408,6 +459,8 @@ "execution_count": null, "metadata": { "collapsed": true, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -427,7 +480,9 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": true + "collapsed": true, + "deletable": true, + "editable": true }, "outputs": [], "source": [ @@ -443,7 +498,9 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": false + "collapsed": false, + "deletable": true, + "editable": true }, "outputs": [], "source": [ @@ -479,7 +536,9 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": false + "collapsed": false, + "deletable": true, + "editable": true }, "outputs": [], "source": [ @@ -499,7 +558,9 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": true + "collapsed": true, + "deletable": true, + "editable": true }, "outputs": [], "source": [ @@ -513,7 +574,10 @@ }, { "cell_type": "markdown", - "metadata": {}, + "metadata": { + "deletable": true, + "editable": true + }, "source": [ "Building a cluster" ] @@ -522,27 +586,29 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": false + "collapsed": false, + "deletable": true, + "editable": true }, "outputs": [], "source": [ - "boarf = avatar(type='RBDY2',dimension=2)\n", - "no = node(type='NO2xx',coor=numpy.array([0.,0.]),number=1)\n", + "boarf = avatar(dimension=2)\n", + "no = node(coor=numpy.array([0.,0.]),number=1)\n", "boarf.addNode( no )\n", "boarf.addBulk( rigid2d() )\n", "boarf.defineGroups()\n", "boarf.defineModel(model=mod)\n", "boarf.defineMaterial(material=mat)\n", - "boarf.addContactors(type='POLYG', color='REDxx', nb_vertices=4, \n", + "boarf.addContactors(shape='POLYG', color='REDxx', nb_vertices=4, \n", " vertices=np.array([[-2.,-2.],[2.,-2.],[2.,-1.],[-2.,-1.]]))\n", - "boarf.addContactors(type='POLYG', color='REDxx', nb_vertices=4, \n", + "boarf.addContactors(shape='POLYG', color='REDxx', nb_vertices=4, \n", " vertices=np.array([[-2.,-1.],[-1.,-1],[-1.,1.],[-2.,1.]]))\n", - "boarf.addContactors(type='POLYG', color='REDxx', nb_vertices=4, \n", + "boarf.addContactors(shape='POLYG', color='REDxx', nb_vertices=4, \n", " vertices=np.array([[1.,-1.],[2.,-1.],[2.,1.],[1.,1.]]))\n", - "boarf.addContactors(type='POLYG', color='REDxx', nb_vertices=4, \n", + "boarf.addContactors(shape='POLYG', color='REDxx', nb_vertices=4, \n", " vertices=np.array([[-2,1.],[2.,1.],[2.,2.],[-2.,2.]]))\n", - "boarf.addContactors(type='DISKx', color='BLUEx', byrd=1.,shift=[3.,0.])\n", - "boarf.addContactors(type='DISKx', color='BLUEx', byrd=1.,shift=[-3.,0.])\n", + "boarf.addContactors(shape='DISKx', color='BLUEx', byrd=1.,shift=[3.,0.])\n", + "boarf.addContactors(shape='DISKx', color='BLUEx', byrd=1.,shift=[-3.,0.])\n", "boarf.computeRigidProperties()\n", "#Draw\n", "bodies = avatars()\n", @@ -554,7 +620,9 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": false + "collapsed": false, + "deletable": true, + "editable": true }, "outputs": [], "source": [ @@ -572,6 +640,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -582,7 +652,10 @@ }, { "cell_type": "markdown", - "metadata": {}, + "metadata": { + "deletable": true, + "editable": true + }, "source": [ "Its almost the same than 2D !" ] @@ -591,16 +664,18 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": false + "collapsed": false, + "deletable": true, + "editable": true }, "outputs": [], "source": [ "dim=3\n", "#\n", - "mod = model(name='rigid', type='MECAx', element='Rxx3D', dimension=dim)\n", + "mod = model(name='rigid', physics='MECAx', element='Rxx3D', dimension=dim)\n", "#\n", - "boarf = avatar(type='RBDY3',dimension=3)\n", - "no = node(type='NO3xx',coor=numpy.array([0.,0.,0.]),number=1)\n", + "boarf = avatar(dimension=3)\n", + "no = node(coor=numpy.array([0.,0.,0.]),number=1)\n", "boarf.addNode( no )\n", "boarf.addBulk( rigid3d() )\n", "boarf.defineGroups()\n", @@ -609,17 +684,17 @@ "#\n", "con = 'POLYR'\n", "if con == 'SPHER':\n", - " boarf.addContactors(type='SPHER', color='BLEUx', byrd=1.)\n", + " boarf.addContactors(shape='SPHER', color='BLEUx', byrd=1.)\n", "elif con == 'SPHERb':\n", - " boarf.addContactors(type='SPHER', color='BLEUx', byrd=1., shift=[1. , 0., 0.])\n", + " boarf.addContactors(shape='SPHER', color='BLEUx', byrd=1., shift=[1. , 0., 0.])\n", "elif con == 'CYLND':\n", - " boarf.addContactors(type='CYLND', color='BLEUx', High=1., byrd=1.)\n", + " boarf.addContactors(shape='CYLND', color='BLEUx', High=1., byrd=1.)\n", "elif con == 'DNLYC':\n", - " boarf.addContactors(type='DNLYC', color='BLEUx', High=1., byrd=1.)\n", + " boarf.addContactors(shape='DNLYC', color='BLEUx', High=1., byrd=1.)\n", "elif con == 'PLANx':\n", - " boarf.addContactors(type='PLANx', color='WALLx', axe1=0.5, axe2=1., axe3=0.01)\n", + " boarf.addContactors(shape='PLANx', color='WALLx', axe1=0.5, axe2=1., axe3=0.01)\n", "elif con == 'PLANb':\n", - " boarf.addContactors(type='PLANx', color='WALLx', axe1=0.5, axe2=1., axe3=0.01,\n", + " boarf.addContactors(shape='PLANx', color='WALLx', axe1=0.5, axe2=1., axe3=0.01,\n", " shift=[1., 0., 0.], \n", " frame=[[-1., 0., 0.],[ 0., -1., 0.],[ 0., 0., 1.]] )\n", "elif con == 'POLYR':\n", @@ -672,11 +747,11 @@ " faces[ 9, 0]=3; faces[ 9, 1]=8; faces[ 9, 2]=7\n", " faces[10, 0]=5; faces[10, 1]=7; faces[10, 2]=8\n", " faces[11, 0]=5; faces[11, 1]=6; faces[11, 2]=7 \n", - " boarf.addContactors(type='POLYR', color='REDxx', \n", + " boarf.addContactors(shape='POLYR', color='REDxx', \n", " nb_vertices=8, vertices=vertices, \n", " nb_faces=12, connectivity=faces)\n", "elif con == 'PT3Dx': \n", - " boarf.addContactors(type='PT3Dx', color='VERTx', shift=[0., 1., 0.])\n", + " boarf.addContactors(shape='PT3Dx', color='VERTx', shift=[0., 1., 0.])\n", "\n", "#Draw\n", "bodies = avatars()\n", @@ -687,6 +762,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "subslide" } @@ -699,7 +776,9 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": true + "collapsed": true, + "deletable": true, + "editable": true }, "outputs": [], "source": [ @@ -714,7 +793,9 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": true + "collapsed": true, + "deletable": true, + "editable": true }, "outputs": [], "source": [ @@ -731,7 +812,9 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": true + "collapsed": true, + "deletable": true, + "editable": true }, "outputs": [], "source": [ @@ -747,7 +830,9 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": false + "collapsed": false, + "deletable": true, + "editable": true }, "outputs": [], "source": [ @@ -764,11 +849,13 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": false + "collapsed": false, + "deletable": true, + "editable": true }, "outputs": [], "source": [ - "body=roughWall3D(center=[0.,0.,0.], l=2., r=0.5, model=mod, material=mat, color='WALLx')\n", + "body=roughWall3D(center=[0.,0.,0.], lx=2., ly=2., r=0.5, model=mod, material=mat, color='WALLx')\n", "#Draw\n", "bodies = avatars()\n", "bodies.addAvatar(body)\n", @@ -779,16 +866,27 @@ "cell_type": "code", "execution_count": null, "metadata": { - "collapsed": false + "collapsed": false, + "deletable": true, + "editable": true }, "outputs": [], "source": [ - "body=granuloRoughWall3D(center=[0.,0.,0.], l=2., rmin=0.01, rmax=0.05, \n", + "body=granuloRoughWall3D(center=[0.,0.,0.], lx=2., ly=2., rmin=0.01, rmax=0.05, \n", " model=mod, material=mat, color='WALLx')\n", "bodies = avatars()\n", "bodies.addAvatar(body)\n", "visuAvatars(bodies)" ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": { + "collapsed": true + }, + "outputs": [], + "source": [] } ], "metadata": { @@ -808,7 +906,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython2", - "version": "2.7.11" + "version": "2.7.13" } }, "nbformat": 4, diff --git a/examples/Tutorials/pre/deposit/Deposit2D.ipynb b/examples/Tutorials/pre/deposit/Deposit2D.ipynb index 539cd33..ab9256d 100644 --- a/examples/Tutorials/pre/deposit/Deposit2D.ipynb +++ b/examples/Tutorials/pre/deposit/Deposit2D.ipynb @@ -3,6 +3,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -16,6 +18,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -29,6 +33,8 @@ "execution_count": null, "metadata": { "collapsed": false, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -42,10 +48,10 @@ "import matplotlib.pyplot as plt\n", "\n", "# Import Bokeh modules for interactive plotting\n", - "import bokeh.io\n", - "import bokeh.mpl\n", - "import bokeh.plotting\n", - "bokeh.io.output_notebook()\n", + "#import bokeh.io\n", + "#import bokeh.mpl\n", + "#import bokeh.plotting\n", + "#bokeh.io.output_notebook()\n", "\n", "from pylmgc90.pre import *\n" ] @@ -53,6 +59,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -66,6 +74,8 @@ "execution_count": null, "metadata": { "collapsed": false, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -86,6 +96,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -99,6 +111,8 @@ "execution_count": null, "metadata": { "collapsed": false, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -113,6 +127,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -126,6 +142,8 @@ "execution_count": null, "metadata": { "collapsed": true, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -142,6 +160,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -155,6 +175,8 @@ "execution_count": null, "metadata": { "collapsed": false, + "deletable": true, + "editable": true, "scrolled": true, "slideshow": { "slide_type": "fragment" @@ -203,6 +225,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -216,6 +240,8 @@ "execution_count": null, "metadata": { "collapsed": false, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -228,6 +254,15 @@ "coors=numpy.reshape(coors,(nb_laid_particles,2))\n", "draw(coors,radii) #,lx,ly)\n" ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": { + "collapsed": true + }, + "outputs": [], + "source": [] } ], "metadata": { @@ -247,7 +282,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython2", - "version": "2.7.11" + "version": "2.7.13" } }, "nbformat": 4, diff --git a/examples/Tutorials/pre/granulo/granulometry.ipynb b/examples/Tutorials/pre/granulo/granulometry.ipynb index 8822bd1..4489627 100644 --- a/examples/Tutorials/pre/granulo/granulometry.ipynb +++ b/examples/Tutorials/pre/granulo/granulometry.ipynb @@ -3,6 +3,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -14,6 +16,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -25,6 +29,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -38,6 +44,8 @@ "execution_count": null, "metadata": { "collapsed": false, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -57,22 +65,22 @@ "import matplotlib.pyplot as plt\n", "\n", "# Seaborn, useful for graphics\n", - "import seaborn as sns\n", + "#import seaborn as sns\n", "\n", "# JB's favorite Seaborn settings for notebooks\n", - "rc = {'lines.linewidth': 2, \n", - " 'axes.labelsize': 18, \n", - " 'axes.titlesize': 18, \n", - " 'axes.facecolor': 'DFDFE5'}\n", - "sns.set_context('notebook', rc=rc)\n", - "sns.set_style('darkgrid', rc=rc)\n", + "#rc = {'lines.linewidth': 2, \n", + "# 'axes.labelsize': 18, \n", + "# 'axes.titlesize': 18, \n", + "# 'axes.facecolor': 'DFDFE5'}\n", + "#sns.set_context('notebook', rc=rc)\n", + "#sns.set_style('darkgrid', rc=rc)\n", "\n", "\n", "# Import Bokeh modules for interactive plotting\n", - "import bokeh.io\n", - "import bokeh.mpl\n", - "import bokeh.plotting\n", - "bokeh.io.output_notebook()\n", + "#import bokeh.io\n", + "#import bokeh.mpl\n", + "#import bokeh.plotting\n", + "#bokeh.io.output_notebook()\n", "\n", "from pylmgc90.pre import *\n" ] @@ -80,6 +88,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -93,6 +103,8 @@ "execution_count": null, "metadata": { "collapsed": false, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -143,6 +155,8 @@ { "cell_type": "markdown", "metadata": { + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -156,6 +170,8 @@ "execution_count": null, "metadata": { "collapsed": false, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -229,6 +245,8 @@ "cell_type": "markdown", "metadata": { "collapsed": true, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "slide" } @@ -242,6 +260,8 @@ "execution_count": null, "metadata": { "collapsed": false, + "deletable": true, + "editable": true, "slideshow": { "slide_type": "fragment" } @@ -274,6 +294,15 @@ "\n", "draw_granulo(radii) \n" ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": { + "collapsed": true + }, + "outputs": [], + "source": [] } ], "metadata": { @@ -293,7 +322,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython2", - "version": "2.7.11" + "version": "2.7.13" } }, "nbformat": 4, -- GitLab