146 solid pendulum study (#148)

* update pendulum #146 * add report from solid toolbox #136 * add imagesprefix support for #146 as described in #144
feelpp · Nov 7, 2022 · ad06ccb · ad06ccb
1 parent ff9dd79
commit ad06ccb
Show file tree

Hide file tree

Showing 6 changed files with 683 additions and 45 deletions.
diff --git a/examples/modules/csm/examples/pendulum2D/pendulum2D.cfg b/examples/modules/csm/examples/pendulum2D/pendulum2D.cfg
@@ -4,9 +4,9 @@ case.dimension=2
 case.discretization=P2 #P1,P2
 
 [solid]
-filename=$cfgdir/pendulum2D.json
+json.filename=$cfgdir/pendulum2D.json
 
-mesh.filename=$cfgdir/pendulum2D.geo
+# mesh.filename=$cfgdir/pendulum2D.geo
 
 # # precondtioner config
 pc-type=gamg #lu,gasm,ml

diff --git a/examples/modules/csm/examples/pendulum2D/pendulum2D.json b/examples/modules/csm/examples/pendulum2D/pendulum2D.json
@@ -3,11 +3,35 @@
 {
   "Name": "Pendulum Solid Mechanics ",
   "ShortName":"Solid",
+  "Metadata":
+  {
+      "version": "1",
+      "author": ["vincentchabannes","prudhomm","lberti","jobinhio"],
+      "date": "23/09/2022",
+      "references":[""]
+  },
   "Models":
   {
-      "equations":"Hyper-Elasticity",
-      "material-model":"StVenantKirchhoff"
+    "solid":
+    {
+      "setup":
+      {
+        "equations":"Hyper-Elasticity",
+        "material-model":"StVenantKirchhoff",
+        "body-forces":"{0,-gravity*8920}:gravity"
+      }
+    }
   },
+  "Meshes":
+  {
+      "solid":
+      {
+        "Import":
+        {
+          "filename":"$cfgdir/pendulum2D.geo"
+        }
+      }
+  },  
   // tag::parameters[]
   "Parameters":
   {
@@ -28,22 +52,14 @@
   // tag::boundaryconditions[]
   "BoundaryConditions":
   {
-    "displacement":
+    "solid":
     {
-      "Dirichlet":
+      "displacement":
       {
         "AxeFixed": // vertex angle -> fixed (no displacement)
         {
           "expr":"{0,0}"
         }
-      },
-
-      "VolumicForces":
-      {
-        "Solid":
-        {
-          "expr":"{0,-gravity*8920}:gravity"
-        }
       }
     }
 
@@ -52,14 +68,17 @@
   // tag::exports[]
   "PostProcess":
   {
-    "Exports":
+    "solid":
     {
-      "fields":["displacement","pid","von-mises-criterion"]
-    },
-    "Measures":
-    {
-      "VolumeVariation":""
+      "Exports":
+      {
+        "fields":["displacement","pid","von-mises-criterion"]
+      },
+      "Measures":
+      {
+        "VolumeVariation":""
+      }
     }
-  }
+  } 
   // end::exports[]
 }
diff --git a/examples/modules/csm/examples/pendulum3D/pendulum3D.cfg b/examples/modules/csm/examples/pendulum3D/pendulum3D.cfg
@@ -4,9 +4,9 @@ case.dimension=3
 case.discretization=P2 #P1,P2
 
 [solid]
-filename=$cfgdir/pendulum3D.json
+json.filename=$cfgdir/pendulum3D.json
 
-mesh.filename=$cfgdir/pendulum3D.geo
+# mesh.filename=$cfgdir/pendulum3D.geo
 
 
 # # precondtioner config

diff --git a/examples/modules/csm/examples/pendulum3D/pendulum3D.json b/examples/modules/csm/examples/pendulum3D/pendulum3D.json
@@ -1,10 +1,34 @@
 {
     "Name": "Pendulum Solid Mechanics ",
     "ShortName":"Solid",
+    "Metadata":
+    {
+        "version": "1",
+        "author": ["vincentchabannes","prudhomm","lberti","jobinhio"],
+        "date": "23/09/2022",
+        "references":[""]
+    },
     "Models":
     {
-	"equations":"Hyper-Elasticity",
-	"material-model":"StVenantKirchhoff"
+      "solid":
+      {
+        "setup":
+        {
+            "equations":"Hyper-Elasticity",
+            "material-model":"StVenantKirchhoff",
+            "body-forces":"{0,-gravity*8920,0}:gravity"
+        }
+      }  
+    },
+    "Meshes":
+    {
+        "solid":
+        {
+          "Import":
+          {
+            "filename":"$cfgdir/pendulum3D.geo"
+          }
+        }
     },
     // tag::parameters[]
     "Parameters":
@@ -26,36 +50,30 @@
     // tag::boundaryconditions[]
     "BoundaryConditions":
     {
-        "displacement":
+        "solid":
         {
-            "Dirichlet":
+            "displacement":
             {
                 "AxeFixed":
                 {
                     "expr":"{0,0,0}"
                 }
-            },
-
-	    "VolumicForces":
-            {
-                "Solid":
-                {
-		    "expr":"{0,-gravity*8920,0}:gravity"
-                }
             }
-	}
-
+	    }
     },
     // end::boundaryconditions[]
     "PostProcess":
     {
-	"Exports":
-	{
-            "fields":["displacement","pid","von-mises-criterion"]
-	},
-        "Measures":
+        "solid":  
         {
-	    "VolumeVariation":""            
+            "Exports":
+            {
+                "fields":["displacement","pid","von-mises-criterion"]
+            },
+            "Measures":
+            {
+            "VolumeVariation":""            
+            }
         }
     }
 

diff --git a/examples/modules/csm/pages/pendulum2D/index.adoc b/examples/modules/csm/pages/pendulum2D/index.adoc
@@ -2,7 +2,8 @@
 :toc: left
 :uri-data: https://github.com/feelpp/toolbox/blob/master/examples/modules/csm/examples
 :uri-data-edit: https://github.com/feelpp/toolbox/edit/master/examples/modules/csm/examples
-
+:imagesprefix: 
+ifdef::env-github,env-browser,env-vscode[:imagesprefix: ../../assets/images/]
 == Description
 
 In this example, we simulate the oscillating motion of a highly flexible 2D pendulum. 
@@ -27,6 +28,8 @@ Copy case 2D option to clipboard
 </button>
 ++++
 
+NOTE: The report of the execution of the command above is available xref:pendulum2D/solid-informations.adoc[here].
+
 == Data files
 
 The case data files are available in Github link:{uri-data}/pendulum/[here]
@@ -40,7 +43,7 @@ The case data files are available in Github link:{uri-data}/pendulum/[here]
 The pendulum is an isosceles triangle-shaped mesh as shown below. 
 
 .Pendulum mesh
-image:pendulum/mesh2D.png[50%]
+image:{imagesprefix}pendulum/mesh2D.png[50%]