[cig-commits] r15339 - in short/3D/PyLith/trunk: examples/3d/hex8 libsrc/materials

[brad at geodynamics.org]

Author: brad
Date: 2009-06-18 17:31:28 -0700 (Thu, 18 Jun 2009)
New Revision: 15339

Modified:
   short/3D/PyLith/trunk/examples/3d/hex8/mat_genmaxwell.spatialdb
   short/3D/PyLith/trunk/examples/3d/hex8/mat_powerlaw.spatialdb
   short/3D/PyLith/trunk/examples/3d/hex8/savageprescott.cfg
   short/3D/PyLith/trunk/libsrc/materials/GenMaxwellIsotropic3D.cc
   short/3D/PyLith/trunk/libsrc/materials/PowerLaw3D.cc
Log:
Updated names of property database variables for consistency with the other materials.

Modified: short/3D/PyLith/trunk/examples/3d/hex8/mat_genmaxwell.spatialdb
===================================================================
--- short/3D/PyLith/trunk/examples/3d/hex8/mat_genmaxwell.spatialdb	2009-06-18 23:49:32 UTC (rev 15338)
+++ short/3D/PyLith/trunk/examples/3d/hex8/mat_genmaxwell.spatialdb	2009-06-19 00:31:28 UTC (rev 15339)
@@ -7,7 +7,7 @@
 #SPATIAL.ascii 1
 SimpleDB {
   num-values = 9 // number of material property values
-  value-names =  density vs vp shear_ratio_1 shear_ratio_2 shear_ratio_3 viscosity_1 viscosity_2 viscosity_3 // names of the material property values
+  value-names =  density vs vp shear-ratio-1 shear-ratio-2 shear-ratio-3 viscosity-1 viscosity-2 viscosity-3 // names of the material property values
   value-units =  kg/m**3  m/s  m/s None None None Pa*s Pa*s Pa*s // units
   num-locs = 1 // number of locations
   data-dim = 0

Modified: short/3D/PyLith/trunk/examples/3d/hex8/mat_powerlaw.spatialdb
===================================================================
--- short/3D/PyLith/trunk/examples/3d/hex8/mat_powerlaw.spatialdb	2009-06-18 23:49:32 UTC (rev 15338)
+++ short/3D/PyLith/trunk/examples/3d/hex8/mat_powerlaw.spatialdb	2009-06-19 00:31:28 UTC (rev 15339)
@@ -7,7 +7,7 @@
 #SPATIAL.ascii 1
 SimpleDB {
   num-values = 5 // number of material property values
-  value-names =  density vs vp viscosity_coeff power_law_exponent // names of the material property values
+  value-names =  density vs vp viscosity-coeff power-law-exponent // names of the material property values
   value-units =  kg/m**3  m/s  m/s s**(1.0/3.0)*Pa None // units
   num-locs = 1 // number of locations
   data-dim = 0
@@ -24,6 +24,6 @@
 // (4) density (kg/m^3)
 // (5) vs (m/s)
 // (6) vp (m/s)
-// (7) viscosity_coeff (s**(1.0/power_law_exponent) * Pa)
-// (8) power_law_exponent (no units)
-0.0  0.0  0.0   2500.0  3000.0  5291.502622129181 1.00e12  3.0
+// (7) viscosity-coeff (s**(1.0/power-law-exponent) * Pa)
+// (8) power-law-exponent (no units)
+0.0  0.0  0.0   2500.0  3000.0  5291.502622129181 1.00e+12  3.0

Modified: short/3D/PyLith/trunk/examples/3d/hex8/savageprescott.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/3d/hex8/savageprescott.cfg	2009-06-18 23:49:32 UTC (rev 15338)
+++ short/3D/PyLith/trunk/examples/3d/hex8/savageprescott.cfg	2009-06-19 00:31:28 UTC (rev 15339)
@@ -43,14 +43,15 @@
 
 # ----------------------------------------------------------------------
 # Uncomment the lines below to switch to the power-law rheology and
-# nonlinear solver.
+# nonlinear solver and comment out the lines
 # ----------------------------------------------------------------------
 
-[pylithapp.timedependent]
+#[pylithapp.timedependent]
 #implicit.solver = pylith.problems.SolverNonlinear
+#implicit.time_step.max_dt = 10.0*year
 #materials.viscoelastic = pylith.materials.PowerLaw3D
 
-[pylithapp.timedependent.materials.viscoelastic]
+#[pylithapp.timedependent.materials.viscoelastic]
 #db_properties.iohandler.filename = mat_powerlaw.spatialdb
 #output.cell_info_fields = [density,mu,lambda,viscosity_coeff,power_law_exponent]
 

Modified: short/3D/PyLith/trunk/libsrc/materials/GenMaxwellIsotropic3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/materials/GenMaxwellIsotropic3D.cc	2009-06-18 23:49:32 UTC (rev 15338)
+++ short/3D/PyLith/trunk/libsrc/materials/GenMaxwellIsotropic3D.cc	2009-06-19 00:31:28 UTC (rev 15339)
@@ -62,12 +62,12 @@
       const int numDBProperties = 3 + 2*numMaxwellModels;
       const char* dbProperties[numDBProperties] = {
 	"density", "vs", "vp",
-	"shear_ratio_1",
-	"shear_ratio_2",
-	"shear_ratio_3",
-	"viscosity_1",
-	"viscosity_2",
-	"viscosity_3",
+	"shear-ratio-1",
+	"shear-ratio-2",
+	"shear-ratio-3",
+	"viscosity-1",
+	"viscosity-2",
+	"viscosity-3",
       };
       
       /// Number of state variables.

Modified: short/3D/PyLith/trunk/libsrc/materials/PowerLaw3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/materials/PowerLaw3D.cc	2009-06-18 23:49:32 UTC (rev 15338)
+++ short/3D/PyLith/trunk/libsrc/materials/PowerLaw3D.cc	2009-06-19 00:31:28 UTC (rev 15339)
@@ -58,8 +58,8 @@
       // Values expected in properties spatial database
       const int numDBProperties = 5;
       const char* dbProperties[] = {"density", "vs", "vp" ,
-				    "viscosity_coeff",
-				    "power_law_exponent"};
+				    "viscosity-coeff",
+				    "power-law-exponent"};
 
       /// Number of state variables.
       const int numStateVars = 2;