[cig-commits] r15974 - mc/3D/CitcomCU/trunk/src

[becker at geodynamics.org]

Author: becker
Date: 2009-11-16 14:44:59 -0800 (Mon, 16 Nov 2009)
New Revision: 15974

Modified:
   mc/3D/CitcomCU/trunk/src/Convection.c
   mc/3D/CitcomCU/trunk/src/Drive_solvers.c
   mc/3D/CitcomCU/trunk/src/Output_gzdir.c
   mc/3D/CitcomCU/trunk/src/Viscosity_structures.c
   mc/3D/CitcomCU/trunk/src/global_defs.h
   mc/3D/CitcomCU/trunk/src/prototypes.h
Log:
Minor changes, just to merge with recent SVN. 



Modified: mc/3D/CitcomCU/trunk/src/Convection.c
===================================================================
--- mc/3D/CitcomCU/trunk/src/Convection.c	2009-11-16 19:03:38 UTC (rev 15973)
+++ mc/3D/CitcomCU/trunk/src/Convection.c	2009-11-16 22:44:59 UTC (rev 15974)
@@ -368,6 +368,7 @@
 			sscanf(input_s, "%g", &E->T[node]);
 //             E->T[node] = min(1.0,E->T[node]);
 			E->T[node] = max(0.0, E->T[node]);
+		
 			E->node[node] = E->node[node] | (INTX | INTZ | INTY);
 		}
 		fclose(fp);
@@ -385,6 +386,7 @@
 			sscanf(input_s, "%g %g %g %g", &E->T[node], &temp1, &temp2, &E->C[node]);
 //             E->T[node] = min(1.0,E->T[node]);
 			E->T[node] = max(0.0, E->T[node]);
+		
 			E->node[node] = E->node[node] | (INTX | INTZ | INTY);
 		}
 		fclose(fp);
@@ -418,6 +420,8 @@
 				{
 					node = k + (j - 1) * E->lmesh.noz + (i - 1) * E->lmesh.noz * E->lmesh.nox;
 					E->T[node] = E->Have.T[k] + E->convection.perturb_mag[p] * drand48();
+				
+					
 					E->node[node] = E->node[node] | (INTX | INTZ | INTY);
 				}
 	}

Modified: mc/3D/CitcomCU/trunk/src/Drive_solvers.c
===================================================================
--- mc/3D/CitcomCU/trunk/src/Drive_solvers.c	2009-11-16 19:03:38 UTC (rev 15973)
+++ mc/3D/CitcomCU/trunk/src/Drive_solvers.c	2009-11-16 22:44:59 UTC (rev 15974)
@@ -146,7 +146,6 @@
 			}
 			count++;
 		}						/* end for SDEPV / BDEPV  */
-		
 	} while((count < 50) && (dUdot_mag > E->viscosity.sdepv_misfit) && powerlaw);
 
 	free((void *)delta_U);

Modified: mc/3D/CitcomCU/trunk/src/Output_gzdir.c
===================================================================
--- mc/3D/CitcomCU/trunk/src/Output_gzdir.c	2009-11-16 19:03:38 UTC (rev 15973)
+++ mc/3D/CitcomCU/trunk/src/Output_gzdir.c	2009-11-16 22:44:59 UTC (rev 15974)
@@ -111,10 +111,13 @@
   if(E->parallel.me == 0){
     fprintf(stderr,"Output_gzdir: processing output\n");
 
-    sprintf(output_file,"mkdir %s/%d 2> /dev/null",
-	    E->control.data_file2,file_number);
+
+    
+    sprintf(output_file,"if [ ! -s %s/%d ];then mkdir -p %s/%d;fi 2> /dev/null",
+	    E->control.data_file2,file_number,E->control.data_file2,file_number);
     system(output_file);
     fprintf(stderr,"making directory: %s\n",output_file);
+
   }
   /* and wait for the other jobs */
   parallel_process_sync();
@@ -585,8 +588,8 @@
 	{
 	  gzgets (gzin,input_s, 200);
 	  sscanf(input_s, "%g", &E->T[node]);
+	  //if(E->SX[3][node] == 0)fprintf(stderr,"%g %g\n",E->SX[3][node],E->T[node]);
 	  E->C[node] = 0;
-	  E->node[node] = E->node[node] | (INTX | INTZ | INTY);
 	}
       gzclose(gzin);
       if(E->parallel.me == 0)
@@ -620,7 +623,7 @@
       for(node = 1; node <= E->lmesh.nno; node++)
 	{  
 	  gzgets (gzin,input_s, 200);
-   	  sscanf(input_s, "%lf", &E->C[node]);
+   	  sscanf(input_s, "%g", &E->C[node]);
 	}
       gzclose(gzin);
       
@@ -629,6 +632,7 @@
   
   E->advection.timesteps = E->monitor.solution_cycles;
   
+
   return;
 }
 

Modified: mc/3D/CitcomCU/trunk/src/Viscosity_structures.c
===================================================================
--- mc/3D/CitcomCU/trunk/src/Viscosity_structures.c	2009-11-16 19:03:38 UTC (rev 15973)
+++ mc/3D/CitcomCU/trunk/src/Viscosity_structures.c	2009-11-16 22:44:59 UTC (rev 15974)
@@ -873,13 +873,13 @@
 	  tau = E->viscosity.abyerlee[l] * zzz + E->viscosity.bbyerlee[l];
 	  tau = min(tau,  E->viscosity.lbyerlee[l]);
 	}
-	tau2 = tau * tau;
-
-	if(tau < 1e10){
+	if((visited > 1) && (tau < 1e15)){
+	  tau2 = tau * tau;
 	  eta_old = EEta[ (i-1)*vpts + jj ] ;
 	  eta_old2 = eta_old * eta_old;
 	  eta_new = (tau2 * eta_old)/(tau2 + 2.0 * eta_old2 * eedot[i]);
 	  EEta[ (i-1)*vpts + jj ] = ettnew;
+	  //if(E->parallel.me==0)fprintf(stderr,"tau: %11g eII: %11g eta_old: %11g eta_new: %11g\n",tau, eedot[i],eta_old,eta_new);
 	}
       }
     }

Modified: mc/3D/CitcomCU/trunk/src/global_defs.h
===================================================================
--- mc/3D/CitcomCU/trunk/src/global_defs.h	2009-11-16 19:03:38 UTC (rev 15973)
+++ mc/3D/CitcomCU/trunk/src/global_defs.h	2009-11-16 22:44:59 UTC (rev 15974)
@@ -52,6 +52,7 @@
 #define Malloc0(a) Malloc1((a),__FILE__,__LINE__)
 
 
+
 /* #define Malloc0 malloc */
 
 #define LIDN 0x1

Modified: mc/3D/CitcomCU/trunk/src/prototypes.h
===================================================================
--- mc/3D/CitcomCU/trunk/src/prototypes.h	2009-11-16 19:03:38 UTC (rev 15973)
+++ mc/3D/CitcomCU/trunk/src/prototypes.h	2009-11-16 22:44:59 UTC (rev 15974)
@@ -306,3 +306,12 @@
 int layers(struct All_variables *E, float x3);
 int weak_zones(struct All_variables *E, int node, float t_b);
 float boundary_thickness(struct All_variables *E, float *H);
+#ifdef USE_GGRD
+void convection_initial_temperature_ggrd(struct All_variables *E);
+#endif
+#ifdef USE_GZDIR
+#include "zlib.h"
+void output_velo_related_gzdir(struct All_variables *E, int file_number);
+gzFile *safe_gzopen(char *name, char *mode);
+void process_restart_tc_gzdir(struct All_variables *E);
+#endif