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

[tan2 at geodynamics.org]

Author: tan2
Date: 2006-10-12 21:10:32 -0700 (Thu, 12 Oct 2006)
New Revision: 4965

Modified:
   mc/3D/CitcomS/trunk/CitcomS/Components/Advection_diffusion/Advection_diffusion.py
   mc/3D/CitcomS/trunk/CitcomS/Components/Stokes_solver/Incompressible.py
   mc/3D/CitcomS/trunk/lib/Output_h5.c
   mc/3D/CitcomS/trunk/module/setProperties.c
Log:
Moved input parameters "aug_lagr" and "aug_number" from tsolver to vsolver,
where they really should belong to. These parameters are for augmented lagragian
stiffness matrix (I have no idea on what it is...), as indicated in
Element_calculations.c.


Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Advection_diffusion/Advection_diffusion.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Advection_diffusion/Advection_diffusion.py	2006-10-13 02:22:01 UTC (rev 4964)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Advection_diffusion/Advection_diffusion.py	2006-10-13 04:10:32 UTC (rev 4965)
@@ -95,11 +95,8 @@
 
         adv_sub_iterations = prop.int("adv_sub_iterations", default=2)
 
-        aug_lagr = prop.bool("aug_lagr", default=True)
-        aug_number = prop.float("aug_number", default=2.0e3)
 
 
-
 # version
 __id__ = "$Id$"
 

Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Stokes_solver/Incompressible.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Stokes_solver/Incompressible.py	2006-10-13 02:22:01 UTC (rev 4964)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Stokes_solver/Incompressible.py	2006-10-13 04:10:32 UTC (rev 4965)
@@ -99,6 +99,8 @@
         vhighstep = prop.int("vhighstep", default=3)
         piterations = prop.int("piterations", default=1000)
 
+        aug_lagr = prop.bool("aug_lagr", default=True)
+        aug_number = prop.float("aug_number", default=2.0e3)
 
 # version
 __id__ = "$Id$"

Modified: mc/3D/CitcomS/trunk/lib/Output_h5.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Output_h5.c	2006-10-13 02:22:01 UTC (rev 4964)
+++ mc/3D/CitcomS/trunk/lib/Output_h5.c	2006-10-13 04:10:32 UTC (rev 4965)
@@ -1869,10 +1869,7 @@
 
     status = set_attribute_int(input, "adv_sub_iterations", E->advection.temp_iterations);
 
-    status = set_attribute_int(input, "aug_lagr", E->control.augmented_Lagr);
-    status = set_attribute_double(input, "aug_number", E->control.augmented);
 
-
     /*
      * BC.inventory
      */
@@ -2131,6 +2128,9 @@
     status = set_attribute_int(input, "vhighstep", E->control.v_steps_high);
     status = set_attribute_int(input, "piterations", E->control.p_iterations);
 
+    status = set_attribute_int(input, "aug_lagr", E->control.augmented_Lagr);
+    status = set_attribute_double(input, "aug_number", E->control.augmented);
+
     /* status = set_attribute(input, "", H5T_NATIVE_, &(E->)); */
 
     /*

Modified: mc/3D/CitcomS/trunk/module/setProperties.c
===================================================================
--- mc/3D/CitcomS/trunk/module/setProperties.c	2006-10-13 02:22:01 UTC (rev 4964)
+++ mc/3D/CitcomS/trunk/module/setProperties.c	2006-10-13 04:10:32 UTC (rev 4965)
@@ -103,10 +103,7 @@
 
     getIntProperty(properties, "adv_sub_iterations", E->advection.temp_iterations, fp);
 
-    getIntProperty(properties, "aug_lagr", E->control.augmented_Lagr, fp);
-    getDoubleProperty(properties, "aug_number", E->control.augmented, fp);
 
-
     E->advection.total_timesteps = 1;
     E->advection.sub_iterations = 1;
     E->advection.last_sub_iterations = 1;
@@ -741,6 +738,9 @@
     getIntProperty(properties, "vhighstep", E->control.v_steps_high, fp);
     getIntProperty(properties, "piterations", E->control.p_iterations, fp);
 
+    getIntProperty(properties, "aug_lagr", E->control.augmented_Lagr, fp);
+    getDoubleProperty(properties, "aug_number", E->control.augmented, fp);
+
     PUTS(("\n"));
 
     Py_INCREF(Py_None);