[cig-commits] commit: thermal_eulerian and thermal_lagrangian both work now. Also, thermal_lagrangian is more complicated.

[Mercurial]

changeset:   413:9b1f24b6f171
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Sun Nov 20 23:10:46 2011 -0800
files:       json_input/benchmarks/thermal_eulerian.json json_input/benchmarks/thermal_lagrangian.json
description:
thermal_eulerian and thermal_lagrangian both work now.  Also, thermal_lagrangian is more complicated.


diff -r 4b084966b296 -r 9b1f24b6f171 json_input/benchmarks/thermal_eulerian.json
--- a/json_input/benchmarks/thermal_eulerian.json	Sun Nov 20 13:30:55 2011 -0800
+++ b/json_input/benchmarks/thermal_eulerian.json	Sun Nov 20 23:10:46 2011 -0800
@@ -14,7 +14,9 @@
     {
         "systems": [
             {
-                "mesh": "v-T-mesh",
+                "mesh": "v-mesh",
+                "T-mesh": "T-mesh",
+                "displacementField": "DisplacementField",
                 "remesher": "velocityRemesher",
                 "velocityField": "VelocityField",
                 "staticLeft": "True",
@@ -68,11 +70,11 @@
                 "variables":[
                     {
                         "name": "vx",
-                        "value": "2.718281828"
+                        "value": "1.0"
                     },
                     {
                         "name": "vy",
-                        "value": "0"
+                        "value": "1.0"
                     }
                 ]
             }
diff -r 4b084966b296 -r 9b1f24b6f171 json_input/benchmarks/thermal_lagrangian.json
--- a/json_input/benchmarks/thermal_lagrangian.json	Sun Nov 20 13:30:55 2011 -0800
+++ b/json_input/benchmarks/thermal_lagrangian.json	Sun Nov 20 23:10:46 2011 -0800
@@ -14,7 +14,9 @@
     {
         "systems": [
             {
-                "mesh": "v-T-mesh",
+                "mesh": "v-mesh",
+                "T-mesh": "T-mesh",
+                "displacementField": "DisplacementField",
                 "remesher": "velocityRemesher",
                 "velocityField": "VelocityField"
             }
@@ -64,11 +66,11 @@
                 "variables":[
                     {
                         "name": "vx",
-                        "value": "1.0"
+                        "value": ".3*x-0.2"
                     },
                     {
                         "name": "vy",
-                        "value": "2.718281828"
+                        "value": "(x+.3)*(1.5-x)*y + (x-.15)*(0.7-x)"
                     }
                 ]
             }