[cig-commits] r4017 - in mc/3D/CitcomS/trunk: examples
examples/Cookbook1 examples/Cookbook2 examples/Cookbook3
examples/Cookbook4 examples/Cookbook5 examples/Cookbook7 tests
leif at geodynamics.org
leif at geodynamics.org
Thu Jul 13 16:41:51 PDT 2006
Author: leif
Date: 2006-07-13 16:41:51 -0700 (Thu, 13 Jul 2006)
New Revision: 4017
Added:
mc/3D/CitcomS/trunk/examples/Cookbook1/cookbook1.cfg
mc/3D/CitcomS/trunk/examples/Cookbook2/cookbook2.cfg
mc/3D/CitcomS/trunk/examples/Cookbook3/cookbook3.cfg
mc/3D/CitcomS/trunk/examples/Cookbook4/cookbook4.cfg
mc/3D/CitcomS/trunk/examples/Cookbook5/cookbook5.cfg
mc/3D/CitcomS/trunk/examples/Cookbook7/cookbook7.cfg
Removed:
mc/3D/CitcomS/trunk/examples/Cookbook1/cookbook1.sh
mc/3D/CitcomS/trunk/examples/Cookbook2/cookbook2.sh
mc/3D/CitcomS/trunk/examples/Cookbook3/cookbook3.sh
mc/3D/CitcomS/trunk/examples/Cookbook4/cookbook4.sh
mc/3D/CitcomS/trunk/examples/Cookbook5/cookbook5.sh
mc/3D/CitcomS/trunk/examples/Cookbook7/cookbook7.sh
mc/3D/CitcomS/trunk/examples/example1.sh
mc/3D/CitcomS/trunk/tests/citcomsfull.sh.in
mc/3D/CitcomS/trunk/tests/citcomsregional.sh.in
mc/3D/CitcomS/trunk/tests/coupledcitcoms.sh.in
Modified:
mc/3D/CitcomS/trunk/tests/Makefile.am
Log:
Nuked citcoms{full,regional}.sh, coupledcitcoms.sh.
Converted cookbook *.sh files to *.cfg files, and
sprinkled-in some comments derived from the manual.
Copied: mc/3D/CitcomS/trunk/examples/Cookbook1/cookbook1.cfg (from rev 4016, mc/3D/CitcomS/trunk/examples/Cookbook1/cookbook1.sh)
===================================================================
--- mc/3D/CitcomS/trunk/examples/Cookbook1/cookbook1.sh 2006-07-13 20:06:29 UTC (rev 4016)
+++ mc/3D/CitcomS/trunk/examples/Cookbook1/cookbook1.cfg 2006-07-13 23:41:51 UTC (rev 4017)
@@ -0,0 +1,20 @@
+# Cookbook 1: Global Model
+
+[CitcomS]
+solver = full
+steps = 101 ; number of time steps
+
+[CitcomS.launcher]
+nodes = 12 ; number of processors
+
+[CitcomS.controller]
+monitoringFrequency = 25 ; how often to monitor the computation
+
+[CitcomS.solver]
+datafile = cookbook1 ; location/name of output files
+rayleigh = 5.0e+4
+
+[CitcomS.solver.ic]
+num_perturbations = 1
+perturbl = 3
+perturbm = 2
Deleted: mc/3D/CitcomS/trunk/examples/Cookbook1/cookbook1.sh
===================================================================
--- mc/3D/CitcomS/trunk/examples/Cookbook1/cookbook1.sh 2006-07-13 20:06:29 UTC (rev 4016)
+++ mc/3D/CitcomS/trunk/examples/Cookbook1/cookbook1.sh 2006-07-13 23:41:51 UTC (rev 4017)
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#<LicenseText>
-#
-# CitcomS.py by Eh Tan, Eun-seo Choi, and Pururav Thoutireddy.
-# Copyright (C) 2002-2005, California Institute of Technology.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-#</LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-citcomsfull.sh \
-\
---launcher.nodes=12 \
-\
---steps=101 \
---controller.monitoringFrequency=25 \
-\
---solver.datafile=cookbook1 \
-\
---solver.ic.num_perturbations=1 \
---solver.ic.perturbl=3 \
---solver.ic.perturbm=2 \
-\
---solver.rayleigh=5.0e+4
-
-# End of file
Copied: mc/3D/CitcomS/trunk/examples/Cookbook2/cookbook2.cfg (from rev 4016, mc/3D/CitcomS/trunk/examples/Cookbook2/cookbook2.sh)
===================================================================
--- mc/3D/CitcomS/trunk/examples/Cookbook2/cookbook2.sh 2006-07-13 20:06:29 UTC (rev 4016)
+++ mc/3D/CitcomS/trunk/examples/Cookbook2/cookbook2.cfg 2006-07-13 23:41:51 UTC (rev 4017)
@@ -0,0 +1,34 @@
+# Cookbook 2: Velocity Boundary Conditions
+
+[CitcomS]
+steps = 61 ; number of time steps
+
+[CitcomS.launcher]
+nodes = 4 ; number of processors
+
+[CitcomS.controller]
+monitoringFrequency = 30 ; how often to monitor the computation
+
+[CitcomS.solver]
+datafile = cookbook2 ; location/name of output files
+
+# Modify the layout of the mesh.
+[CitcomS.solver.mesher]
+nprocx = 2
+nprocy = 2
+nodex = 17
+nodey = 17
+nodez = 9
+
+# Impose a uniform velocity across the top surface.
+[CitcomS.solver.bc]
+topvbc = 1
+topvbxval = 100
+topvbyval = 0
+
+# In addition, to determine the temperature, the temperature field
+# associated only with this imposed velocity, reset the initial
+# perturbation to zero.
+[CitcomS.solver.ic]
+num_perturbations = 1
+perturbmag = 0.0
Property changes on: mc/3D/CitcomS/trunk/examples/Cookbook2/cookbook2.cfg
___________________________________________________________________
Name: svn:keywords
+ Id
Deleted: mc/3D/CitcomS/trunk/examples/Cookbook2/cookbook2.sh
===================================================================
--- mc/3D/CitcomS/trunk/examples/Cookbook2/cookbook2.sh 2006-07-13 20:06:29 UTC (rev 4016)
+++ mc/3D/CitcomS/trunk/examples/Cookbook2/cookbook2.sh 2006-07-13 23:41:51 UTC (rev 4017)
@@ -1,55 +0,0 @@
-#!/bin/sh
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#<LicenseText>
-#
-# CitcomS.py by Eh Tan, Eun-seo Choi, and Pururav Thoutireddy.
-# Copyright (C) 2002-2005, California Institute of Technology.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-#</LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-citcomsregional.sh \
-\
---steps=61 \
-\
---controller.monitoringFrequency=30 \
-\
---launcher.nodes=4 \
-\
---solver.datafile=cookbook2 \
-\
---solver.mesher.nprocx=2 \
---solver.mesher.nprocy=2 \
---solver.mesher.nodex=17 \
---solver.mesher.nodey=17 \
---solver.mesher.nodez=9 \
-\
---solver.bc.topvbc=1 \
---solver.bc.topvbxval=100 \
---solver.bc.topvbyval=0 \
-\
---solver.ic.num_perturbations=1 \
---solver.ic.perturbmag=0.0
-
-# version
-# $Id$
-
-# End of file
Copied: mc/3D/CitcomS/trunk/examples/Cookbook3/cookbook3.cfg (from rev 4016, mc/3D/CitcomS/trunk/examples/Cookbook3/cookbook3.sh)
===================================================================
--- mc/3D/CitcomS/trunk/examples/Cookbook3/cookbook3.sh 2006-07-13 20:06:29 UTC (rev 4016)
+++ mc/3D/CitcomS/trunk/examples/Cookbook3/cookbook3.cfg 2006-07-13 23:41:51 UTC (rev 4017)
@@ -0,0 +1,35 @@
+# Cookbook 3: Temperature-dependent Viscosity
+
+[CitcomS]
+steps = 200 ; number of time steps
+
+[CitcomS.launcher]
+nodes = 4 ; number of processors
+
+[CitcomS.controller]
+monitoringFrequency = 25 ; how often to monitor the computation
+
+[CitcomS.solver]
+datafile = cookbook3 ; location/name of output files
+rayleigh = 1e6 ; Rayleigh number
+
+# Modify the layout of the mesh.
+[CitcomS.solver.mesher]
+nprocx = 2
+nprocy = 2
+nodex = 17
+nodey = 17
+nodez = 9
+
+# Assign the viscosities.
+[CitcomS.solver.visc]
+VISC_UPDATE = on
+num_mat = 4
+visc0 = 1,1,1,1
+TDEPV = on
+viscE = 0.2,0.2,0.2,0.2
+viscT = 0,0,0,0
+VMIN = on
+visc_min = 1.0
+VMAX = on
+visc_max = 100.0
Property changes on: mc/3D/CitcomS/trunk/examples/Cookbook3/cookbook3.cfg
___________________________________________________________________
Name: svn:keywords
+ Id
Deleted: mc/3D/CitcomS/trunk/examples/Cookbook3/cookbook3.sh
===================================================================
--- mc/3D/CitcomS/trunk/examples/Cookbook3/cookbook3.sh 2006-07-13 20:06:29 UTC (rev 4016)
+++ mc/3D/CitcomS/trunk/examples/Cookbook3/cookbook3.sh 2006-07-13 23:41:51 UTC (rev 4017)
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#<LicenseText>
-#
-# CitcomS.py by Eh Tan, Eun-seo Choi, and Pururav Thoutireddy.
-# Copyright (C) 2002-2005, California Institute of Technology.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-#</LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-citcomsregional.sh \
-\
---steps=200 \
-\
---controller.monitoringFrequency=25 \
-\
---launcher.nodes=4 \
-\
---solver.rayleigh=1e6 \
---solver.datafile=cookbook3 \
-\
---solver.mesher.nprocx=2 \
---solver.mesher.nprocy=2 \
---solver.mesher.nodex=17 \
---solver.mesher.nodey=17 \
---solver.mesher.nodez=9 \
-\
---solver.visc.VISC_UPDATE=on \
---solver.visc.num_mat=4 \
---solver.visc.visc0=1,1,1,1 \
---solver.visc.TDEPV=on \
---solver.visc.viscE=0.2,0.2,0.2,0.2 \
---solver.visc.viscT=0,0,0,0 \
---solver.visc.VMIN=on \
---solver.visc.visc_min=1.0 \
---solver.visc.VMAX=on \
---solver.visc.visc_max=100.0
-
-# version
-# $Id$
-
-# End of file
Copied: mc/3D/CitcomS/trunk/examples/Cookbook4/cookbook4.cfg (from rev 4016, mc/3D/CitcomS/trunk/examples/Cookbook4/cookbook4.sh)
===================================================================
--- mc/3D/CitcomS/trunk/examples/Cookbook4/cookbook4.sh 2006-07-13 20:06:29 UTC (rev 4016)
+++ mc/3D/CitcomS/trunk/examples/Cookbook4/cookbook4.cfg 2006-07-13 23:41:51 UTC (rev 4017)
@@ -0,0 +1,75 @@
+# Cookbook 4: Regionally Refined Meshes
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS]
+
+steps = 250 ; number of time steps
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.launcher]
+
+nodes = 16 ; number of processors
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.controller]
+
+monitoringFrequency = 10 ; how often to monitor the computation
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.solver]
+
+rayleigh = 1e6 ; Rayleigh number
+datafile = cookbook4 ; location/name of output files
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.solver.ic] ; Initial Conditions
+
+num_perturbations = 1
+perturbmag = 0.05
+
+# Perturb the initial temperature gradient in the longitudinal
+# direction.
+perturbl = 1
+perturbm = 0
+
+perturblayer = 10
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.solver.mesher] ; Mesh
+
+# Read uneven mesh point coordinates from 'coor.dat'.
+coor = on
+coor_file = coor.dat
+
+nprocx = 4
+nprocy = 2
+nprocz = 2
+nodex = 33
+nodey = 17
+nodez = 17
+levels = 1
+theta_min = 1
+theta_max = 2
+fi_min = 0
+fi_max = 1
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.solver.visc] ; Viscosity
+
+# Assign the viscosities.
+VISC_UPDATE = on
+num_mat = 4
+visc0 = 1,1,1,1
+TDEPV = on
+viscE = 0.2,0.2,0.2,0.2
+viscT = 0,0,0,0
+VMIN = on
+visc_min = 1.0
+VMAX = on
+visc_max = 100.0
Property changes on: mc/3D/CitcomS/trunk/examples/Cookbook4/cookbook4.cfg
___________________________________________________________________
Name: svn:keywords
+ Id
Deleted: mc/3D/CitcomS/trunk/examples/Cookbook4/cookbook4.sh
===================================================================
--- mc/3D/CitcomS/trunk/examples/Cookbook4/cookbook4.sh 2006-07-13 20:06:29 UTC (rev 4016)
+++ mc/3D/CitcomS/trunk/examples/Cookbook4/cookbook4.sh 2006-07-13 23:41:51 UTC (rev 4017)
@@ -1,74 +0,0 @@
-#!/bin/sh
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#<LicenseText>
-#
-# CitcomS.py by Eh Tan, Eun-seo Choi, and Pururav Thoutireddy.
-# Copyright (C) 2002-2005, California Institute of Technology.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-#</LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-citcomsregional.sh \
-\
---steps=250 \
-\
---controller.monitoringFrequency=10 \
-\
---launcher.nodes=16 \
-\
---solver.rayleigh=1e6 \
---solver.datafile=cookbook4 \
-\
---solver.ic.num_perturbations=1 \
---solver.ic.perturbmag=0.05 \
---solver.ic.perturbl=1 \
---solver.ic.perturbm=0 \
---solver.ic.perturblayer=10 \
-\
---solver.mesher.coor=on \
---solver.mesher.coor_file=coor.dat \
---solver.mesher.nprocx=4 \
---solver.mesher.nprocy=2 \
---solver.mesher.nprocz=2 \
---solver.mesher.nodex=33 \
---solver.mesher.nodey=17 \
---solver.mesher.nodez=17 \
---solver.mesher.levels=1 \
---solver.mesher.theta_min=1 \
---solver.mesher.theta_max=2 \
---solver.mesher.fi_min=0 \
---solver.mesher.fi_max=1 \
-\
---solver.visc.VISC_UPDATE=on \
---solver.visc.num_mat=4 \
---solver.visc.visc0=1,1,1,1 \
---solver.visc.TDEPV=on \
---solver.visc.viscE=0.2,0.2,0.2,0.2 \
---solver.visc.viscT=0,0,0,0 \
---solver.visc.VMIN=on \
---solver.visc.visc_min=1.0 \
---solver.visc.VMAX=on \
---solver.visc.visc_max=100.0
-
-# version
-# $Id$
-
-# End of file
Copied: mc/3D/CitcomS/trunk/examples/Cookbook5/cookbook5.cfg (from rev 4016, mc/3D/CitcomS/trunk/examples/Cookbook5/cookbook5.sh)
===================================================================
--- mc/3D/CitcomS/trunk/examples/Cookbook5/cookbook5.sh 2006-07-13 20:06:29 UTC (rev 4016)
+++ mc/3D/CitcomS/trunk/examples/Cookbook5/cookbook5.cfg 2006-07-13 23:41:51 UTC (rev 4017)
@@ -0,0 +1,92 @@
+# Cookbook 5: Subduction Models with Trench Rollback
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS]
+
+steps = 1000 ; number of time steps
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.launcher]
+
+nodes = 64 ; number of processors
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.controller]
+
+monitoringFrequency = 10 ; how often to monitor the computation
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.solver]
+
+datafile = ./cookbook5_output/cookbook5
+datafile_old = ./restart_files/cookbook5
+
+# Rayleigh number
+rayleigh = 4.07e+08
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.solver.bc] ; Boundary Conditions
+
+topvbc = 1
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.solver.param]
+
+file_vbcs = on
+
+start_age = 55
+
+# Since the starting age is set to 55 Ma, there will be 56 velocity
+# files, one for each Ma (bvel.dat0, bvel.dat1, ... bvel.dat56).
+vel_bound_file = ./velocity/bvel.dat
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.solver.ic] ; Initial Conditions
+
+restart = on
+solution_cycles_init = 0
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.solver.mesher]
+
+coor = on
+coor_file = ./coor.dat
+nprocx = 2
+nprocy = 8
+nprocz = 4
+nodex = 17
+nodey = 65
+nodez = 33
+theta_min = 1.47
+theta_max = 1.67
+fi_min = 0
+fi_max = 0.5
+radius_inner = 0.7
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.solver.const] ; Dimensional Information
+
+refvisc = 4e+21
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.solver.visc] ; Viscosity
+
+num_mat = 4
+visc0 = 100,0.003,1,2
+TDEPV = on
+viscE = 24,24,24,24
+viscT = 0.182,0.182,0.182,0.182
+viscZ = 357.6,357.6,357.6,357.6
+VMIN = on
+visc_min = 0.01
+VMAX = on
+visc_max = 100.0
Property changes on: mc/3D/CitcomS/trunk/examples/Cookbook5/cookbook5.cfg
___________________________________________________________________
Name: svn:keywords
+ Id
Deleted: mc/3D/CitcomS/trunk/examples/Cookbook5/cookbook5.sh
===================================================================
--- mc/3D/CitcomS/trunk/examples/Cookbook5/cookbook5.sh 2006-07-13 20:06:29 UTC (rev 4016)
+++ mc/3D/CitcomS/trunk/examples/Cookbook5/cookbook5.sh 2006-07-13 23:41:51 UTC (rev 4017)
@@ -1,78 +0,0 @@
-#!/bin/sh
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#<LicenseText>
-#
-# CitcomS.py by Eh Tan, Eun-seo Choi, and Pururav Thoutireddy.
-# Copyright (C) 2002-2005, California Institute of Technology.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-#</LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-citcomsregional.sh \
-\
---steps=1000 \
-\
---controller.monitoringFrequency=10 \
-\
---launcher.nodes=64 \
-\
---solver.datafile=./cookbook5_output/cookbook5 \
---solver.rayleigh=4.07e+08 \
-\
---solver.bc.topvbc=1 \
---solver.param.file_vbcs=on \
---solver.param.vel_bound_file=./velocity/bvel.dat \
---solver.param.start_age=55 \
-\
---solver.ic.restart=on \
---solver.ic.solution_cycles_init=0 \
---solver.datafile_old=./restart_files/cookbook5 \
-\
---solver.mesher.coor=on \
---solver.mesher.coor_file=./coor.dat \
---solver.mesher.nprocx=2 \
---solver.mesher.nprocy=8 \
---solver.mesher.nprocz=4 \
---solver.mesher.nodex=17 \
---solver.mesher.nodey=65 \
---solver.mesher.nodez=33 \
---solver.mesher.theta_min=1.47 \
---solver.mesher.theta_max=1.67 \
---solver.mesher.fi_min=0 \
---solver.mesher.fi_max=0.5 \
---solver.mesher.radius_inner=0.7 \
-\
---solver.const.refvisc=4e+21 \
---solver.visc.num_mat=4 \
---solver.visc.visc0=100,0.003,1,2 \
---solver.visc.TDEPV=on \
---solver.visc.viscE=24,24,24,24 \
---solver.visc.viscT=0.182,0.182,0.182,0.182 \
---solver.visc.viscZ=357.6,357.6,357.6,357.6 \
---solver.visc.VMIN=on \
---solver.visc.visc_min=0.01 \
---solver.visc.VMAX=on \
---solver.visc.visc_max=100.0
-
-# version
-# $Id$
-
-# End of file
Copied: mc/3D/CitcomS/trunk/examples/Cookbook7/cookbook7.cfg (from rev 4016, mc/3D/CitcomS/trunk/examples/Cookbook7/cookbook7.sh)
===================================================================
--- mc/3D/CitcomS/trunk/examples/Cookbook7/cookbook7.sh 2006-07-13 20:06:29 UTC (rev 4016)
+++ mc/3D/CitcomS/trunk/examples/Cookbook7/cookbook7.cfg 2006-07-13 23:41:51 UTC (rev 4017)
@@ -0,0 +1,120 @@
+# Cookbook 7
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS]
+
+steps = 100
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.launcher]
+
+nodes = 32
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.controller]
+
+monitoringFrequency = 10
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.solver]
+
+datafile = cookbook7
+rayleigh = 4.312616e+08
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.solver.mesher] ; Mesh
+
+nprocx = 4
+nprocy = 4
+nprocz = 2
+nodex = 61
+nodey = 61
+nodez = 25
+coor = true
+coor_file = ./coord.dat
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.tsolver]
+
+fixed_timestep = 7.77e-10
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.vsolver]
+
+precond = on
+accuracy = 1e-10
+tole_compressibility = 1e-06
+mg_cycle = 1
+down_heavy = 5
+up_heavy = 5
+vlowstep = 100000
+vhighstep = 3
+piterations = 100000
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.solver.ic] ; Initial Conditions
+
+num_perturbations = 0
+half_space_age = 100.0
+
+# To try a different hot blob, one can specify three parameters:
+# 1. blob_center: Coordinates(theta,fi,r) of the center.
+# 2. blob_radius: Radius as non-dimensional distance.
+# 3. blob_dT: The amount of temperature increase/decrease
+# within the blob as non-dimensional temperature.
+#
+# Note: It is required to keep "tic_method = 2" to have the initial
+# hot blob.
+
+tic_method = 2
+blob_center = 1.570800e+00,1.570800e+00,9.246600e-01
+blob_radius = 6.278334e-02
+blob_dT = 0.18
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.solver.bc] ; Boundary Conditions
+
+topvbc = 2
+pseudo_free_surf = on
+bottbcval = 0.82
+
+# To convert pseudo-free-surface B.C. to free-slip B.C., do the
+# following:
+
+#topvbc = 0
+#pseudo_free_surf = off
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.solver.param]
+
+start_age = 60
+mantle_temp = 0.82
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.solver.visc] ; Viscosity
+
+TDEPV = on
+visc0 = 1,1,1,1
+viscE = 9.50614,9.50614,9.50614,9.50614
+viscT = 1.02126,1.02126,1.02126,1.02126
+
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[CitcomS.solver.const] ; Dimensional Information
+
+layerd = 6.371e+06
+density = 3270.0
+thermdiff = 1.0e-06
+gravacc = 10.0
+thermexp = 3.0e-05
+refvisc = 1.0e+21
Deleted: mc/3D/CitcomS/trunk/examples/Cookbook7/cookbook7.sh
===================================================================
--- mc/3D/CitcomS/trunk/examples/Cookbook7/cookbook7.sh 2006-07-13 20:06:29 UTC (rev 4016)
+++ mc/3D/CitcomS/trunk/examples/Cookbook7/cookbook7.sh 2006-07-13 23:41:51 UTC (rev 4017)
@@ -1,89 +0,0 @@
-#!/bin/sh
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#<LicenseText>
-#
-# CitcomS.py by Eh Tan, Eun-seo Choi, and Pururav Thoutireddy.
-# Copyright (C) 2002-2005, California Institute of Technology.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-#</LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-./citcomsregional.sh \
-\
---launcher.nodes=32 \
-\
---solver.datafile=cookbook7 \
---solver.rayleigh=4.312616e+08 \
-\
---solver.mesher.nprocx=4 \
---solver.mesher.nprocy=4 \
---solver.mesher.nprocz=2 \
---solver.mesher.nodex=61 \
---solver.mesher.nodey=61 \
---solver.mesher.nodez=25 \
---solver.mesher.coor=true \
---solver.mesher.coor_file=./coord.dat \
-\
---solver.tsolver.fixed_timestep=7.77e-10 \
-\
---solver.vsolver.precond=on \
---solver.vsolver.accuracy=1e-10 \
---solver.vsolver.tole_compressibility=1e-06 \
---solver.vsolver.mg_cycle=1 \
---solver.vsolver.down_heavy=5 \
---solver.vsolver.up_heavy=5 \
---solver.vsolver.vlowstep=100000 \
---solver.vsolver.vhighstep=3 \
---solver.vsolver.piterations=100000 \
-\
---solver.ic.tic_method=2 \
---solver.ic.num_perturbations=0 \
---solver.ic.half_space_age=100.0 \
---solver.ic.blob_center=1.570800e+00,1.570800e+00,9.246600e-01 \
---solver.ic.blob_radius=6.278334e-02 \
---solver.ic.blob_dT=0.18 \
-\
---solver.bc.topvbc=2 \
---solver.bc.pseudo_free_surf=on \
---solver.bc.bottbcval=0.82 \
-\
---solver.param.start_age=60 \
---solver.param.mantle_temp=0.82 \
-\
---solver.visc.TDEPV=on \
---solver.visc.visc0=1,1,1,1 \
---solver.visc.viscE=9.50614,9.50614,9.50614,9.50614 \
---solver.visc.viscT=1.02126,1.02126,1.02126,1.02126 \
-\
---solver.const.layerd=6.371e+06 \
---solver.const.density=3270.0 \
---solver.const.thermdiff=1.0e-06 \
---solver.const.gravacc=10.0 \
---solver.const.thermexp=3.0e-05 \
---solver.const.refvisc=1.0e+21 \
-\
---steps=100 \
---controller.monitoringFrequency=10
-
-# version
-# $Id: cookbook5.sh 2397 2005-10-04 22:37:25Z leif $
-
-# End of file
Deleted: mc/3D/CitcomS/trunk/examples/example1.sh
===================================================================
--- mc/3D/CitcomS/trunk/examples/example1.sh 2006-07-13 20:06:29 UTC (rev 4016)
+++ mc/3D/CitcomS/trunk/examples/example1.sh 2006-07-13 23:41:51 UTC (rev 4017)
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#<LicenseText>
-#
-# CitcomS.py by Eh Tan, Eun-seo Choi, and Pururav Thoutireddy.
-# Copyright (C) 2002-2005, California Institute of Technology.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-#</LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-
-# Note: to run on a Beowulf cluster with MPICH, one would add
-# arguments similar to the following:
-#
-# --launcher.nodegen="n%03d" --launcher.nodelist=[131-132]
-#
-# This would generate the following machine file:
-#
-# n131
-# n132
-#
-# This generated machine file is automatically passed to 'mpirun'.
-
-citcomsregional.sh \
-\
---steps=1 \
-\
---controller.monitoringFrequency=10 \
-\
---launcher.nodes=4 \
-\
---solver.datafile=example1 \
-\
---solver.mesher.nprocx=2 \
---solver.mesher.nprocy=2 \
---solver.mesher.nodex=17 \
---solver.mesher.nodey=17 \
---solver.mesher.nodez=9
-
-# version
-# $Id$
-
-# End of file
Modified: mc/3D/CitcomS/trunk/tests/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/tests/Makefile.am 2006-07-13 20:06:29 UTC (rev 4016)
+++ mc/3D/CitcomS/trunk/tests/Makefile.am 2006-07-13 23:41:51 UTC (rev 4017)
@@ -23,24 +23,6 @@
# $Id$
-nodist_bin_SCRIPTS = \
- citcomsfull.sh \
- citcomsregional.sh \
- coupledcitcoms.sh
-do_subst = sed \
- -e 's|[@]CITCOMS[@]|$(bindir)/citcoms|g'
-citcomsfull.sh: $(srcdir)/citcomsfull.sh.in
- $(do_subst) < $(srcdir)/citcomsfull.sh.in > $@ || (rm -f $@ && exit 1)
-citcomsregional.sh: $(srcdir)/citcomsregional.sh.in
- $(do_subst) < $(srcdir)/citcomsregional.sh.in > $@ || (rm -f $@ && exit 1)
-coupledcitcoms.sh: $(srcdir)/coupledcitcoms.sh.in
- $(do_subst) < $(srcdir)/coupledcitcoms.sh.in > $@ || (rm -f $@ && exit 1)
-CLEANFILES = $(nodist_bin_SCRIPTS)
-EXTRA_DIST = \
- citcomsfull.sh.in \
- citcomsregional.sh.in \
- coupledcitcoms.sh.in
-
# C++ tests
TESTS = $(EXTRA_PROGRAMS)
INSTALL_TESTS = $(EXTRA_PROGRAMS)
@@ -57,7 +39,7 @@
$(MPILIBS)
CC = $(MPICC)
-EXTRA_DIST += \
+EXTRA_DIST = \
asap.py \
exchange.py \
hrothgar.py \
Deleted: mc/3D/CitcomS/trunk/tests/citcomsfull.sh.in
===================================================================
--- mc/3D/CitcomS/trunk/tests/citcomsfull.sh.in 2006-07-13 20:06:29 UTC (rev 4016)
+++ mc/3D/CitcomS/trunk/tests/citcomsfull.sh.in 2006-07-13 23:41:51 UTC (rev 4017)
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
-#
-#<LicenseText>
-#
-# CitcomS.py by Eh Tan, Eun-seo Choi, and Pururav Thoutireddy.
-# Copyright (C) 2002-2005, California Institute of Technology.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-#</LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
-
-
- at CITCOMS@ --solver=full $*
-
-
-# version
-# $Id$
-
-# End of file
Deleted: mc/3D/CitcomS/trunk/tests/citcomsregional.sh.in
===================================================================
--- mc/3D/CitcomS/trunk/tests/citcomsregional.sh.in 2006-07-13 20:06:29 UTC (rev 4016)
+++ mc/3D/CitcomS/trunk/tests/citcomsregional.sh.in 2006-07-13 23:41:51 UTC (rev 4017)
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
-#
-#<LicenseText>
-#
-# CitcomS.py by Eh Tan, Eun-seo Choi, and Pururav Thoutireddy.
-# Copyright (C) 2002-2005, California Institute of Technology.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-#</LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
-
-
- at CITCOMS@ $*
-
-
-# version
-# $Id$
-
-# End of file
Deleted: mc/3D/CitcomS/trunk/tests/coupledcitcoms.sh.in
===================================================================
--- mc/3D/CitcomS/trunk/tests/coupledcitcoms.sh.in 2006-07-13 20:06:29 UTC (rev 4016)
+++ mc/3D/CitcomS/trunk/tests/coupledcitcoms.sh.in 2006-07-13 23:41:51 UTC (rev 4017)
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
-#
-#<LicenseText>
-#
-# CitcomS.py by Eh Tan, Eun-seo Choi, and Pururav Thoutireddy.
-# Copyright (C) 2002-2005, California Institute of Technology.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-#</LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#
-
-
- at CITCOMS@ --coupled $*
-
-
-# version
-# $Id$
-
-# End of file
More information about the cig-commits
mailing list