[cig-commits] r16162 - in mc/3D/CitcomS/trunk: CitcomS/Components/Stokes_solver module

[tan2 at geodynamics.org]

Author: tan2
Date: 2010-01-21 13:23:26 -0800 (Thu, 21 Jan 2010)
New Revision: 16162

Modified:
   mc/3D/CitcomS/trunk/CitcomS/Components/Stokes_solver/Incompressible.py
   mc/3D/CitcomS/trunk/module/setProperties.c
Log:
Added pyre input for the new parameters added in r16138.


Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Stokes_solver/Incompressible.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Stokes_solver/Incompressible.py	2010-01-21 21:22:46 UTC (rev 16161)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Stokes_solver/Incompressible.py	2010-01-21 21:23:26 UTC (rev 16162)
@@ -87,6 +87,8 @@
         precond = prop.bool("precond", default=True)
 
         accuracy = prop.float("accuracy", default=1.0e-4)
+        inner_accuracy_scale = prop.float("inner_accuracy_scale", default=1.0)
+
         check_continuity_convergence = prop.bool("check_continuity_convergence", default=True)
         check_pressure_convergence = prop.bool("check_pressure_convergence", default=True)
 
@@ -105,6 +107,8 @@
         uzawa = prop.str("uzawa", default="cg",
                          validator=prop.choice(["cg", "bicg"]))
         compress_iter_maxstep = prop.int("compress_iter_maxstep", default=100)
+
+        inner_remove_rigid_rotation = prop.bool("inner_remove_rigid_rotation", default=False)
         remove_rigid_rotation = prop.bool("remove_rigid_rotation", default=True)
         remove_angular_momentum = prop.bool("remove_angular_momentum", default=True)
 

Modified: mc/3D/CitcomS/trunk/module/setProperties.c
===================================================================
--- mc/3D/CitcomS/trunk/module/setProperties.c	2010-01-21 21:22:46 UTC (rev 16161)
+++ mc/3D/CitcomS/trunk/module/setProperties.c	2010-01-21 21:23:26 UTC (rev 16162)
@@ -880,6 +880,7 @@
     getIntProperty(properties, "precond", E->control.precondition, fp);
 
     getDoubleProperty(properties, "accuracy", E->control.accuracy, fp);
+    getDoubleProperty(properties, "inner_accuracy_scale", E->control.inner_accuracy_scale, fp);
 
     getIntProperty(properties, "check_continuity_convergence", E->control.check_continuity_convergence, fp);
     getIntProperty(properties, "check_pressure_convergence", E->control.check_pressure_convergence, fp);
@@ -896,6 +897,7 @@
     getIntProperty(properties, "aug_lagr", E->control.augmented_Lagr, fp);
     getDoubleProperty(properties, "aug_number", E->control.augmented, fp);
 
+    getIntProperty(properties, "inner_remove_rigid_rotation", E->control.inner_remove_rigid_rotation, fp);
     getIntProperty(properties, "remove_rigid_rotation", E->control.remove_rigid_rotation, fp);
     getIntProperty(properties, "remove_angular_momentum", E->control.remove_angular_momentum, fp);