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

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-09-24 14:28:26 -0700 (Mon, 24 Sep 2007)
New Revision: 8016

Modified:
   mc/3D/CitcomS/trunk/lib/Instructions.c
   mc/3D/CitcomS/trunk/lib/Material_properties.c
   mc/3D/CitcomS/trunk/lib/global_defs.h
Log:
Comment out varialbe thermal conductivity. Removed unused struct members.

Modified: mc/3D/CitcomS/trunk/lib/Instructions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Instructions.c	2007-09-24 21:28:05 UTC (rev 8015)
+++ mc/3D/CitcomS/trunk/lib/Instructions.c	2007-09-24 21:28:26 UTC (rev 8016)
@@ -796,10 +796,6 @@
 
   /* SECOND: values for which an obvious default setting is useful */
 
-  E->control.CITCOM_ORTHO = 1; /* for orthogonal meshes by default */
-  E->control.CITCOM_ORTHOZ = 1; /* for orthogonal meshes by default */
-
-
     E->control.stokes=0;
     E->control.restart=0;
     E->control.CONVECTION = 0;
@@ -810,7 +806,6 @@
     E->control.CONJ_GRAD = 0;
     E->control.NMULTIGRID = 0;
     E->control.EMULTIGRID = 0;
-    E->control.COMPRESS = 1;
     E->control.augmented_Lagr = 0;
     E->control.augmented = 0.0;
 

Modified: mc/3D/CitcomS/trunk/lib/Material_properties.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Material_properties.c	2007-09-24 21:28:05 UTC (rev 8015)
+++ mc/3D/CitcomS/trunk/lib/Material_properties.c	2007-09-24 21:28:26 UTC (rev 8016)
@@ -52,7 +52,7 @@
     E->refstate.heat_capacity = (double *) malloc((noz+1)*sizeof(double));
 
     /* reference profile of thermal conductivity */
-    E->refstate.thermal_conductivity = (double *) malloc((noz+1)*sizeof(double));
+    /*E->refstate.thermal_conductivity = (double *) malloc((noz+1)*sizeof(double));*/
 
     /* reference profile of gravity */
     E->refstate.gravity = (double *) malloc((noz+1)*sizeof(double));
@@ -82,14 +82,13 @@
 	E->refstate.rho[i] = exp(beta*z);
 	E->refstate.thermal_expansivity[i] = 1;
 	E->refstate.heat_capacity[i] = 1;
-	E->refstate.thermal_conductivity[i] = 1;
+	/*E->refstate.thermal_conductivity[i] = 1;*/
 	E->refstate.gravity[i] = 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\n");
-        fprintf(E->fp, "nz  radius   depth    rho\n");
     }
     if(E->parallel.me < E->parallel.nprocz)
         for(i=1; i<=noz; i++) {

Modified: mc/3D/CitcomS/trunk/lib/global_defs.h
===================================================================
--- mc/3D/CitcomS/trunk/lib/global_defs.h	2007-09-24 21:28:05 UTC (rev 8015)
+++ mc/3D/CitcomS/trunk/lib/global_defs.h	2007-09-24 21:28:26 UTC (rev 8016)
@@ -265,10 +265,6 @@
   float *harm_geoid_from_tpgt[2];
   float *harm_geoid_from_tpgb[2];
 
-  double **tablenplm;
-  double **tablencosf;
-  double **tablensinf;
-
   double **tablesplm[NCS];
   double **tablescosf[NCS];
   double **tablessinf[NCS];
@@ -283,7 +279,7 @@
   double ro,ri;
   struct CAP cap[NCS];
 
-  };
+};
 
 
 struct MESH_DATA {/* general information concerning the fe mesh */
@@ -391,11 +387,6 @@
 struct CONTROL {
     int PID;
 
-    char output_written_external_command[500];   /* a unix command to run when output files have been created */
-
-  /* this clashed with a GMT definition of ORTHO TWB */
-  int CITCOM_ORTHO,CITCOM_ORTHOZ;   /* indicates levels of mesh symmetry */
-
     char data_prefix[50];
     char data_prefix_old[50];
 
@@ -427,9 +418,6 @@
 
     char NODE_SPACING[20]; /* turns into ... */
     int GRID_TYPE;
-    int COMPRESS;
-    int AVS;
-    int CONMAN;
 
     int pseudo_free_surf;
 
@@ -445,8 +433,6 @@
     float Ra_410,clapeyron410,transT410,width410;
     float Ra_cmb,clapeyroncmb,transTcmb,widthcmb;
 
-    int dfact;
-    double penalty;
     int augmented_Lagr;
     double augmented;
     int NASSEMBLE;
@@ -541,7 +527,7 @@
     double *rho;
     double *thermal_expansivity;
     double *heat_capacity;
-    double *thermal_conductivity;
+    /*double *thermal_conductivity;*/
     double *gravity;
     /*double *Tadi;*/
 };