update spring #141 (#142)

* update spring #141 * update string #141 and add authors' names #145 * add imagesprefix support for #141 as described in #144 * add report from solid toolbox #136
feelpp · Nov 7, 2022 · ff9dd79 · ff9dd79
1 parent 6311df4
commit ff9dd79
Show file tree

Hide file tree

Showing 4 changed files with 586 additions and 17 deletions.
diff --git a/examples/modules/csm/examples/spring/spring.cfg b/examples/modules/csm/examples/spring/spring.cfg
@@ -2,8 +2,7 @@ fe-approximation=P1 #P1,P2
 directory=toolboxes/solid/spring/
 
 [solid]
-filename=$cfgdir/spring.json
-mesh.filename=girder:{file:5b03dfcbb0e957402704806d}
+json.filename=$cfgdir/spring.json
 mesh.scale=1e-2
 gmsh.partition=1
 

diff --git a/examples/modules/csm/examples/spring/spring.json b/examples/modules/csm/examples/spring/spring.json
@@ -2,9 +2,33 @@
 {
   "Name": "Solid Mechanics ",
   "ShortName":"Solid",
+  "Metadata":
+  {
+      "version": "1",
+      "author": ["vincentchabannes","prudhomm","lberti","jobinhio"],
+      "date": "23/09/2022",
+      "references":[""]
+  },
   "Models":
   {
-    "equations":"Elasticity" // "Elasticity", "Hyper-Elasticity"
+    "solid":
+    {
+      "setup":
+      {
+        "equations":"Elasticity", // "Elasticity", "Hyper-Elasticity"
+        "body-forces":"{0,0,-gravity*7850}:gravity"
+      }
+    }  
+  },
+  "Meshes":
+  {
+      "solid":
+      {
+        "Import":
+        {
+          "filename":"girder:{file:5b03dfcbb0e957402704806d}"
+        }
+      }
   },
   // tag::materials[]
   "Materials":
@@ -35,29 +59,25 @@
   // tag::bc[]
   "BoundaryConditions":
   {
-    "displacement":
+    "solid":
     {
-      "Dirichlet":
+      "displacement":
       {
         "markerBottom":{ "expr":"{0,0,-dispImposed}:dispImposed" }, // imposed displacement -> pulled down end of the spring
         "markerTop":{ "expr":"{0,0,0}" } // imposed displacement (zero) -> fixed end of the spring
-      },
-      "VolumicForces":
-      {
-        "lumenVolume":
-        {
-          "expr":"{0,0,-gravity*7850}:gravity"
-        }
       }
     }
   },
   // end::bc[]
   // tag::export[]
   "PostProcess":
   {
-    "Exports":
+    "solid":
     {
-      "fields":["displacement","pressure","pid","von-mises-criterion"]
+      "Exports":
+      {
+        "fields":["displacement","pressure","pid","von-mises-criterion"]
+      }
     }
   }
   // end::export[]

diff --git a/examples/modules/csm/pages/spring/README.adoc b/examples/modules/csm/pages/spring/README.adoc
@@ -3,6 +3,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
 
@@ -25,6 +27,7 @@ Copy case option to clipboard
 </button>
 ++++
 
+NOTE: The report of the execution of the command above is available xref:spring/solid-informations.adoc[here].
 
 == Data files
 
@@ -40,7 +43,7 @@ The geometry consists of a 7-turn coil spring.
 The spring is 4.5cm long and its radius is 1cm. 
 The wire's radius is 1mm.
 
-image:spring/spring_mesh.png[50%]
+image:{imagesprefix}spring/spring_mesh.png[50%]
 
 The mesh is available on link:https://girder.math.unistra.fr/api/v1/file/5b03dfcbb0e957402704806d/download[Girder]
 
@@ -120,8 +123,8 @@ include::{examplesdir}/spring/spring.json[tags=export]
 
 In the following pictures, displacement is expressed in stem:[m]. The von Mises yield criterion in dimensionless.
 
-image:spring/spring_displacement.png[50%]
-image:spring/spring_von_mises.png[50%]
+image:{imagesprefix}spring/spring_displacement.png[50%]
+image:{imagesprefix}spring/spring_von_mises.png[50%]
 
 
 === 3D viewer