From d31f7d785561bf06f9379d8f17ddb60b7af5126a Mon Sep 17 00:00:00 2001
From: Congo <jobcongo2@gmail.com>
Date: Thu, 13 Oct 2022 10:21:58 +0200
Subject: [PATCH 1/4] update spring #141

---
 .../modules/csm/examples/spring/spring.cfg    |  2 +-
 .../modules/csm/examples/spring/spring.json   | 33 ++++++++++++++++---
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/examples/modules/csm/examples/spring/spring.cfg b/examples/modules/csm/examples/spring/spring.cfg
index 826039d1..aed2b3ef 100644
--- a/examples/modules/csm/examples/spring/spring.cfg
+++ b/examples/modules/csm/examples/spring/spring.cfg
@@ -2,7 +2,7 @@ fe-approximation=P1 #P1,P2
 directory=toolboxes/solid/spring/
 
 [solid]
-filename=$cfgdir/spring.json
+json.filename=$cfgdir/spring.json
 mesh.filename=girder:{file:5b03dfcbb0e957402704806d}
 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
index 3a3d6b99..4399bde8 100644
--- a/examples/modules/csm/examples/spring/spring.json
+++ b/examples/modules/csm/examples/spring/spring.json
@@ -2,9 +2,29 @@
 {
   "Name": "Solid Mechanics ",
   "ShortName":"Solid",
+  "Metadata":
+  {
+      "version": "1",
+      "author": [""],
+      "date": "23/09/2022",
+      "references":[""]
+  },
   "Models":
   {
-    "equations":"Elasticity" // "Elasticity", "Hyper-Elasticity"
+    "solid":
+    {
+      "equations":"Elasticity" // "Elasticity", "Hyper-Elasticity"
+    }  
+  },
+  "Meshes":
+  {
+      "solid":
+      {
+        "Import":
+        {
+          "filename":"girder:{file:5b03dfcbb0e957402704806d}"
+        }
+      }
   },
   // tag::materials[]
   "Materials":
@@ -35,9 +55,9 @@
   // 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
@@ -55,9 +75,12 @@
   // tag::export[]
   "PostProcess":
   {
-    "Exports":
+    "solid":
     {
-      "fields":["displacement","pressure","pid","von-mises-criterion"]
+      "Exports":
+      {
+        "fields":["displacement","pressure","pid","von-mises-criterion"]
+      }
     }
   }
   // end::export[]

From f6413d8dbda938b52e3d8c4bef9e48809a25e27d Mon Sep 17 00:00:00 2001
From: Congo <jobcongo2@gmail.com>
Date: Fri, 14 Oct 2022 10:50:28 +0200
Subject: [PATCH 2/4] update string #141 and add  authors' names #145

---
 examples/modules/csm/examples/spring/spring.cfg  |  1 -
 examples/modules/csm/examples/spring/spring.json | 15 ++++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/examples/modules/csm/examples/spring/spring.cfg b/examples/modules/csm/examples/spring/spring.cfg
index aed2b3ef..fab7e113 100644
--- a/examples/modules/csm/examples/spring/spring.cfg
+++ b/examples/modules/csm/examples/spring/spring.cfg
@@ -3,7 +3,6 @@ directory=toolboxes/solid/spring/
 
 [solid]
 json.filename=$cfgdir/spring.json
-mesh.filename=girder:{file:5b03dfcbb0e957402704806d}
 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
index 4399bde8..8aacc7f2 100644
--- a/examples/modules/csm/examples/spring/spring.json
+++ b/examples/modules/csm/examples/spring/spring.json
@@ -5,7 +5,7 @@
   "Metadata":
   {
       "version": "1",
-      "author": [""],
+      "author": ["vincentchabannes","prudhomm","lberti","jobinhio"],
       "date": "23/09/2022",
       "references":[""]
   },
@@ -13,7 +13,11 @@
   {
     "solid":
     {
-      "equations":"Elasticity" // "Elasticity", "Hyper-Elasticity"
+      "setup":
+      {
+        "equations":"Elasticity", // "Elasticity", "Hyper-Elasticity"
+        "body-forces":"{0,0,-gravity*7850}:gravity"
+      }
     }  
   },
   "Meshes":
@@ -61,13 +65,6 @@
       {
         "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"
-        }
       }
     }
   },

From 55d9146c633772b48b584a81761ceb0b728829d7 Mon Sep 17 00:00:00 2001
From: Congo <jobcongo2@gmail.com>
Date: Fri, 14 Oct 2022 11:18:04 +0200
Subject: [PATCH 3/4] add imagesprefix support for #141 as described in #144

---
 examples/modules/csm/pages/spring/README.adoc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/examples/modules/csm/pages/spring/README.adoc b/examples/modules/csm/pages/spring/README.adoc
index 890e5160..2c64ef38 100644
--- 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

