[cig-commits] r7875 - in mc/3D/CitcomS/trunk: lib module

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-08-23 13:16:25 -0700 (Thu, 23 Aug 2007)
New Revision: 7875

Modified:
   mc/3D/CitcomS/trunk/lib/Advection_diffusion.c
   mc/3D/CitcomS/trunk/lib/Instructions.c
   mc/3D/CitcomS/trunk/lib/Output_h5.c
   mc/3D/CitcomS/trunk/lib/advection.h
   mc/3D/CitcomS/trunk/lib/global_defs.h
   mc/3D/CitcomS/trunk/module/setProperties.c
Log:
Renamed E->control.filter_temperature to E->advection.filter_temperature

Modified: mc/3D/CitcomS/trunk/lib/Advection_diffusion.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Advection_diffusion.c	2007-08-23 20:16:10 UTC (rev 7874)
+++ mc/3D/CitcomS/trunk/lib/Advection_diffusion.c	2007-08-23 20:16:25 UTC (rev 7875)
@@ -161,7 +161,7 @@
 
 
   /* filter temperature to remove over-/under-shoot */
-  if(E->control.filter_temperature)
+  if(E->advection.filter_temperature)
     filter(E);
 
 
@@ -203,6 +203,7 @@
     int m=E->parallel.me;
 
     input_boolean("ADV",&(E->advection.ADVECTION),"on",m);
+    input_boolean("filter_temp",&(E->advection.filter_temperature),"on",m);
     input_boolean("monitor_max_T",&(E->advection.monitor_max_T),"on",m);
 
     input_int("minstep",&(E->advection.min_timesteps),"1",m);

Modified: mc/3D/CitcomS/trunk/lib/Instructions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Instructions.c	2007-08-23 20:16:10 UTC (rev 7874)
+++ mc/3D/CitcomS/trunk/lib/Instructions.c	2007-08-23 20:16:25 UTC (rev 7875)
@@ -380,7 +380,6 @@
   input_int("bottbc",&(E->mesh.bottbc),"1",m);
   input_float("toptbcval",&(E->control.TBCtopval),"0.0",m);
   input_float("bottbcval",&(E->control.TBCbotval),"1.0",m);
-  input_int("filter_temp",&(E->control.filter_temperature),"1",m);
 
   input_boolean("side_sbcs",&(E->control.side_sbcs),"off",m);
 

Modified: mc/3D/CitcomS/trunk/lib/Output_h5.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Output_h5.c	2007-08-23 20:16:10 UTC (rev 7874)
+++ mc/3D/CitcomS/trunk/lib/Output_h5.c	2007-08-23 20:16:25 UTC (rev 7875)
@@ -1321,7 +1321,7 @@
      */
 
     status = set_attribute_int(input, "ADV", E->advection.ADVECTION);
-    status = set_attribute_int(input, "filter_temp", E->control.filter_temperature);
+    status = set_attribute_int(input, "filter_temp", E->advection.filter_temperature);
 
     status = set_attribute_float(input, "finetunedt", E->advection.fine_tune_dt);
     status = set_attribute_float(input, "fixed_timestep", E->advection.fixed_timestep);

Modified: mc/3D/CitcomS/trunk/lib/advection.h
===================================================================
--- mc/3D/CitcomS/trunk/lib/advection.h	2007-08-23 20:16:10 UTC (rev 7874)
+++ mc/3D/CitcomS/trunk/lib/advection.h	2007-08-23 20:16:25 UTC (rev 7875)
@@ -27,6 +27,8 @@
  */
 struct ADVECTION {
   int ADVECTION;
+  int filter_temperature;
+  int monitor_max_T;
 
   float gamma;
   float timestep;
@@ -44,7 +46,6 @@
   int temp_iterations;
   int sub_iterations;
   int last_sub_iterations;
-  int monitor_max_T;
 
 } advection;
 

Modified: mc/3D/CitcomS/trunk/lib/global_defs.h
===================================================================
--- mc/3D/CitcomS/trunk/lib/global_defs.h	2007-08-23 20:16:10 UTC (rev 7874)
+++ mc/3D/CitcomS/trunk/lib/global_defs.h	2007-08-23 20:16:25 UTC (rev 7875)
@@ -470,7 +470,7 @@
     float VBYbotval;
 
     int coor;
-  float coor_refine[4];
+    float coor_refine[4];
     char coor_file[100];
 
     int lith_age;
@@ -479,7 +479,6 @@
     float lith_age_depth;
     float lith_age_mantle_temp;
 
-    int filter_temperature;
     int temperature_bound_adj;
     float depth_bound_adj;
     float width_bound_adj;

Modified: mc/3D/CitcomS/trunk/module/setProperties.c
===================================================================
--- mc/3D/CitcomS/trunk/module/setProperties.c	2007-08-23 20:16:10 UTC (rev 7874)
+++ mc/3D/CitcomS/trunk/module/setProperties.c	2007-08-23 20:16:25 UTC (rev 7875)
@@ -98,7 +98,7 @@
     PUTS(("[CitcomS.solver.tsolver]\n"));
 
     getIntProperty(properties, "ADV", E->advection.ADVECTION, fp);
-    getIntProperty(properties, "filter_temp", E->control.filter_temperature, fp);
+    getIntProperty(properties, "filter_temp", E->advection.filter_temperature, fp);
     getIntProperty(properties, "monitor_max_T", E->advection.monitor_max_T, fp);
 
     getFloatProperty(properties, "finetunedt", E->advection.fine_tune_dt, fp);