[cig-commits] r7873 - mc/3D/CitcomS/trunk/lib

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-08-23 13:15:50 -0700 (Thu, 23 Aug 2007)
New Revision: 7873

Modified:
   mc/3D/CitcomS/trunk/lib/Advection_diffusion.c
   mc/3D/CitcomS/trunk/lib/advection.h
Log:
Removed unused var. in struct advection

Modified: mc/3D/CitcomS/trunk/lib/Advection_diffusion.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Advection_diffusion.c	2007-08-23 20:14:52 UTC (rev 7872)
+++ mc/3D/CitcomS/trunk/lib/Advection_diffusion.c	2007-08-23 20:15:50 UTC (rev 7873)
@@ -201,14 +201,8 @@
 
     input_float("inputdiffusivity",&(E->control.inputdiff),"1.0",m);
 
-/*     input_float("sub_tolerance",&(E->advection.vel_substep_aggression),"0.005",m);   */
-/*     input_int("maxsub",&(E->advection.max_substeps),"25",m); */
 
-/*     input_float("liddefvel",&(E->advection.lid_defining_velocity),"0.01",m); */
-/*     input_float("sublayerfrac",&(E->advection.sub_layer_sample_level),"0.5",m);             */
-
-
-  return;
+    return;
 }
 
 void advection_diffusion_allocate_memory(E)

Modified: mc/3D/CitcomS/trunk/lib/advection.h
===================================================================
--- mc/3D/CitcomS/trunk/lib/advection.h	2007-08-23 20:14:52 UTC (rev 7872)
+++ mc/3D/CitcomS/trunk/lib/advection.h	2007-08-23 20:15:50 UTC (rev 7873)
@@ -1,6 +1,6 @@
 /*
  *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * 
+ *
  *<LicenseText>
  *
  * CitcomS by Louis Moresi, Shijie Zhong, Lijie Han, Eh Tan,
@@ -22,12 +22,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  *</LicenseText>
- * 
+ *
  *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
 struct ADVECTION {
   int ADVECTION;
- 
+
   float gamma;
   float timestep;
   float diff_timestep;
@@ -35,25 +35,17 @@
   float dt_reduced;
   float fixed_timestep;
   float max_dimensionless_time;
- 
-  int min_timesteps;  
+
+  int min_timesteps;
   int max_timesteps;
   int max_total_timesteps;
   int timesteps;
   int total_timesteps;
   int temp_iterations;
-  int max_substeps;
   int sub_iterations;
-  int last_sub_iterations; 
+  int last_sub_iterations;
 
-  float vel_substep_aggression;
-  float temp_updatedness;
-  float visc_updatedness;
 
-  float lid_defining_velocity;
-  float sub_layer_sample_level;
+} advection;
 
- 
- } advection;
 
-