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

[tan2 at geodynamics.org]

Author: tan2
Date: 2009-04-08 16:27:51 -0700 (Wed, 08 Apr 2009)
New Revision: 14638

Modified:
   mc/3D/CitcomS/trunk/lib/Instructions.c
Log:
Moved where to call read_rayleigh_from_file() earlier. I hope this doesn't break the ray_control stuff.

Modified: mc/3D/CitcomS/trunk/lib/Instructions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Instructions.c	2009-04-08 22:32:49 UTC (rev 14637)
+++ mc/3D/CitcomS/trunk/lib/Instructions.c	2009-04-08 23:27:51 UTC (rev 14638)
@@ -183,6 +183,15 @@
 	(E->problem_tracer_setup)(E);
 	if(chatty)fprintf(stderr,"tracer setup done\n");
     }
+
+#ifdef USE_GGRD
+    /* updating local rayleigh number (based on Netcdf grds, the
+       rayleigh number may be modified laterally in the surface
+       layers) */
+    if(E->control.ggrd.ray_control)
+      read_rayleigh_from_file(E);
+#endif
+
     if(chatty)fprintf(stderr,"initial_mesh_solver_setup done\n");
 }
 
@@ -226,15 +235,6 @@
 
     general_stokes_solver_setup(E);
 
-#ifdef USE_GGRD  
-    /* updating local rayleigh number (based on Netcdf grds, the
-       rayleigh number may be modified laterally in the surface
-       layers) */
-    /* no counterpart in pyre */
-    if(E->control.ggrd.ray_control)
-      read_rayleigh_from_file(E);
-#endif
-
     (E->next_buoyancy_field_init)(E);
     if (E->parallel.me==0) fprintf(stderr,"time=%f\n",
                                    CPU_time0()-E->monitor.cpu_time_at_start);