[cig-commits] commit: Change default from NearestNeighborMapper to OneToManyMapper. Temporarily comment out StressField and ViscosityField

[Mercurial]

changeset:   397:2126b4a93406
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Wed Nov 09 15:09:18 2011 -0800
files:       json_parser/add_defaults.cxx
description:
Change default from NearestNeighborMapper to OneToManyMapper.  Temporarily comment out StressField and ViscosityField


diff -r 3ebd93999f49 -r 2126b4a93406 json_parser/add_defaults.cxx
--- a/json_parser/add_defaults.cxx	Wed Nov 09 15:08:23 2011 -0800
+++ b/json_parser/add_defaults.cxx	Wed Nov 09 15:09:18 2011 -0800
@@ -124,11 +124,11 @@ void add_defaults(json_spirit::Value &ro
     "    \"ParticleLayout\": \"particleLayout\","
     "    \"FeMesh\": \"v-T-mesh\","
     "    \"TimeIntegrator\": \"timeIntegrator\","
-    "    \"IntegrationPointMapper\": \"nearestMapper\""
+    "    \"IntegrationPointMapper\": \"oneToManyMapper\""
     "},"
-    "\"nearestMapper\":"
+    "\"oneToManyMapper\":"
     "{"
-    "    \"Type\": \"NearestNeighborMapper\","
+    "    \"Type\": \"OneToManyMapper\","
     "    \"IntegrationPointsSwarm\": \"gaussSwarm\","
     "    \"MappedSwarm\": \"picIntegrationPoints\""
     "},"
@@ -297,24 +297,24 @@ void add_defaults(json_spirit::Value &ro
     "    \"DofLayout\": \"pressureDofLayout\","
     "    \"LinkedDofInfo\": \"pressureLinkedDofs\""
     "},"
-    "\"StressField\":"
-    "{"
-    "    \"Type\": \"StressField\","
-    "    \"StrainRateField\": \"StrainRateField\","
-    "    \"Context\": \"context\","
-    "    \"ConstitutiveMatrix\": \"constitutiveMatrix\","
-    "    \"Swarm\": \"gaussSwarm\","
-    "    \"Mesh\": \"v-T-mesh\","
-    "    \"IC\": \"stressICs\""
-    "},"
-    "\"ViscosityField\":"
-    "{"
-    "    \"Type\": \"ViscosityField\","
-    "    \"Context\": \"context\","
-    "    \"Swarm\": \"gaussSwarm\","
-    "    \"Mesh\": \"v-T-mesh\","
-    "    \"ConstitutiveMatrix\": \"constitutiveMatrix\""
-    "},"
+    // "\"StressField\":"
+    // "{"
+    // "    \"Type\": \"StressField\","
+    // "    \"StrainRateField\": \"StrainRateField\","
+    // "    \"Context\": \"context\","
+    // "    \"ConstitutiveMatrix\": \"constitutiveMatrix\","
+    // "    \"Swarm\": \"gaussSwarm\","
+    // "    \"Mesh\": \"v-T-mesh\","
+    // "    \"IC\": \"stressICs\""
+    // "},"
+    // "\"ViscosityField\":"
+    // "{"
+    // "    \"Type\": \"ViscosityField\","
+    // "    \"Context\": \"context\","
+    // "    \"Swarm\": \"gaussSwarm\","
+    // "    \"Mesh\": \"v-T-mesh\","
+    // "    \"ConstitutiveMatrix\": \"constitutiveMatrix\""
+    // "},"
     "\"solutionVelocity\":"
     "{"
     "    \"Type\": \"SolutionVector\","