[cig-commits] r5425 - in mc/3D/CitcomS/trunk/examples: Full Regional

[tan2 at geodynamics.org]

Author: tan2
Date: 2006-12-01 23:14:16 -0800 (Fri, 01 Dec 2006)
New Revision: 5425

Modified:
   mc/3D/CitcomS/trunk/examples/Full/input.sample
   mc/3D/CitcomS/trunk/examples/Regional/input.sample
Log:
* Removed obsolete parameters
* Added new parameters
* Only one "parameter=value" per line


Modified: mc/3D/CitcomS/trunk/examples/Full/input.sample
===================================================================
--- mc/3D/CitcomS/trunk/examples/Full/input.sample	2006-12-02 06:04:50 UTC (rev 5424)
+++ mc/3D/CitcomS/trunk/examples/Full/input.sample	2006-12-02 07:14:16 UTC (rev 5425)
@@ -2,6 +2,9 @@
 datadir="/scratch"
 datafile="fulltest"
 
+output_format=ascii
+output_optional=surf,botm
+output_ll_max=20
 
 # specify input files
 # Important: when file_vbcs is 1, make sure topvbc is also turned on.
@@ -23,9 +26,15 @@
 
 # processors, mesh grid information
 nproc_surf=12
-nprocx=1 nprocy=1 nprocz=1
-nodex=9 nodey=9 nodez=9
-mgunitx=8 mgunity=8 mgunitz=8
+nprocx=1
+nprocy=1
+nprocz=1
+nodex=9
+nodey=9
+nodez=9
+mgunitx=8
+mgunity=8
+mgunitz=8
 levels=1
 
 
@@ -37,6 +46,7 @@
 # restart info
 restart=0
 post_p=0
+datadir_old="."
 datafile_old=""
 solution_cycles_init=0
 zero_elapsed_time=1
@@ -50,11 +60,11 @@
 cpu_limits_in_seconds=360000000
 
 # Initial conditions
-num_perturbations=5
-perturbmag=0.02,0.05,0.08,0.05,0.02
-perturbl=2,2,2,2,2
-perturbm=2,2,2,2,2
-perturblayer=5,10,16,22,27
+num_perturbations=1
+perturbmag=0.05
+perturbl=2
+perturbm=2
+perturblayer=5
 
 
 # Boundary Conditions
@@ -89,7 +99,8 @@
 Problem=convection
 Geometry=sphere
 Spacing=regular
-Solver=cgrad node_assemble=1
+Solver=cgrad
+node_assemble=1
 
 
 # Depth Information
@@ -120,8 +131,10 @@
 sdepv_expt=1,1,1,1
 sdepv_misfit=0.020
 
-VMIN=on visc_min=1.0e0
-VMAX=on visc_max=1.0e1
+VMIN=on
+visc_min=1.0e0
+VMAX=on
+visc_max=1.0e1
 
 
 # Phase Change Information
@@ -187,9 +200,3 @@
 start_age=4.0
 reset_startage=0
 
-
-# Spherical harmonics information
-ll_max=20
-output_ll_max=20
-nlong=361	nlati=181
-

Modified: mc/3D/CitcomS/trunk/examples/Regional/input.sample
===================================================================
--- mc/3D/CitcomS/trunk/examples/Regional/input.sample	2006-12-02 06:04:50 UTC (rev 5424)
+++ mc/3D/CitcomS/trunk/examples/Regional/input.sample	2006-12-02 07:14:16 UTC (rev 5425)
@@ -2,6 +2,9 @@
 datadir="/scratch"
 datafile="regtest"
 
+output_format=ascii
+output_optional=surf,botm
+output_ll_max=20
 
 # specify input files
 # Important: when file_vbcs is 1, make sure topvbc is also turned on.
@@ -24,9 +27,15 @@
 
 # processors, mesh grid information
 nproc_surf=1
-nprocx=2 nprocy=2 nprocz=1
-nodex=17 nodey=17 nodez=9
-mgunitx=8 mgunity=8 mgunitz=8
+nprocx=2
+nprocy=2
+nprocz=1
+nodex=17
+nodey=17
+nodez=9
+mgunitx=8
+mgunity=8
+mgunitz=8
 levels=1
 
 
@@ -43,6 +52,7 @@
 # restart info
 restart=0
 post_p=0
+datadir_old="."
 datafile_old=""
 solution_cycles_init=0
 zero_elapsed_time=1
@@ -96,7 +106,8 @@
 Problem=convection
 Geometry=sphere
 Spacing=regular
-Solver=cgrad node_assemble=1
+Solver=cgrad
+node_assemble=1
 
 
 # Depth Information
@@ -127,8 +138,10 @@
 sdepv_expt=1,1,1,1
 sdepv_misfit=0.020
 
-VMIN=on visc_min=1.0e0
-VMAX=on visc_max=1.0e1
+VMIN=on
+visc_min=1.0e0
+VMAX=on
+visc_max=1.0e1
 
 
 # Phase Change Information
@@ -193,9 +206,3 @@
 start_age=4.0
 reset_startage=0
 
-
-# Spherical harmonics information
-ll_max=20
-output_ll_max=20
-nlong=361	nlati=181
-