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

[becker at geodynamics.org]

Author: becker
Date: 2007-08-10 13:51:45 -0700 (Fri, 10 Aug 2007)
New Revision: 7801

Modified:
   mc/3D/CitcomS/trunk/lib/Initial_temperature.c
   mc/3D/CitcomS/trunk/lib/Instructions.c
   mc/3D/CitcomS/trunk/lib/Output.c
   mc/3D/CitcomS/trunk/lib/Problem_related.c
   mc/3D/CitcomS/trunk/lib/Tracer_setup.c
Log:
- renamed gzipped output option ascii-gz

- built in restart facilities for temperature and tracers when using
  gzdir I/O


- added a composition viscosity function, CDEPV, based on two tracer
  flavors

- for this to work, I had to move viscosity_input() *behind*
  tic_input() and tracer_input() in instructions



Modified: mc/3D/CitcomS/trunk/lib/Initial_temperature.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Initial_temperature.c	2007-08-10 19:36:49 UTC (rev 7800)
+++ mc/3D/CitcomS/trunk/lib/Initial_temperature.c	2007-08-10 20:51:45 UTC (rev 7801)
@@ -170,7 +170,7 @@
   else
   */
 #ifdef USE_GZDIR
-  if(strcmp(E->output.format, "gzdir") == 0)
+  if(strcmp(E->output.format, "ascii-gz") == 0)
     restart_tic_from_gzdir_file(E);
   else
 #endif

Modified: mc/3D/CitcomS/trunk/lib/Instructions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Instructions.c	2007-08-10 19:36:49 UTC (rev 7800)
+++ mc/3D/CitcomS/trunk/lib/Instructions.c	2007-08-10 20:51:45 UTC (rev 7801)
@@ -947,7 +947,7 @@
   char logfile[255];
 
   E->fp = NULL;
-  if (strcmp(E->output.format, "gzdir") == 0)
+  if (strcmp(E->output.format, "ascii-gz") == 0)
     sprintf(logfile,"%s/log", E->control.data_dir);
   else
     sprintf(logfile,"%s.log", E->control.data_file);
@@ -963,7 +963,7 @@
 
   E->fptime = NULL;
   if (E->parallel.me == 0) {
-  if (strcmp(E->output.format, "gzdir") == 0)
+  if (strcmp(E->output.format, "ascii-gz") == 0)
     sprintf(timeoutput,"%s/time", E->control.data_dir);
   else
     sprintf(timeoutput,"%s.time", E->control.data_file);
@@ -980,7 +980,7 @@
 
   E->fp_out = NULL;
   if (E->control.verbose) {
-  if (strcmp(E->output.format, "gzdir") == 0)
+  if (strcmp(E->output.format, "ascii-gz") == 0)
     sprintf(output_file,"%s/info.%d", E->control.data_dir, E->parallel.me);
   else
     sprintf(output_file,"%s.info.%d", E->control.data_file, E->parallel.me);
@@ -1195,13 +1195,13 @@
     else if (strcmp(E->output.format, "hdf5") == 0)
         E->problem_output = h5output;
 #ifdef USE_GZDIR
-    else if (strcmp(E->output.format, "gzdir") == 0)
+    else if (strcmp(E->output.format, "ascii-gz") == 0)
         E->problem_output = gzdir_output;
     else {
         /* indicate error here */
         if (E->parallel.me == 0) {
-            fprintf(stderr, "wrong output_format, must be 'ascii', 'hdf5', or 'gzdir'\n");
-            fprintf(E->fp, "wrong output_format, must be  'ascii', 'hdf5', or 'gzdir'\n");
+            fprintf(stderr, "wrong output_format, must be 'ascii', 'hdf5', or 'ascii-gz'\n");
+            fprintf(E->fp, "wrong output_format, must be  'ascii', 'hdf5', or 'ascii-gz'\n");
         }
         parallel_process_termination(E);
     }
@@ -1209,8 +1209,8 @@
     else {
         /* indicate error here */
         if (E->parallel.me == 0) {
-            fprintf(stderr, "wrong output_format, must be 'ascii' or 'gzdir' (USE_GZDIR undefined)\n");
-            fprintf(E->fp, "wrong output_format, must be 'ascii' or 'gzdir' (USE_GZDIR undefined)\n");
+            fprintf(stderr, "wrong output_format, must be 'ascii' or 'hdf5' (USE_GZDIR undefined)\n");
+            fprintf(E->fp, "wrong output_format, must be 'ascii' or 'hdf5' (USE_GZDIR undefined)\n");
         }
         parallel_process_termination(E);
     }

Modified: mc/3D/CitcomS/trunk/lib/Output.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Output.c	2007-08-10 19:36:49 UTC (rev 7800)
+++ mc/3D/CitcomS/trunk/lib/Output.c	2007-08-10 20:51:45 UTC (rev 7801)
@@ -65,7 +65,7 @@
     input_string("output_optional", E->output.optional, "surf,botm,tracer,comp_el",m);
 
     /* gzdir type of I/O */
-    if(strcmp(E->output.format, "gzdir") == 0){
+    if(strcmp(E->output.format, "ascii-gz") == 0){
       input_boolean("gzdir_vtkio",&(E->output.gzdir_vtkio),"off",m);
       E->output.gzdir_vtkbase_init = 0;
       E->output.gzdir_vtkbase_save = 1; /* should we save the basis vectors? (memory!) */

Modified: mc/3D/CitcomS/trunk/lib/Problem_related.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Problem_related.c	2007-08-10 19:36:49 UTC (rev 7800)
+++ mc/3D/CitcomS/trunk/lib/Problem_related.c	2007-08-10 20:51:45 UTC (rev 7801)
@@ -73,7 +73,7 @@
     if ((E->control.restart || E->control.post_p))    {
 
 #ifdef USE_GZDIR		/* gzdir output */
-      if(strcmp(E->output.format, "gzdir") == 0){
+      if(strcmp(E->output.format, "ascii-gz") == 0){
 	if(E->output.gzdir_vtkio)
 	  sprintf(output_file, "%s/%d/t.%d.%d",
 		  E->control.data_dir_old,E->monitor.solution_cycles_init,E->parallel.me,E->monitor.solution_cycles_init);

Modified: mc/3D/CitcomS/trunk/lib/Tracer_setup.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Tracer_setup.c	2007-08-10 19:36:49 UTC (rev 7800)
+++ mc/3D/CitcomS/trunk/lib/Tracer_setup.c	2007-08-10 20:51:45 UTC (rev 7801)
@@ -952,7 +952,7 @@
 
     /* deal with different output formats */
 #ifdef USE_GZDIR
-    if(strcmp(E->output.format, "gzdir") == 0){
+    if(strcmp(E->output.format, "ascii-gz") == 0){
       sprintf(output_file,"%s/%d/tracer.%d.%d",
 	      E->control.data_dir_old,E->monitor.solution_cycles_init,E->parallel.me,E->monitor.solution_cycles_init);
       rezip = open_file_zipped(output_file,&fp1,E);
@@ -1034,7 +1034,7 @@
     }
     fclose(fp1);
 #ifdef USE_GZDIR
-    if(strcmp(E->output.format, "gzdir") == 0)
+    if(strcmp(E->output.format, "ascii-gz") == 0)
       if(rezip)			/* rezip */
 	gzip_file(output_file);
 #endif