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

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-02-05 18:23:07 -0800 (Mon, 05 Feb 2007)
New Revision: 5968

Modified:
   mc/3D/CitcomS/trunk/CitcomS/Components/Advection_diffusion/Advection_diffusion.py
   mc/3D/CitcomS/trunk/lib/Advection_diffusion.c
   mc/3D/CitcomS/trunk/lib/Convection.c
   mc/3D/CitcomS/trunk/module/setProperties.c
Log:
Added input parameters that controlling the predictor-corrector scheme

Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Advection_diffusion/Advection_diffusion.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Advection_diffusion/Advection_diffusion.py	2007-02-06 02:22:47 UTC (rev 5967)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Advection_diffusion/Advection_diffusion.py	2007-02-06 02:23:07 UTC (rev 5968)
@@ -90,9 +90,11 @@
 
         fixed_timestep = prop.float("fixed_timestep", default=0.0)
         finetunedt = prop.float("finetunedt", default=0.9)
+        adv_gamma = prop.float("adv_gamma", default=0.5)
+        adv_sub_iterations = prop.int("adv_sub_iterations", default=2)
+
         inputdiffusivity = prop.float("inputdiffusivity", default=1)
 
-        adv_sub_iterations = prop.int("adv_sub_iterations", default=2)
 
 
 

Modified: mc/3D/CitcomS/trunk/lib/Advection_diffusion.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Advection_diffusion.c	2007-02-06 02:22:47 UTC (rev 5967)
+++ mc/3D/CitcomS/trunk/lib/Advection_diffusion.c	2007-02-06 02:23:07 UTC (rev 5968)
@@ -195,7 +195,8 @@
     input_int("maxtotstep",&(E->advection.max_total_timesteps),"1000000",m);
     input_float("finetunedt",&(E->advection.fine_tune_dt),"0.9",m);
     input_float("fixed_timestep",&(E->advection.fixed_timestep),"0.0",m);
-    input_int("adv_sub_iterations",&(E->advection.temp_iterations),"2,2,nomax",m);
+    input_float("adv_gamma",&(E->advection.gamma),"0.5",m);
+    input_int("adv_sub_iterations",&(E->advection.temp_iterations),"2,1,nomax",m);
 
     input_float("inputdiffusivity",&(E->control.inputdiff),"1.0",m);
 

Modified: mc/3D/CitcomS/trunk/lib/Convection.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Convection.c	2007-02-06 02:22:47 UTC (rev 5967)
+++ mc/3D/CitcomS/trunk/lib/Convection.c	2007-02-06 02:23:07 UTC (rev 5968)
@@ -48,11 +48,9 @@
     void convection_initial_fields();
     void twiddle_thumbs();
 
-    E->advection.temp_iterations = 2; /* petrov-galerkin iterations: minimum value. */
     E->advection.total_timesteps = 1;
     E->advection.sub_iterations = 1;
     E->advection.last_sub_iterations = 1;
-    E->advection.gamma = 0.5;
     E->advection.dt_reduced = 1.0;
 
     E->monitor.T_maxvaried = 1.05;

Modified: mc/3D/CitcomS/trunk/module/setProperties.c
===================================================================
--- mc/3D/CitcomS/trunk/module/setProperties.c	2007-02-06 02:22:47 UTC (rev 5967)
+++ mc/3D/CitcomS/trunk/module/setProperties.c	2007-02-06 02:23:07 UTC (rev 5968)
@@ -98,11 +98,12 @@
 
     getFloatProperty(properties, "finetunedt", E->advection.fine_tune_dt, fp);
     getFloatProperty(properties, "fixed_timestep", E->advection.fixed_timestep, fp);
+    getFloatProperty(properties, "adv_gamma", E->advection.gamma, fp);
+    getIntProperty(properties, "adv_sub_iterations", E->advection.temp_iterations, fp);
+
     getFloatProperty(properties, "inputdiffusivity", E->control.inputdiff, fp);
 
-    getIntProperty(properties, "adv_sub_iterations", E->advection.temp_iterations, fp);
 
-
     PUTS(("\n"));
 
     Py_INCREF(Py_None);