Merge branch 'master' of https://github.com/feelpp/toolbox

Author: prudhomm

examples/modules/csm/pages/ribs/disk.cfg

@@ -1,21 +1,20 @@
 
 fe-approximation=P2 #P1,P2
+directory=toolboxes/solid/ribs/disk2/P2
 
 [solid]
 filename=$cfgdir/disk.json
 
+mesh.filename=$cfgdir/disk2.msh
+gmsh.partition=1
+
 on.type=elimination_symmetric
 
 # # precondtioner config
 pc-type=gamg #lu,gasm,ml
 ksp-monitor=1
 # ksp-converged-reason=1
 
-mshfile=$cfgdir/disk1.msh
-#[solid.gmsh]
-
 [ts]
 steady=true
 
-[exporter]
-directory=applications/models/solid/disk1/$solid_tag

examples/modules/csm/pages/ribs/disk.json

@@ -1,12 +1,14 @@
 {
     "Name": "Solid Mechanics ",
     "ShortName":"Solid",
-    "Model":"Elasticity",
+    "Models":
+    {
+	"equations":"Elasticity"
+    },
     "Materials":
     {
         "omega":
         {
-            "name":"solid",
             "E":"210e3",		// N/mm^2
             "nu":"0.4",			//
             "rho":"7800e-9"		// kg/mm^3
@@ -34,18 +36,21 @@
     },
     "PostProcess":
     {
-        "Fields":["displacement","Von-Mises","tresca","principal-stresses"],
+	"Exports":
+	{
+            "fields":["displacement","Von-Mises","tresca","principal-stresses"]
+	},
         "Measures":
         {
-		"VolumeVariation":"omega",
-		"Maximum":
-			{
-				"load":
-				{
-				"markers":"load",
-				"fields":["displacement","stress","normal-stress","wall-shear-stress"]
-				}
-			}            
+	    "VolumeVariation":"omega",
+	    "Maximum":
+	    {
+		"load":
+		{
+		    "markers":"load",
+		    "fields":["displacement"]
+		}
+	    }            
         }
     }
 

examples/modules/csm/pages/ribs/index.adoc

@@ -1,11 +1,5 @@
 = Bracing with ribs
-Bereczki, Norbi
-v1.0, 2018/01/13
-:toc: left
-ifdef::env-github,env-browser[]
-:outfilesuffix: .adoc
-:imagesdir: https://media.githubusercontent.com/media/feelpp/toolbox/master/csm/ribs/
-endif::[]
+:page-vtkjs: true
 
 == Introduction
 
@@ -41,13 +35,48 @@ image:ribs/image3.png[Képernyőfelvétel (823).png,width=274,height=283]image:r
 
 Maximum displacement: 0.6501 mm Maximum stress: 512.4 MPa
 
-image:ribs/image5.png[C:\Users\Bereczki\Documents\Feel++2\Dokumentálás_javított\Bordák_merevvé\d1.png,width=311,height=272]image:ribs/image6.png[C:\Users\Bereczki\Documents\Feel++2\Dokumentálás_javított\Bordák_merevvé\v1.png,width=309,height=272]
+|====
+a| image:ribs/image5.png[] a| image:ribs/image6.png[]
+|====
+
+.3D Model without ribs.
+++++
+
+<div class="stretchy-wrapper-16_9">
+<div id="vtkVisuSection1" style="margin: auto; width: 100%; height: 100%;      padding: 10px;"></div>
+</div>
+<script type="text/javascript">
+feelppVtkJs.createSceneImporter( vtkVisuSection1, {
+                                 fileURL: "https://girder.math.unistra.fr/api/v1/file/5ad4a6f5b0e9574027047d6a/download",
+                                 objects: { "deformation":[ { scene:"displacement" }, { scene:"von_mises" } ] }
+                               } );
+</script>
+
+++++
 
 === With ribs
 
 Maximum displacement: 0.528 mm Maximum stress: 599.1 MPa
 
-image:ribs/image7.png[C:\Users\Bereczki\Documents\Feel++2\Dokumentálás_javított\Bordák_merevvé\d2.png,width=304,height=272] image:ribs/image8.png[C:\Users\Bereczki\Documents\Feel++2\Dokumentálás_javított\Bordák_merevvé\v2.png,width=302,height=272]
+|====
+a| image:ribs/image7.png[] a| image:ribs/image8.png[]
+|====
+
+.3D Model with ribs.
+++++
+
+<div class="stretchy-wrapper-16_9">
+<div id="vtkVisuSection2" style="margin: auto; width: 100%; height: 100%;      padding: 10px;"></div>
+</div>
+<script type="text/javascript">
+feelppVtkJs.createSceneImporter( vtkVisuSection2, {
+                                 fileURL: "https://girder.math.unistra.fr/api/v1/file/5ad4a6f5b0e9574027047d6d/download",
+                                 objects: { "deformation":[ { scene:"displacement" }, { scene:"von_mises" } ] }
+                               } );
+</script>
+
+++++
+
 
 === Summary
 

examples/modules/csm/pages/sensor/capteur.cfg

@@ -1,14 +1,19 @@
-fe-approximation=P2 #P1,P2
+fe-approximation=P1 #P1,P2
+directory=toolboxes/solid/sensor/P1
 
 [solid]
 filename=$cfgdir/capteur.json
 
+mesh.filename=$cfgdir/capteur.msh
+gmsh.partition=1
+
 material_law=StVenantKirchhoff# StVenantKirchhoff, NeoHookean
 
 # use density and material coeff cst in appli
 jacobian-linear-update=false
 linearsystem-cst-update=false
 
+snes-monitor=1
 # snes and ksp config
 #reuse-prec=true#false
 #reuse-jac=true#false
@@ -20,21 +25,12 @@ snes-ksp-maxit=1000
 snes-ksp-maxit-reuse=100
 
 # precondtioner config
-pc-type=lu #lu,gasm,ml
+pc-type=gamg #lu,gasm,ml
 ksp-converged-reason=1
 
-mshfile=$cfgdir/capteur.msh
-#[solid.gmsh]
-
 [ts]
 time-step=0.05
 time-final=0.63
 #restart=true
 restart.at-last-save=true
 #save.freq=2
-
-
-[exporter]
-directory=applications/models/capteur/$solid_tag
-freq=1
-#format=ensightgold

examples/modules/csm/pages/sensor/capteur.json

@@ -1,12 +1,14 @@
 {
     "Name": "Solid Mechanics ",
     "ShortName":"Solid",
-    "Model":"Hyper-Elasticity",
+    "Models":
+    {
+	"equations":"Hyper-Elasticity"
+    },
     "Materials":
     {
         "omega":
         {
-            "name":"solid",
             "E":"205e3",
             "nu":"0.3",
             "rho":"7850e-9"
@@ -16,7 +18,7 @@
     {
         "displacement":
         {
-			"Dirichlet":
+	    "Dirichlet":
             {
                 "fixed":
                 {
@@ -29,7 +31,7 @@
                 {
                     "expr":"{0,(100*sin(5*t)),0}:t"
                 },
-				"load2":
+		"load2":
                 {
                     "expr":"{0,(-100*sin(5*t)),0}:t"
                 }
@@ -39,18 +41,20 @@
     },
     "PostProcess":
     {
-        "Fields":["displacement","Von-Mises"],
+	"Exports":
+	{
+            "fields":["displacement","Von-Mises","pid"]
+	},
         "Measures":
         {
-		"Maximum":
-			{
-				"Max":
-				{
-					"markers":"load",
-					"fields":["displacement"]
-				}
-            
-        		}
+	    "Maximum":
+	    {
+		"Max":
+		{
+		    "markers":"load",
+		    "fields":["displacement"]
+		}
+            }
     	}
     }