[cig-commits] commit: Add BuoyancyDampingTerm to the defaults and in stokesEqn

[Mercurial]

changeset:   451:9fe5e79d7fce
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Mon Apr 30 13:48:57 2012 -0700
files:       json_parser/add_defaults.cxx
description:
Add BuoyancyDampingTerm to the defaults and in stokesEqn


diff -r b4ac044e1eaf -r 9fe5e79d7fce json_parser/add_defaults.cxx
--- a/json_parser/add_defaults.cxx	Fri Mar 16 11:45:27 2012 -0700
+++ b/json_parser/add_defaults.cxx	Mon Apr 30 13:48:57 2012 -0700
@@ -385,19 +385,27 @@ void add_defaults(json_spirit::Value &ro
     "    \"nonLinearMinIterations\": \"nonLinearMinIterations\","
     "    \"nonLinearMaxIterations\": \"nonLinearMaxIterations\","
     "    \"nonLinearTolerance\": \"nonLinearTolerance\","
-    "    \"makeConvergenceFile\": \"false\""
+    "    \"makeConvergenceFile\": \"false\","
+    "    \"BuoyancyDampingTerm\": \"buoyancyDampingTerm\""
     "},"
-    "\"storeViscosity\":"
-    "{"
-    "    \"Type\": \"StoreVisc\","
-    "    \"MaterialPointsSwarm\": \"materialSwarm\""
-    "},"
-    "\"storeStress\":"
-    "{"
-    "    \"Type\": \"StoreStress\","
-    "    \"MaterialPointsSwarm\": \"materialSwarm\""
-    "}"
-    "}");
+    "\"buoyancyDampingTerm\":"
+     "{"
+     "   \"Type\": \"BuoyancyDampingTerm\","
+     "   \"Swarm\": \"gaussSwarm\","
+     "   \"StiffnessMatrix\": \"k_matrix\","
+     "   \"BuoyancyForceTerm\": \"buoyancyForceTerm\""
+     "},"
+     "\"storeViscosity\":"
+     "{"
+     "    \"Type\": \"StoreVisc\","
+     "    \"MaterialPointsSwarm\": \"materialSwarm\""
+     "},"
+     "\"storeStress\":"
+     "{"
+     "    \"Type\": \"StoreStress\","
+     "    \"MaterialPointsSwarm\": \"materialSwarm\""
+     "}"
+     "}");
 
   std::string thermal_components
     ("{"