From 77fee011222bbbf24d9bc109056cf9e0a99a86fd Mon Sep 17 00:00:00 2001
From: Congo <jobcongo2@gmail.com>
Date: Fri, 14 Oct 2022 11:19:03 +0200
Subject: [PATCH 4/4] add report from solid toolbox #136

---
 .../csm/pages/spring/solid-informations.adoc  | 547 ++++++++++++++++++
 1 file changed, 547 insertions(+)
 create mode 100644 examples/modules/csm/pages/spring/solid-informations.adoc

diff --git a/examples/modules/csm/pages/spring/solid-informations.adoc b/examples/modules/csm/pages/spring/solid-informations.adoc
new file mode 100644
index 00000000..69f1e036
--- /dev/null
+++ b/examples/modules/csm/pages/spring/solid-informations.adoc
@@ -0,0 +1,547 @@
+:sectnums:
+= Toolbox : solid
+== Environment
+
+[cols="2"]
+|===
+<|prefix
+<|solid
+
+<|keyword
+<|solid
+
+<|root repository
+<|/home/congo/feelppdb/toolboxes/solid/spring/np_1
+
+<|number of processus
+<|1
+|===
+
+== Physics
+=== solid
+==== solid
+
+[cols="2"]
+|===
+<|modeling
+<|solid
+
+<|type
+<|solid
+
+<|name
+<|solid
+|===
+
+
+[cols="2"]
+|===
+<|Equation
+<|Elasticity
+|===
+
+===== Body Forces
+
+[cols="2"]
+|===
+<|name
+<|bodyforce0
+
+<|expr
+<|{0,0,-7850*gravity}
+|===
+
+
+===== Parameters
+
+[cols="5",options="header"]
+|===
+<|Name
+<|Expression
+<|Symbol
+<|Shape
+<|Components
+
+<|bodyforce0_bodyforce
+<|{0,0,-7850*gravity}
+<|physics_solid_solid_bodyforce0_bodyforce
+<|vectorial [3]
+<a|
+[cols="2",options="header"]
+!===
+<!Symbol
+<!Indices
+
+<!physics_solid_solid_bodyforce0_bodyforce_0
+<!0,0
+
+<!physics_solid_solid_bodyforce0_bodyforce_1
+<!1,0
+
+<!physics_solid_solid_bodyforce0_bodyforce_2
+<!2,0
+!===
+
+|===
+
+
+
+
+== Physics2
+
+[cols="2"]
+|===
+<|time mode
+<|Stationary
+|===
+
+== Materials Properties
+
+[cols="2"]
+|===
+<|number of materials
+<|1
+|===
+
+=== Material : lumenVolume
+
+[cols="5",options="header"]
+|===
+<|Name
+<|Expression
+<|Symbol
+<|Shape
+<|Components
+
+<|Lame-first-parameter
+<|-materials_lumenVolume_nu*(-1+2*materials_lumenVolume_nu)^(-1)*materials_lumenVolume_E*(1+materials_lumenVolume_nu)^(-1)
+<|materials_lumenVolume_lambdaLame
+<|scalar
+<|
+
+<|Lame-second-parameter
+<|1/2*materials_lumenVolume_E*(1+materials_lumenVolume_nu)^(-1)
+<|materials_lumenVolume_muLame
+<|scalar
+<|
+
+<|Poisson-ratio
+<|0.33
+<|materials_lumenVolume_nu
+<|scalar
+<|
+
+<|Young-modulus
+<|2.1E8
+<|materials_lumenVolume_E
+<|scalar
+<|
+
+<|bulk-modulus
+<|-1/3*materials_lumenVolume_E*(-1+2*materials_lumenVolume_nu)^(-1)
+<|materials_lumenVolume_K
+<|scalar
+<|
+
+<|density
+<|7850
+<|materials_lumenVolume_rho
+<|scalar
+<|
+|===
+
+
+== Boundary Conditions
+=== Displacement Imposed
+==== markerBottom
+
+[cols="2"]
+|===
+<|method
+<|elimination
+
+<|expr
+<|{0,0,-dispImposed}
+
+<|markers
+<a|
+[cols="1"]
+!===
+<!markerBottom
+!===
+
+|===
+
+==== markerTop
+
+[cols="2"]
+|===
+<|method
+<|elimination
+
+<|expr
+<|{0,0,0}
+
+<|markers
+<a|
+[cols="1"]
+!===
+<!markerTop
+!===
+
+|===
+
+
+
+== Meshes
+=== Mesh : solid
+
+[cols="2"]
+|===
+<|Discretization
+<|/Mesh/solid
+
+<|filename
+<|/home/congo/feelppdb/toolboxes/solid/spring/np_1/solid.mesh.json
+|===
+
+==== Import configuration
+
+[cols="2"]
+|===
+<|mesh-filename
+<|/home/congo/feelppdb/toolboxes/solid/spring/downloads/solid/meshes/spring.msh
+
+<|generate-partitioning
+<|1
+
+<|number-of-partition
+<|1
+|===
+
+==== Discretization
+
+[cols="2"]
+|===
+<|dim
+<|3
+
+<|h_average
+<|6.739259e-04
+
+<|h_max
+<|8.967197e-04
+
+<|h_min
+<|4.157271e-04
+
+<|n_edges
+<|70457
+
+<|n_elements
+<|47323
+
+<|n_faces
+<|104586
+
+<|n_partition
+<|1
+
+<|n_points
+<|13195
+
+<|order
+<|1
+
+<|real_dim
+<|3
+
+<|shape
+<|Simplex_3_1_3
+|===
+
+
+
+
+== Function Spaces
+=== Displacement
+
+[cols="2"]
+|===
+<|mesh
+<|/Mesh/solid
+
+<|nSpace
+<|1
+|===
+
+==== Basis
+
+[cols="2"]
+|===
+<|is_continuous
+<|1
+
+<|nComponents
+<|3
+
+<|nComponents1
+<|3
+
+<|nComponents2
+<|1
+
+<|nLocalDof
+<|4
+
+<|name
+<|lagrange
+
+<|order
+<|1
+
+<|shape
+<|vectorial
+|===
+
+==== Dof Table
+
+[cols="2"]
+|===
+<|nDof
+<|39585
+|===
+
+
+
+
+== Fields
+=== displacement
+
+[cols="2"]
+|===
+<|base symbol
+<|s
+
+<|function space
+<|/FunctionSpace/object-0
+
+<|name
+<|displacement
+
+<|prefix symbol
+<|solid
+|===
+
+
+[cols="5",options="header"]
+|===
+<|Name
+<|Expression
+<|Symbol
+<|Shape
+<|Components
+
+<|eval of displacement
+<|idv(.)
+<|solid_s
+<|vectorial [3]
+<a|
+[cols="2",options="header"]
+!===
+<!Symbol
+<!Indices
+
+<!solid_s_0
+<!0,0
+
+<!solid_s_1
+<!1,0
+
+<!solid_s_2
+<!2,0
+!===
+
+
+<|norm2 of displacement
+<|norm2(.)
+<|solid_s_magnitude
+<|scalar
+<|
+
+<|grad of displacement
+<|gradv(.)
+<|solid_grad_s
+<|tensor2 [3x3]
+<a|
+[cols="2",options="header"]
+!===
+<!Symbol
+<!Indices
+
+<!solid_grad_s_00
+<!0,0
+
+<!solid_grad_s_01
+<!0,1
+
+<!solid_grad_s_02
+<!0,2
+
+<!solid_grad_s_10
+<!1,0
+
+<!solid_grad_s_11
+<!1,1
+
+<!solid_grad_s_12
+<!1,2
+
+<!solid_grad_s_20
+<!2,0
+
+<!solid_grad_s_21
+<!2,1
+
+<!solid_grad_s_22
+<!2,2
+!===
+
+
+<|normal derivative of displacement
+<|dnv(.)
+<|solid_dn_s
+<|vectorial [3]
+<a|
+[cols="2",options="header"]
+!===
+<!Symbol
+<!Indices
+
+<!solid_dn_s_0
+<!0,0
+
+<!solid_dn_s_1
+<!1,0
+
+<!solid_dn_s_2
+<!2,0
+!===
+
+
+<|curl of displacement
+<|curlv(.)
+<|solid_curl_s
+<|vectorial [3]
+<a|
+[cols="2",options="header"]
+!===
+<!Symbol
+<!Indices
+
+<!solid_curl_s_0
+<!0,0
+
+<!solid_curl_s_1
+<!1,0
+
+<!solid_curl_s_2
+<!2,0
+!===
+
+
+<|norm2 of curl of displacement
+<|norm2(curlv(.))
+<|solid_curl_s_magnitude
+<|scalar
+<|
+
+<|div of displacement
+<|divv(.)
+<|solid_div_s
+<|scalar
+<|
+|===
+
+
+
+== Algebraic Solver
+=== Backend
+
+[cols="2"]
+|===
+<|prefix
+<|solid
+
+<|type
+<|petsc
+|===
+
+=== KSP
+
+[cols="2"]
+|===
+<|atol
+<|1.000000e-50
+
+<|dtol
+<|1.000000e+05
+
+<|maxit
+<|1000
+
+<|reuse-prec
+<|0
+
+<|rtol
+<|1.000000e-08
+
+<|type
+<|gmres
+|===
+
+=== SNES
+
+[cols="2"]
+|===
+<|atol
+<|1.000000e-50
+
+<|maxit
+<|500
+
+<|reuse-jac
+<|0
+
+<|rtol
+<|1.000000e-08
+
+<|stol
+<|1.000000e-08
+|===
+
+=== KSP in SNES
+
+[cols="2"]
+|===
+<|maxit
+<|1000
+
+<|reuse-prec
+<|0
+
+<|rtol
+<|1.000000e-05
+|===
+
+=== PC
+
+[cols="2"]
+|===
+<|type
+<|gamg
+|===
+
+
+
+