[cig-commits] commit: Make all of the input files work

[Mercurial]

changeset:   415:a4c0d51cacb3
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Mon Nov 21 12:12:48 2011 -0800
files:       json_input/benchmarks/geomod2004_extension.json json_input/cookbook/thermal.json json_input/cookbook/thermal_file.json json_input/cookbook/thermal_only.json
description:
Make all of the input files work


diff -r 92469d19bfd5 -r a4c0d51cacb3 json_input/benchmarks/geomod2004_extension.json
--- a/json_input/benchmarks/geomod2004_extension.json	Mon Nov 21 00:28:14 2011 -0800
+++ b/json_input/benchmarks/geomod2004_extension.json	Mon Nov 21 12:12:48 2011 -0800
@@ -10,8 +10,8 @@
     {
         "systems": [
             {
-                "mesh": "v-T-mesh",
-                "innerMesh": "pressure-mesh",
+                "mesh": "v-mesh",
+                "p-mesh": "p-mesh",
                 "remesher": "velocityRemesher",
                 "velocityField": "VelocityField",
                 "wrapTop": "True"
diff -r 92469d19bfd5 -r a4c0d51cacb3 json_input/cookbook/thermal.json
--- a/json_input/cookbook/thermal.json	Mon Nov 21 00:28:14 2011 -0800
+++ b/json_input/cookbook/thermal.json	Mon Nov 21 12:12:48 2011 -0800
@@ -3,10 +3,6 @@
     [
         {
             "Type": "Underworld_EulerDeform",
-            "Context":"context"
-        },
-        {
-            "Type": "Underworld_MeshAdvectionCorrection",
             "Context":"context"
         }
     ],
@@ -17,6 +13,7 @@
                 "mesh": "v-mesh",
                 "p-mesh": "p-mesh",
                 "T-mesh": "T-mesh",
+                "displacementField": "DisplacementField",
                 "remesher": "velocityRemesher",
                 "velocityField": "VelocityField",
                 "wrapTop": "True"
diff -r 92469d19bfd5 -r a4c0d51cacb3 json_input/cookbook/thermal_file.json
--- a/json_input/cookbook/thermal_file.json	Mon Nov 21 00:28:14 2011 -0800
+++ b/json_input/cookbook/thermal_file.json	Mon Nov 21 12:12:48 2011 -0800
@@ -3,10 +3,6 @@
     [
         {
             "Type": "Underworld_EulerDeform",
-            "Context":"context"
-        },
-        {
-            "Type": "Underworld_MeshAdvectionCorrection",
             "Context":"context"
         }
     ],
@@ -17,6 +13,7 @@
                 "mesh": "v-mesh",
                 "p-mesh": "p-mesh",
                 "T-mesh": "T-mesh",
+                "displacementField": "DisplacementField",
                 "remesher": "velocityRemesher",
                 "velocityField": "VelocityField",
                 "wrapTop": "True"
diff -r 92469d19bfd5 -r a4c0d51cacb3 json_input/cookbook/thermal_only.json
--- a/json_input/cookbook/thermal_only.json	Mon Nov 21 00:28:14 2011 -0800
+++ b/json_input/cookbook/thermal_only.json	Mon Nov 21 12:12:48 2011 -0800
@@ -1,11 +1,4 @@
 {
-    "plugins":
-    [
-        {
-            "Type": "Underworld_EulerDeform",
-            "Context":"context"
-        }
-    ],
     "components":
     {
         "boxShape":
@@ -158,6 +151,7 @@
     },
 
     "FieldVariablesToCheckpoint": [
+        "VelocityField",
         "TemperatureField"
     ],
     "enable-stokes": false,