update pipestokesmass #153

feelpp · Nov 4, 2022 · 0016ecc · 0016ecc
1 parent 47a3b80
commit 0016ecc
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 32 deletions.
diff --git a/examples/modules/heatfluid/examples/pipestockes_mass/pipestokes_mass.cfg b/examples/modules/heatfluid/examples/pipestockes_mass/pipestokes_mass.cfg
@@ -4,10 +4,10 @@ directory=toolboxes/heatfluid/pipestokes_mass/P1-P2P1
 case.dimension=2
 
 [heat-fluid]
-mesh.filename=$cfgdir/pipestokes_mass.geo
-gmsh.hsize=0.03#0.01#0.01#0.03#0.02
+# mesh.filename=$cfgdir/pipestokes_mass.geo
+# gmsh.hsize=0.03#0.01#0.01#0.03#0.02
 
-filename=$cfgdir/pipestokes_mass.json
+json.filename=$cfgdir/pipestokes_mass.json
 
 snes-monitor=true
 

diff --git a/examples/modules/heatfluid/examples/pipestockes_mass/pipestokes_mass.json b/examples/modules/heatfluid/examples/pipestockes_mass/pipestokes_mass.json
@@ -2,14 +2,32 @@
 {
     "Name": "Fluid Mechanics",
     "ShortName":"Fluid",
+    "Metadata":
+    {
+        "version": "1",
+        "author": ["vincentchabannes","prudhomm","lberti","jobinhio"],
+        "date": "23/09/2022",
+        "references":[""]
+    },
     "Models":
     {
-        "use-model-name":1,
+        // "use-model-name":1,
         "fluid":
         {
             "equations":"Stokes"
         }
     },
+    "Meshes":
+    {
+        "heatfluid":
+        {
+          "Import":
+          {
+            "filename":"$cfgdir/pipestokes_mass.geo",
+            "hsize":"0.03"
+          }
+        }
+    }, 
     "Parameters":
     {
         "ubar":"1.0",
@@ -29,9 +47,9 @@
     },
     "BoundaryConditions":
     {
-        "velocity":
+        "fluid":
         {
-            "Dirichlet":
+            "velocity":
             {
                 "inlet":
                 {
@@ -45,10 +63,7 @@
                 {
                     "expr":"{0,0}"
                 }
-            }
-        },
-        "fluid":
-        {
+            },
             "outlet":
             {
                 "outlet":
@@ -57,9 +72,9 @@
                 }
             }
         },
-        "temperature":
+        "heat":
         {
-            "Dirichlet":
+            "temperature":
             {
                 "inlet":
                 {
@@ -90,36 +105,36 @@
     },
     "PostProcess":
     {
-        "use-model-name":1,
-        "heat-fluid":
+        // "use-model-name":1,
+        "heatfluid":
         {
             "Exports":
             {
                 "fields":["fluid.velocity","fluid.pressure","heat.temperature","fluid.pid"]
-            }
-        },
-        "fluid":
-        {
-            "Measures":
+            },
+            "fluid":
             {
-                "Forces":"wall2",
-                "Points":
+                "Measures":
                 {
-                    "pointA":
+                    "Forces":"wall2",
+                    "Points":
                     {
-                        "coord":"{0.6,0.2,0}",
-                        "fields":"pressure"
-                    },
-                    "pointB":
-                    {
-                        "coord":"{0.15,0.2,0}",
-                        "fields":"pressure"
+                        "pointA":
+                        {
+                            "coord":"{0.6,0.2,0}",
+                            "fields":"pressure"
+                        },
+                        "pointB":
+                        {
+                            "coord":"{0.15,0.2,0}",
+                            "fields":"pressure"
+                        }
                     }
                 }
+            },
+            "heat":
+            {
             }
-        },
-        "heat":
-        {
         }
     }