[cig-commits] commit: Add in a separate Q1 mesh for temperature

[Mercurial]

changeset:   410:b7eef633f548
user:        Walter Landry <wlandry at caltech.edu>
date:        Sun Nov 20 13:11:54 2011 -0800
files:       json_parser/add_defaults.cxx
description:
Add in a separate Q1 mesh for temperature


diff -r b63e17b87036 -r b7eef633f548 json_parser/add_defaults.cxx
--- a/json_parser/add_defaults.cxx	Sat Nov 19 10:50:05 2011 -0800
+++ b/json_parser/add_defaults.cxx	Sun Nov 20 13:11:54 2011 -0800
@@ -30,15 +30,15 @@ void add_defaults(json_spirit::Value &ro
     "{"
     "    \"Type\": \"UnderworldContext\""
     "},"
-    "\"v-T-mesh\":"
+    "\"v-mesh\":"
     "{"
     "    \"Type\": \"FeMesh\","
     "    \"elementType\": \"quadratic\""
     "},"
-    "\"v-T-mesh-generator\":"
+    "\"v-mesh-generator\":"
     "{"
     "    \"Type\": \"C2Generator\","
-    "    \"mesh\": \"v-T-mesh\","
+    "    \"mesh\": \"v-mesh\","
     "    \"dim\": \"dim\","
     "    \"shadowDepth\": \"shadowDepth\","
     "    \"regular\": \"False\","
@@ -61,7 +61,7 @@ void add_defaults(json_spirit::Value &ro
     "\"velocity\":"
     "{"
     "    \"Type\": \"MeshVariable\","
-    "    \"mesh\": \"v-T-mesh\","
+    "    \"mesh\": \"v-mesh\","
     "    \"Rank\": \"Vector\","
     "    \"DataType\": \"Double\","
     "    \"VectorComponentCount\": \"dim\","
@@ -74,17 +74,17 @@ void add_defaults(json_spirit::Value &ro
     "\"velocityBCs\":"
     "{"
     "    \"Type\": \"CompositeVC\","
-    "    \"Data\": \"v-T-mesh\""
+    "    \"Data\": \"v-mesh\""
     "},"
     "\"velocityICs\":"
     "{"
     "    \"Type\": \"CompositeVC\","
-    "    \"Data\": \"v-T-mesh\""
+    "    \"Data\": \"v-mesh\""
     "},"
     "\"velocityDofLayout\":"
     "{"
     "    \"Type\": \"DofLayout\","
-    "    \"mesh\": \"v-T-mesh\","
+    "    \"mesh\": \"v-mesh\","
     "    \"BaseVariableCount\": \"dim\","
     "    \"BaseVariables\": ["
     "        \"vx\","
@@ -95,7 +95,7 @@ void add_defaults(json_spirit::Value &ro
     "\"VelocityField\":"
     "{"
     "    \"Type\": \"FeVariable\","
-    "    \"FEMesh\": \"v-T-mesh\","
+    "    \"FEMesh\": \"v-mesh\","
     "    \"DofLayout\": \"velocityDofLayout\","
     "    \"BC\": \"velocityBCs\","
     "    \"IC\": \"velocityICs\","
@@ -104,7 +104,7 @@ void add_defaults(json_spirit::Value &ro
     "\"cellLayout\":"
     "{"
     "    \"Type\": \"ElementCellLayout\","
-    "    \"Mesh\": \"v-T-mesh\""
+    "    \"Mesh\": \"v-mesh\""
     "},"
     "\"particleLayout\":"
     "{"
@@ -116,7 +116,7 @@ void add_defaults(json_spirit::Value &ro
     "    \"Type\": \"IntegrationPointsSwarm\","
     "    \"CellLayout\": \"cellLayout\","
     "    \"ParticleLayout\": \"particleLayout\","
-    "    \"FeMesh\": \"v-T-mesh\","
+    "    \"FeMesh\": \"v-mesh\","
     "    \"TimeIntegrator\": \"timeIntegrator\","
     "    \"IntegrationPointMapper\": \"oneToManyMapper\""
     "},"
@@ -155,7 +155,7 @@ void add_defaults(json_spirit::Value &ro
     "    \"Type\": \"IntegrationPointsSwarm\","
     "    \"CellLayout\": \"cellLayout\","
     "    \"ParticleLayout\": \"localLayout\","
-    "    \"FeMesh\": \"v-T-mesh\","
+    "    \"FeMesh\": \"v-mesh\","
     "    \"WeightsCalculator\": \"weights\","
     "    \"TimeIntegrator\": \"timeIntegrator\","
     "    \"IntegrationPointMapper\": \"mapper\""
@@ -170,7 +170,7 @@ void add_defaults(json_spirit::Value &ro
     "{"
     "    \"Type\": \"MeshParticleLayout\","
     "    \"cellParticleCount\": \"particlesPerCell\","
-    "    \"mesh\": \"v-T-mesh\""
+    "    \"mesh\": \"v-mesh\""
     "},"
     "\"pMovementHandler\":"
     "{"
@@ -185,7 +185,7 @@ void add_defaults(json_spirit::Value &ro
     "    \"Type\": \"MaterialPointsSwarm\","
     "    \"CellLayout\": \"cellLayout\","
     "    \"ParticleLayout\": \"materialSwarmParticleLayout\","
-    "    \"FeMesh\": \"v-T-mesh\","
+    "    \"FeMesh\": \"v-mesh\","
     "    \"ParticleCommHandlers\": ["
     "        \"pMovementHandler\","
     "        \"pShadowSync\""
@@ -211,7 +211,7 @@ void add_defaults(json_spirit::Value &ro
     "\"velocityRemesher\":"
     "{"
     "    \"Type\": \"RegularRemesherCmpt\","
-    "    \"mesh\": \"v-T-mesh\","
+    "    \"mesh\": \"v-mesh\","
     "    \"remeshDims\": ["
     "        \"0\","
     "        \"1\","
@@ -231,7 +231,7 @@ void add_defaults(json_spirit::Value &ro
     "{"
     "    \"Type\": \"InnerGenerator\","
     "    \"mesh\": \"pressure-mesh\","
-    "    \"elementMesh\": \"v-T-mesh\","
+    "    \"elementMesh\": \"v-mesh\","
     "    \"dim\": \"dim\","
     "    \"shadowDepth\": \"shadowDepth\","
     "    \"regular\": \"False\","
@@ -396,27 +396,55 @@ void add_defaults(json_spirit::Value &ro
 
   std::string thermal_components
     ("{"
+     "\"T-mesh\":"
+     "{"
+     "    \"Type\": \"FeMesh\","
+     "    \"elementType\": \"linear\""
+     "},"
+     "\"T-mesh-generator\":"
+     "{"
+     "    \"Type\": \"CartesianGenerator\","
+     "    \"mesh\": \"T-mesh\","
+     "    \"dim\": \"dim\","
+     "    \"shadowDepth\": \"shadowDepth\","
+     "    \"regular\": \"False\","
+     "    \"size\": ["
+     "        \"nx\","
+     "        \"ny\","
+     "        \"nz\""
+     "    ],"
+     "    \"minCoord\": ["
+     "        \"minX\","
+     "        \"minY\","
+     "        \"minZ\""
+     "    ],"
+     "    \"maxCoord\": ["
+     "        \"maxX\","
+     "        \"maxY\","
+     "        \"maxZ\""
+     "    ]"
+     "},"
      "\"temperature\":"
      "{"
      "\"Type\": \"MeshVariable\","
      "\"Rank\": \"Scalar\","
      "\"DataType\": \"Double\","
-     "\"mesh\": \"v-T-mesh\""
+     "\"mesh\": \"T-mesh\""
      "},"
      "\"temperatureBCs\":"
      "{"
      "\"Type\": \"CompositeVC\","
-     "\"Data\": \"v-T-mesh\""
+     "\"Data\": \"T-mesh\""
      "},"
      "\"temperatureICs\":"
      "{"
      "\"Type\": \"CompositeVC\","
-     "\"Data\": \"v-T-mesh\""
+     "\"Data\": \"T-mesh\""
      "},"
      "\"temperatureDofLayout\":"
      "{"
      "\"Type\": \"DofLayout\","
-     "\"mesh\": \"v-T-mesh\","
+     "\"mesh\": \"T-mesh\","
      "\"BaseVariables\":"
      "["
      "\"temperature\""
@@ -425,7 +453,7 @@ void add_defaults(json_spirit::Value &ro
      "\"TemperatureField\":"
      "{"
      "\"Type\": \"FeVariable\","
-     "\"FEMesh\": \"v-T-mesh\","
+     "\"FEMesh\": \"T-mesh\","
      "\"DofLayout\": \"temperatureDofLayout\","
      "\"BC\": \"temperatureBCs\","
      "\"IC\": \"temperatureICs\","
@@ -437,13 +465,12 @@ void add_defaults(json_spirit::Value &ro
      "\"Operator\": \"Gradient\","
      "\"FeVariable\": \"TemperatureField\""
      "},"
-
      "\"displacement\":"
      "{"
      "\"Type\": \"MeshVariable\","
      "\"Rank\": \"Vector\","
      "\"DataType\": \"Double\","
-     "\"mesh\": \"v-T-mesh\","
+     "\"mesh\": \"v-mesh\","
      "\"VectorComponentCount\": \"dim\","
      "\"names\" : ["
      "\"dx\","
@@ -454,17 +481,17 @@ void add_defaults(json_spirit::Value &ro
      "\"displacementBCs\":"
      "{"
      "\"Type\": \"CompositeVC\","
-     "\"Data\": \"v-T-mesh\""
+     "\"Data\": \"v-mesh\""
      "},"
      "\"displacementICs\":"
      "{"
      "\"Type\": \"CompositeVC\","
-     "\"Data\": \"v-T-mesh\""
+     "\"Data\": \"v-mesh\""
      "},"
      "\"displacementDofLayout\":"
      "{"
      "\"Type\": \"DofLayout\","
-     "\"mesh\": \"v-T-mesh\","
+     "\"mesh\": \"v-mesh\","
      "\"BaseVariableCount\": \"dim\","
      "\"BaseVariables\":"
      "["
@@ -476,7 +503,7 @@ void add_defaults(json_spirit::Value &ro
      "\"DisplacementField\":"
      "{"
      "\"Type\": \"FeVariable\","
-     "\"FEMesh\": \"v-T-mesh\","
+     "\"FEMesh\": \"v-mesh\","
      "\"DofLayout\": \"displacementDofLayout\","
      "\"BC\": \"displacementBCs\","
      "\"IC\": \"displacementICs\""