[cig-commits] r8071 - in mc/3D/CitcomS/trunk/examples: . Cookbook1 Cookbook2 Cookbook4 Cookbook5 Cookbook6 Cookbook7

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-10-01 13:38:22 -0700 (Mon, 01 Oct 2007)
New Revision: 8071

Added:
   mc/3D/CitcomS/trunk/examples/Cookbook5/ic/
Removed:
   mc/3D/CitcomS/trunk/examples/Cookbook5/restart_files/
Modified:
   mc/3D/CitcomS/trunk/examples/Cookbook1/cookbook1.cfg
   mc/3D/CitcomS/trunk/examples/Cookbook2/cookbook2.cfg
   mc/3D/CitcomS/trunk/examples/Cookbook4/cookbook4.cfg
   mc/3D/CitcomS/trunk/examples/Cookbook5/cookbook5.cfg
   mc/3D/CitcomS/trunk/examples/Cookbook6/cookbook6.cfg
   mc/3D/CitcomS/trunk/examples/Cookbook7/cookbook7.cfg
   mc/3D/CitcomS/trunk/examples/Makefile.am
   mc/3D/CitcomS/trunk/examples/example1.cfg
Log:
Updated the cookbook scripts

Modified: mc/3D/CitcomS/trunk/examples/Cookbook1/cookbook1.cfg
===================================================================
--- mc/3D/CitcomS/trunk/examples/Cookbook1/cookbook1.cfg	2007-10-01 19:57:13 UTC (rev 8070)
+++ mc/3D/CitcomS/trunk/examples/Cookbook1/cookbook1.cfg	2007-10-01 20:38:22 UTC (rev 8071)
@@ -2,7 +2,7 @@
 
 [CitcomS]
 solver = full
-steps = 101                 ; number of time steps
+steps = 100                 ; number of time steps
 
 [CitcomS.controller]
 monitoringFrequency = 25    ; how often outputs are created

Modified: mc/3D/CitcomS/trunk/examples/Cookbook2/cookbook2.cfg
===================================================================
--- mc/3D/CitcomS/trunk/examples/Cookbook2/cookbook2.cfg	2007-10-01 19:57:13 UTC (rev 8070)
+++ mc/3D/CitcomS/trunk/examples/Cookbook2/cookbook2.cfg	2007-10-01 20:38:22 UTC (rev 8071)
@@ -1,7 +1,7 @@
 # Cookbook 2: Velocity Boundary Conditions
 
 [CitcomS]
-steps = 61                  ; number of time steps
+steps = 60                  ; number of time steps
 
 [CitcomS.controller]
 monitoringFrequency = 30    ; how often outputs are created

Modified: mc/3D/CitcomS/trunk/examples/Cookbook4/cookbook4.cfg
===================================================================
--- mc/3D/CitcomS/trunk/examples/Cookbook4/cookbook4.cfg	2007-10-01 19:57:13 UTC (rev 8070)
+++ mc/3D/CitcomS/trunk/examples/Cookbook4/cookbook4.cfg	2007-10-01 20:38:22 UTC (rev 8071)
@@ -26,7 +26,7 @@
 
 [CitcomS.solver.mesher]
 # Read uneven mesh point coordinates from 'coor.dat'.
-coor = on
+coor = 1
 coor_file = coor.dat
 
 nprocx = 4

Modified: mc/3D/CitcomS/trunk/examples/Cookbook5/cookbook5.cfg
===================================================================
--- mc/3D/CitcomS/trunk/examples/Cookbook5/cookbook5.cfg	2007-10-01 19:57:13 UTC (rev 8070)
+++ mc/3D/CitcomS/trunk/examples/Cookbook5/cookbook5.cfg	2007-10-01 20:38:22 UTC (rev 8071)
@@ -4,11 +4,11 @@
 steps = 1000                ; number of time steps
 
 [CitcomS.controller]
-monitoringFrequency = 10    ; how often outputs are created
+monitoringFrequency = 100   ; how often outputs are created
 
 [CitcomS.solver]
 datafile = cookbook5
