[cig-commits] r14233 - in mc/3D/CitcomS/trunk: bin lib

[becker at geodynamics.org]

Author: becker
Date: 2009-03-04 15:45:21 -0800 (Wed, 04 Mar 2009)
New Revision: 14233

Modified:
   mc/3D/CitcomS/trunk/bin/Citcom.c
   mc/3D/CitcomS/trunk/lib/Checkpoints.c
   mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c
   mc/3D/CitcomS/trunk/lib/Regional_tracer_advection.c
   mc/3D/CitcomS/trunk/lib/Tracer_setup.c
Log:
Changed ic flavors from 100 to 99 as per Eh's request



Modified: mc/3D/CitcomS/trunk/bin/Citcom.c
===================================================================
--- mc/3D/CitcomS/trunk/bin/Citcom.c	2009-03-04 23:34:36 UTC (rev 14232)
+++ mc/3D/CitcomS/trunk/bin/Citcom.c	2009-03-04 23:45:21 UTC (rev 14233)
@@ -123,7 +123,7 @@
   if (E->control.restart) {
       /* the initial condition is from previous checkpoint */
       read_checkpoint(E);
-      if(E->control.tracer && (E->trace.ic_method_for_flavors == 100)){
+      if(E->control.tracer && (E->trace.ic_method_for_flavors == 99)){
 	/* 
 	   if ggrd tracer input is selected, this will override
 	   existing tracers, or allow addition of tracers after

Modified: mc/3D/CitcomS/trunk/lib/Checkpoints.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Checkpoints.c	2009-03-04 23:34:36 UTC (rev 14232)
+++ mc/3D/CitcomS/trunk/lib/Checkpoints.c	2009-03-04 23:45:21 UTC (rev 14233)
@@ -119,9 +119,9 @@
 
     /* read tracer/composition information in the checkpoint file */
     if(E->control.tracer) {
-      if(E->trace.ic_method_for_flavors == 100){
+      if(E->trace.ic_method_for_flavors == 99){
 	if(E->parallel.me == 0)
-	  fprintf(stderr,"ic_method_for_flavors = 100 will override checkpoint restart\n");
+	  fprintf(stderr,"ic_method_for_flavors = 99 will override checkpoint restart\n");
       }else{
         read_tracer_checkpoint(E, fp);
         if(E->composition.on)

Modified: mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c	2009-03-04 23:34:36 UTC (rev 14232)
+++ mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c	2009-03-04 23:45:21 UTC (rev 14233)
@@ -1930,8 +1930,8 @@
                 fprintf(E->trace.fpt,"Interface Height: %d %f\n",i,E->trace.z_interface[i]);
         }
 #ifdef USE_GGRD
-	else if((E->trace.ic_method_for_flavors == 1)||(E->trace.ic_method_for_flavors == 100)) {
-	  /* ggrd modes 1 and 100 (100  is override for restart) */
+	else if((E->trace.ic_method_for_flavors == 1)||(E->trace.ic_method_for_flavors == 99)) {
+	  /* ggrd modes 1 and 99 (99  is override for restart) */
             fprintf(E->trace.fpt,"netcdf grd assigned tracer flavors\n");
             fprintf(E->trace.fpt,"file: %s top %i layeres\n",E->trace.ggrd_file,
 		    E->trace.ggrd_layers);

Modified: mc/3D/CitcomS/trunk/lib/Regional_tracer_advection.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Regional_tracer_advection.c	2009-03-04 23:34:36 UTC (rev 14232)
+++ mc/3D/CitcomS/trunk/lib/Regional_tracer_advection.c	2009-03-04 23:45:21 UTC (rev 14233)
@@ -180,8 +180,8 @@
                 fprintf(E->trace.fpt,"Interface Height: %d %f\n",i,E->trace.z_interface[i]);
         }
 #ifdef USE_GGRD
-	else if((E->trace.ic_method_for_flavors == 1)||(E->trace.ic_method_for_flavors == 100)) {
-	  /* ggrd modes 1 and 100 (100 is override for restart) */
+	else if((E->trace.ic_method_for_flavors == 1)||(E->trace.ic_method_for_flavors == 99)) {
+	  /* ggrd modes 1 and 99 (99 is override for restart) */
 	  fprintf(stderr,"ggrd regional flavors not implemented\n");
           fprintf(E->trace.fpt,"ggrd not implemented et for regional, flavor method= %d\n",
 		  E->trace.ic_method_for_flavors);

Modified: mc/3D/CitcomS/trunk/lib/Tracer_setup.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Tracer_setup.c	2009-03-04 23:34:36 UTC (rev 14232)
+++ mc/3D/CitcomS/trunk/lib/Tracer_setup.c	2009-03-04 23:45:21 UTC (rev 14233)
@@ -157,8 +157,8 @@
 	   1: from netcdf grds
 	   
 	   
-	   100: from grds, overriding checkpoints during restart
-	   (1 and 100 require ggrd)
+	   99: from grds, overriding checkpoints during restart
+	   (1 and 99 require ggrd)
 	*/
 
         input_int("ic_method_for_flavors",
@@ -183,7 +183,7 @@
 		*/
 #ifdef USE_GGRD
             case 1:
-	    case 100:		/* will override restart */
+	    case 99:		/* will override restart */
 	      /* from grid in top n materials, this will override
 		 the checkpoint input */
 	      input_string("ictracer_grd_file",E->trace.ggrd_file,"",m); /* file from which to read */
@@ -192,7 +192,7 @@
 	      
 #endif
             default:
-                fprintf(stderr,"ic_method_for_flavors %i undefined (1 and 100 only for ggrd mode)\n",E->trace.ic_method_for_flavors);
+                fprintf(stderr,"ic_method_for_flavors %i undefined (1 and 99 only for ggrd mode)\n",E->trace.ic_method_for_flavors);
                 parallel_process_termination();
                 break;
             }
@@ -1279,7 +1279,7 @@
       break;
 
     case 1:			/* from grd in top n layers */
-    case 100:			/* (will override restart) */
+    case 99:			/* (will override restart) */
 #ifndef USE_GGRD
       fprintf(stderr,"ic_method_for_flavors %i requires the ggrd routines from hc, -DUSE_GGRD\n",
 	      E->trace.ic_method_for_flavors);