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

[becker at geodynamics.org]

Author: becker
Date: 2009-03-26 18:11:20 -0700 (Thu, 26 Mar 2009)
New Revision: 14477

Modified:
   mc/3D/CitcomCU/trunk/src/Advection_diffusion.c
   mc/3D/CitcomCU/trunk/src/Makefile
   mc/3D/CitcomCU/trunk/src/Viscosity_structures.c
Log:
Fixed typo in Viscosity_structures.c (omission of break for option 4)



Modified: mc/3D/CitcomCU/trunk/src/Advection_diffusion.c
===================================================================
--- mc/3D/CitcomCU/trunk/src/Advection_diffusion.c	2009-03-27 00:35:28 UTC (rev 14476)
+++ mc/3D/CitcomCU/trunk/src/Advection_diffusion.c	2009-03-27 01:11:20 UTC (rev 14477)
@@ -921,7 +921,13 @@
 
 	if(E->monitor.solution_cycles % 1000 == 0)
 	{
+#ifdef USE_GZDIR
+	  if(E->control.gzdir)
+		sprintf(filename, "%s/heating.%d", E->control.data_file2, E->parallel.me);
+	  else
+#endif
 		sprintf(filename, "%s.heating.%d", E->control.data_file2, E->parallel.me);
+	  
 		fp = fopen(filename, "w");
 		fprintf(fp, "QQ %g %g %g\n", E->control.Atemp, E->data.disptn_number, E->rad_heat.total);
 		for(e = 1; e <= E->lmesh.nel; e++)

Modified: mc/3D/CitcomCU/trunk/src/Makefile
===================================================================
--- mc/3D/CitcomCU/trunk/src/Makefile	2009-03-27 00:35:28 UTC (rev 14476)
+++ mc/3D/CitcomCU/trunk/src/Makefile	2009-03-27 01:11:20 UTC (rev 14477)
@@ -20,7 +20,7 @@
 COMPRESS=/bin/gzip
 LIB_PATH=
 #LIB_LIST= -lmpi
-LIB_LIST=
+LIB_LIST= 
 LIB= $(LIB_PATH) $(LIB_LIST) -lm
 
 
@@ -162,6 +162,8 @@
 	Topo_gravity.c\
 	Viscosity_structures.c
 
+
+
 HEADER = element_definitions.h\
 	 global_defs.h\
 	 viscosity_descriptions.h\

Modified: mc/3D/CitcomCU/trunk/src/Viscosity_structures.c
===================================================================
--- mc/3D/CitcomCU/trunk/src/Viscosity_structures.c	2009-03-27 00:35:28 UTC (rev 14476)
+++ mc/3D/CitcomCU/trunk/src/Viscosity_structures.c	2009-03-27 01:11:20 UTC (rev 14477)
@@ -214,6 +214,7 @@
 	const int vpts = vpoints[E->mesh.nsd];
 
 
+	
 	if(E->viscosity.TDEPV)
 		visc_from_T(E, visc, evisc, propogate);
 	else
@@ -472,6 +473,7 @@
 		      tempa * exp(E->viscosity.E[l] * (E->viscosity.T[l] - temp) + (1 - zz) * E->viscosity.Z[l] );
 		  }
 	      }
+	    break;
 	  default:
 	    myerror(E,"RHEOL option undefined");
 	    break;
@@ -482,12 +484,12 @@
 	}
 
 
-/*
-	fprintf(E->fp,"aaa\n");
-	for(i=1;i<=nel;i++)
-		fprintf(E->fp,"%d %d %g\n",i,E->mat[i],EEta[(i-1)*vpts+1]);
-*/
 
+	/* 	fprintf(E->fp,"aaa\n"); */
+	/* 	for(i=1;i<=nel;i++) */
+	/* 		fprintf(E->fp,"%d %d %g\n",i,E->mat[i],EEta[(i-1)*vpts+1]); */
+	
+
 	return;
 }