-datadir_old = ./restart_files
+datadir_old = ./ic
 datafile_old = cookbook5
 rayleigh = 4.07e+08
 
@@ -24,11 +24,11 @@
 vel_bound_file = ./velocity/bvel.dat
 
 [CitcomS.solver.ic]
+tic_method = -1
 solution_cycles_init = 0
-tic_method = -1
 
 [CitcomS.solver.mesher]
-coor = on
+coor = 1
 coor_file = ./coor.dat
 nprocx = 1
 nprocy = 2

Copied: mc/3D/CitcomS/trunk/examples/Cookbook5/ic (from rev 8061, mc/3D/CitcomS/trunk/examples/Cookbook5/restart_files)

Modified: mc/3D/CitcomS/trunk/examples/Cookbook6/cookbook6.cfg
===================================================================
--- mc/3D/CitcomS/trunk/examples/Cookbook6/cookbook6.cfg	2007-10-01 19:57:13 UTC (rev 8070)
+++ mc/3D/CitcomS/trunk/examples/Cookbook6/cookbook6.cfg	2007-10-01 20:38:22 UTC (rev 8071)
@@ -14,13 +14,13 @@
 
 
 [CitcomS.solver.mesher]
-nprocx = 4
-nprocy = 4
-nprocz = 2
+nprocx = 2
+nprocy = 2
+nprocz = 1
 nodex = 61
 nodey = 61
 nodez = 25
-coor = true
+coor = 1
 coor_file = ./coord.dat
 
 

Modified: mc/3D/CitcomS/trunk/examples/Cookbook7/cookbook7.cfg
===================================================================
--- mc/3D/CitcomS/trunk/examples/Cookbook7/cookbook7.cfg	2007-10-01 19:57:13 UTC (rev 8070)
+++ mc/3D/CitcomS/trunk/examples/Cookbook7/cookbook7.cfg	2007-10-01 20:38:22 UTC (rev 8071)
@@ -2,7 +2,7 @@
 
 [CitcomS]
 solver = full
-steps = 31                  ; number of time steps
+steps = 30                  ; number of time steps
 
 
 [CitcomS.controller]
@@ -28,7 +28,7 @@
 
 
 [CitcomS.solver.tracer]
-tracer = 1
+tracer = on
 tracer_ic_method = 0
 tracers_per_element = 20
 tracer_file = tracer.dat
@@ -40,7 +40,6 @@
 chemical_buoyancy = 1
 buoy_type = 1
 buoyancy_ratio = 0.4
-reset_initial_composition = 0
 
 regular_grid_deltheta = 1.0
 regular_grid_delphi = 1.0

Modified: mc/3D/CitcomS/trunk/examples/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/examples/Makefile.am	2007-10-01 19:57:13 UTC (rev 8070)
+++ mc/3D/CitcomS/trunk/examples/Makefile.am	2007-10-01 20:38:22 UTC (rev 8071)
@@ -33,8 +33,8 @@
 	Cookbook4/coor.dat \
 	Cookbook5/cookbook5.cfg \
 	Cookbook5/coor.dat \
-	Cookbook5/restart_files/cookbook5.velo.0.0 \
-	Cookbook5/restart_files/cookbook5.velo.1.0 \
+	Cookbook5/ic/cookbook5.velo.0.0 \
+	Cookbook5/ic/cookbook5.velo.1.0 \
 	Cookbook5/velocity/bvel.dat0 \
 	Cookbook5/velocity/bvel.dat1 \
 	Cookbook5/velocity/bvel.dat10 \

Modified: mc/3D/CitcomS/trunk/examples/example1.cfg
===================================================================
--- mc/3D/CitcomS/trunk/examples/example1.cfg	2007-10-01 19:57:13 UTC (rev 8070)
+++ mc/3D/CitcomS/trunk/examples/example1.cfg	2007-10-01 20:38:22 UTC (rev 8071)
@@ -1,6 +1,6 @@
 
 [CitcomS]
-steps = 71
+steps = 70
 
 [CitcomS.controller]
 monitoringFrequency = 10