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

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-09-13 15:36:57 -0700 (Thu, 13 Sep 2007)
New Revision: 7968

Modified:
   mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py
   mc/3D/CitcomS/trunk/lib/Instructions.c
   mc/3D/CitcomS/trunk/lib/Material_properties.c
   mc/3D/CitcomS/trunk/lib/global_defs.h
   mc/3D/CitcomS/trunk/module/setProperties.c
Log:
Comment out adiabatic temperature profile for now, since it is not used in the code.

Modified: mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py	2007-09-13 22:01:33 UTC (rev 7967)
+++ mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py	2007-09-13 22:36:57 UTC (rev 7968)
@@ -307,6 +307,7 @@
         dissipation_number = inv.float("dissipation_number", default=0.0)
         gruneisen = inv.float("gruneisen", default=0.0)
         surfaceT = inv.float("surfaceT", default=0.1)
+        #adiabaticT0 = inv.float("adiabaticT0", default=0.4)
         Q0 = inv.float("Q0", default=0.0)
 
         stokes_flow_only = inv.bool("stokes_flow_only", default=False)

Modified: mc/3D/CitcomS/trunk/lib/Instructions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Instructions.c	2007-09-13 22:01:33 UTC (rev 7967)
+++ mc/3D/CitcomS/trunk/lib/Instructions.c	2007-09-13 22:36:57 UTC (rev 7968)
@@ -458,6 +458,7 @@
   }
 
   input_float("surfaceT",&(E->control.surface_temp),"0.1",m);
+  /*input_float("adiabaticT0",&(E->control.adiabaticT0),"0.4",m);*/
   input_float("Q0",&(E->control.Q0),"0.0",m);
   /* Q0_enriched gets read in Tracer_setup.c */
 

Modified: mc/3D/CitcomS/trunk/lib/Material_properties.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Material_properties.c	2007-09-13 22:01:33 UTC (rev 7967)
+++ mc/3D/CitcomS/trunk/lib/Material_properties.c	2007-09-13 22:36:57 UTC (rev 7968)
@@ -58,7 +58,7 @@
     E->refstate.gravity = (double *) malloc((noz+1)*sizeof(double));
 
     /* reference profile of temperature */
-    E->refstate.Tadi = (double *) malloc((noz+1)*sizeof(double));
+    /*E->refstate.Tadi = (double *) malloc((noz+1)*sizeof(double));*/
 
 }
 
@@ -68,14 +68,14 @@
     int noz = E->lmesh.noz;
     int nel = E->lmesh.nel;
     int i;
-    double r, z, beta, T0;
+    double r, z, beta;
 
     beta = E->control.disptn_number * E->control.inv_gruneisen;
-    T0 = E->control.surface_temp / E->data.ref_temperature;
 
     /* All refstate variables (except Tadi) must be 1 at the surface.
      * Otherwise, the scaling of eqns in the code might not be correct. */
 
+    /* Adams-Williamson EoS */
     for(i=1; i<=noz; i++) {
 	r = E->sx[1][3][i];
 	z = 1 - r;
@@ -84,21 +84,21 @@
 	E->refstate.heat_capacity[i] = 1;
 	E->refstate.thermal_conductivity[i] = 1;
 	E->refstate.gravity[i] = 1;
-	E->refstate.Tadi[i] = T0 * (exp(E->control.disptn_number * z) - 1);
+	/*E->refstate.Tadi[i] = (E->control.adiabaticT0 + E->control.surface_temp) * exp(E->control.disptn_number * z) - E->control.surface_temp;*/
     }
 
     if(E->parallel.me == 0) {
-        fprintf(stderr, "nz  radius   depth    rho          Tadi\n");
-        fprintf(E->fp, "nz  radius   depth    rho          Tadi\n");
+        fprintf(stderr, "nz  radius   depth    rho\n");
+        fprintf(E->fp, "nz  radius   depth    rho\n");
     }
     if(E->parallel.me < E->parallel.nprocz)
         for(i=1; i<=noz; i++) {
-            fprintf(stderr, "%d %f %f %e %e\n",
+            fprintf(stderr, "%d %f %f %e\n",
                     i+E->lmesh.nzs-1, E->sx[1][3][i], 1-E->sx[1][3][i],
-                    E->refstate.rho[i], E->refstate.Tadi[i]);
-            fprintf(E->fp, "%d %f %f %e %e\n",
+                    E->refstate.rho[i]);
+            fprintf(E->fp, "%d %f %f %e\n",
                     i+E->lmesh.nzs-1, E->sx[1][3][i], 1-E->sx[1][3][i],
-                    E->refstate.rho[i], E->refstate.Tadi[i]);
+                    E->refstate.rho[i]);
         }
 
 }

Modified: mc/3D/CitcomS/trunk/lib/global_defs.h
===================================================================
--- mc/3D/CitcomS/trunk/lib/global_defs.h	2007-09-13 22:01:33 UTC (rev 7967)
+++ mc/3D/CitcomS/trunk/lib/global_defs.h	2007-09-13 22:36:57 UTC (rev 7968)
@@ -467,6 +467,9 @@
     /* surface temperature */
     float surface_temp;
 
+    /* adiabatic temperature extrapolated to the surface */
+    /* float adiabaticT0; */
+
     /**/
     float relative_err_accuracy;
 
@@ -540,7 +543,7 @@
     double *heat_capacity;
     double *thermal_conductivity;
     double *gravity;
-    double *Tadi;
+    /*double *Tadi;*/
 };
 
 

Modified: mc/3D/CitcomS/trunk/module/setProperties.c
===================================================================
--- mc/3D/CitcomS/trunk/module/setProperties.c	2007-09-13 22:01:33 UTC (rev 7967)
+++ mc/3D/CitcomS/trunk/module/setProperties.c	2007-09-13 22:36:57 UTC (rev 7968)
@@ -467,6 +467,7 @@
         E->control.inv_gruneisen = 0;
 
     getFloatProperty(properties, "surfaceT", E->control.surface_temp, fp);
+    /*getFloatProperty(properties, "adiabaticT0", E->control.adiabaticT0, fp);*/
     getFloatProperty(properties, "Q0", E->control.Q0, fp);
 
     getIntProperty(properties, "stokes_flow_only", E->control.stokes, fp);