[cig-commits] r4573 - in mc/3D/CitcomS/trunk: CitcomS/Components
CitcomS/Components/Advection_diffusion module
tan2 at geodynamics.org
tan2 at geodynamics.org
Wed Sep 20 13:30:28 PDT 2006
Author: tan2
Date: 2006-09-20 13:30:27 -0700 (Wed, 20 Sep 2006)
New Revision: 4573
Modified:
mc/3D/CitcomS/trunk/CitcomS/Components/Advection_diffusion/Advection_diffusion.py
mc/3D/CitcomS/trunk/CitcomS/Components/Const.py
mc/3D/CitcomS/trunk/CitcomS/Components/IC.py
mc/3D/CitcomS/trunk/CitcomS/Components/Visc.py
mc/3D/CitcomS/trunk/module/setProperties.cc
Log:
Print out all pyre properties to the pid file
Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Advection_diffusion/Advection_diffusion.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Advection_diffusion/Advection_diffusion.py 2006-09-20 19:54:04 UTC (rev 4572)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Advection_diffusion/Advection_diffusion.py 2006-09-20 20:30:27 UTC (rev 4573)
@@ -34,13 +34,6 @@
def __init__(self, name, facility):
CitcomComponent.__init__(self, name, facility)
- self.inventory.ADV = True
-
- self.inventory.adv_sub_iterations = 2
- self.inventory.maxadvtime = 10
-
- self.inventory.aug_lagr = True
- self.inventory.aug_number = 2.0e3
return
@@ -93,14 +86,21 @@
import pyre.inventory as prop
+ ADV = prop.bool("ADV", default=True)
+ filter_temp = prop.bool("filter_temp", default=True)
- inputdiffusivity = prop.float("inputdiffusivity", default=1)
fixed_timestep = prop.float("fixed_timestep", default=0.0)
finetunedt = prop.float("finetunedt", default=0.9)
- filter_temp = prop.bool("filter_temp", default=True)
+ inputdiffusivity = prop.float("inputdiffusivity", default=1)
+ adv_sub_iterations = prop.int("adv_sub_iterations", default=2)
+ maxadvtime = prop.float("maxadvtime", default=10.0)
+ aug_lagr = prop.bool("aug_lagr", default=True)
+ aug_number = prop.float("aug_number", default=2.0e3)
+
+
# version
__id__ = "$Id$"
Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Const.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Const.py 2006-09-20 19:54:04 UTC (rev 4572)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Const.py 2006-09-20 20:30:27 UTC (rev 4573)
@@ -57,7 +57,6 @@
from pyre.units.pressure import Pa
from pyre.units.energy import J
- #radius = pyre.inventory.float("radius", default=6371.0*km)
#ref_density = pyre.inventory.float("ref_density", default=3500.0*kg/m**3)
#thermdiff = pyre.inventory.float("thermdiff", default=1.0e-6*m**2/s)
#gravacc = pyre.inventory.float("gravacc", default=10.0*m/s**2)
@@ -72,8 +71,7 @@
#depth_d_double_prime = pyre.inventory.float("depth_d_double_prime", default=2691e3*m)
#depth_cmb = pyre.inventory.float("depth_cmb", default=2891e3*m)
- # everything in SI units
- radius = pyre.inventory.float("radius", default=6371.0e3)
+ # everything in SI units
layerd = pyre.inventory.float("layerd", default=6371.0e3)
density = pyre.inventory.float("density", default=3500.0)
thermdiff = pyre.inventory.float("thermdiff", default=1.0e-6)
Modified: mc/3D/CitcomS/trunk/CitcomS/Components/IC.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/IC.py 2006-09-20 19:54:04 UTC (rev 4572)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/IC.py 2006-09-20 20:30:27 UTC (rev 4573)
@@ -40,7 +40,7 @@
def setProperties(self):
from CitcomSLib import IC_set_properties
-
+
inv = self.inventory
inv.perturbmag = map(float, inv.perturbmag)
inv.perturbl = map(float, inv.perturbl)
@@ -48,7 +48,7 @@
inv.blob_center = map(float, inv.blob_center)
IC_set_properties(self.all_variables, inv)
-
+
return
@@ -108,17 +108,17 @@
tic_method = pyre.inventory.int("tic_method", default=0,
validator=pyre.inventory.choice([0, 1, 2]))
- half_space_age = pyre.inventory.float("half_space_age", default=40,
- validator=pyre.inventory.greater(1e-3))
-
+ # for tic_method=0
num_perturbations = pyre.inventory.int("num_perturbations", default=1,
validator=pyre.inventory.less(255))
- perturbmag = pyre.inventory.list("perturbmag", default=[0.05])
perturbl = pyre.inventory.list("perturbl", default=[1])
perturbm = pyre.inventory.list("perturbm", default=[1])
perturblayer = pyre.inventory.slice("perturblayer", default=[5])
+ perturbmag = pyre.inventory.list("perturbmag", default=[0.05])
-
+ # for tic_method=1
+ half_space_age = pyre.inventory.float("half_space_age", default=40,
+ validator=pyre.inventory.greater(1e-3))
blob_center = pyre.inventory.list("blob_center", default=[-999., -999., -999.])
blob_radius = pyre.inventory.float("blob_radius", default=0.063)
blob_dT = pyre.inventory.float("blob_dT", default=0.18)
Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Visc.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Visc.py 2006-09-20 19:54:04 UTC (rev 4572)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Visc.py 2006-09-20 20:30:27 UTC (rev 4573)
@@ -33,9 +33,6 @@
def __init__(self, name="visc", facility="visc"):
CitcomComponent.__init__(self, name, facility)
-
- self.inventory.Viscosity = "system"
- self.inventory.visc_smooth_method = 3
return
@@ -43,7 +40,7 @@
def setProperties(self):
from CitcomSLib import Visc_set_properties
-
+
inv = self.inventory
inv.visc0 = map(float, inv.visc0)
inv.viscE = map(float, inv.viscE)
@@ -52,7 +49,7 @@
inv.sdepv_expt = map(float, inv.sdepv_expt)
Visc_set_properties(self.all_variables, inv)
-
+
return
@@ -70,7 +67,8 @@
import pyre.inventory
-
+ Viscosity = pyre.inventory.str("Viscosity", default="system")
+ visc_smooth_method = pyre.inventory.int("visc_smooth_method", default=3)
VISC_UPDATE = pyre.inventory.bool("VISC_UPDATE", default=True)
num_mat = pyre.inventory.int("num_mat", default=4)
Modified: mc/3D/CitcomS/trunk/module/setProperties.cc
===================================================================
--- mc/3D/CitcomS/trunk/module/setProperties.cc 2006-09-20 19:54:04 UTC (rev 4572)
+++ mc/3D/CitcomS/trunk/module/setProperties.cc 2006-09-20 20:30:27 UTC (rev 4573)
@@ -70,11 +70,12 @@
std::ofstream *out = get_output_stream(E->parallel.me, E->control.PID);
*out << "[CitcomS.solver.tsolver]" << std::endl;
- getScalarProperty(properties, "inputdiffusivity", E->control.inputdiff, out);
+ getScalarProperty(properties, "ADV", E->advection.ADVECTION, out);
+ getScalarProperty(properties, "filter_temp", E->control.filter_temperature, out);
- getScalarProperty(properties, "ADV", E->advection.ADVECTION, out);
+ getScalarProperty(properties, "finetunedt", E->advection.fine_tune_dt, out);
getScalarProperty(properties, "fixed_timestep", E->advection.fixed_timestep, out);
- getScalarProperty(properties, "finetunedt", E->advection.fine_tune_dt, out);
+ getScalarProperty(properties, "inputdiffusivity", E->control.inputdiff, out);
getScalarProperty(properties, "adv_sub_iterations", E->advection.temp_iterations, out);
getScalarProperty(properties, "maxadvtime", E->advection.max_dimensionless_time, out);
@@ -82,7 +83,6 @@
getScalarProperty(properties, "aug_lagr", E->control.augmented_Lagr, out);
getScalarProperty(properties, "aug_number", E->control.augmented, out);
- getScalarProperty(properties, "filter_temp", E->control.filter_temperature, out);
E->advection.total_timesteps = 1;
E->advection.sub_iterations = 1;
@@ -124,13 +124,12 @@
*out << "[CitcomS.solver.bc]" << std::endl;
getScalarProperty(properties, "side_sbcs", E->control.side_sbcs, out);
+ getScalarProperty(properties, "pseudo_free_surf", E->control.pseudo_free_surf, out);
getScalarProperty(properties, "topvbc", E->mesh.topvbc, out);
getScalarProperty(properties, "topvbxval", E->control.VBXtopval, out);
getScalarProperty(properties, "topvbyval", E->control.VBYtopval, out);
- getScalarProperty(properties, "pseudo_free_surf", E->control.pseudo_free_surf, out);
-
getScalarProperty(properties, "botvbc", E->mesh.botvbc, out);
getScalarProperty(properties, "botvbxval", E->control.VBXbotval, out);
getScalarProperty(properties, "botvbyval", E->control.VBYbotval, out);
@@ -459,6 +458,7 @@
*out << "[CitcomS.mesher]" << std::endl;
getScalarProperty(properties, "nproc_surf", E->parallel.nprocxy, out);
+
getScalarProperty(properties, "nprocx", E->parallel.nprocx, out);
getScalarProperty(properties, "nprocy", E->parallel.nprocy, out);
getScalarProperty(properties, "nprocz", E->parallel.nprocz, out);
@@ -501,7 +501,7 @@
E->sphere.max_connections = 6;
if (E->parallel.nprocxy == 12) {
-
+ // full spherical version
E->sphere.caps = 12;
int i, j;
@@ -540,7 +540,7 @@
}
} else {
-
+ // regional version
E->sphere.caps = 1;
getScalarProperty(properties, "theta_min", E->control.theta_min, out);
@@ -631,7 +631,7 @@
*out << "[CitcomS.solver.visc]" << std::endl;
getStringProperty(properties, "Viscosity", E->viscosity.STRUCTURE, out);
- if ( strcmp(E->viscosity.STRUCTURE,"system") == 0)
+ if (strcmp(E->viscosity.STRUCTURE,"system") == 0)
E->viscosity.FROM_SYSTEM = 1;
else
E->viscosity.FROM_SYSTEM = 0;
@@ -703,6 +703,7 @@
std::ofstream *out = get_output_stream(E->parallel.me, E->control.PID);
*out << "[CitcomS.solver.vsolver]" << std::endl;
+ getStringProperty(properties, "Solver", E->control.SOLVER_TYPE, out);
getScalarProperty(properties, "node_assemble", E->control.NASSEMBLE, out);
getScalarProperty(properties, "precond", E->control.precondition, out);
More information about the cig-commits
mailing list