[cig-commits] r11643 - in short/3D/PyLith/trunk: libsrc/faults pylith/faults pylith/meshio

[brad at geodynamics.org]

Author: brad
Date: 2008-03-30 14:51:34 -0700 (Sun, 30 Mar 2008)
New Revision: 11643

Modified:
   short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc
   short/3D/PyLith/trunk/pylith/faults/FaultCohesiveKin.py
   short/3D/PyLith/trunk/pylith/meshio/OutputFaultKin.py
Log:
Switched underscores to hyphens in names of output fields for consistency.

Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc	2008-03-30 21:50:35 UTC (rev 11642)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc	2008-03-30 21:51:34 UTC (rev 11643)
@@ -433,32 +433,32 @@
     assert(!_slip.isNull());
     return _slip;
 
-  } else if (cohesiveDim > 0 && 0 == strcasecmp("strike_dir", name)) {
+  } else if (cohesiveDim > 0 && 0 == strcasecmp("strike-dir", name)) {
     _bufferVertexVector = _orientation->getFibration(0);
     *fieldType = VECTOR_FIELD;
     return _bufferVertexVector;
 
-  } else if (2 == cohesiveDim && 0 == strcasecmp("dip_dir", name)) {
+  } else if (2 == cohesiveDim && 0 == strcasecmp("dip-dir", name)) {
     _bufferVertexVector = _orientation->getFibration(1);
     *fieldType = VECTOR_FIELD;
     return _bufferVertexVector;
 
-  } else if (0 == strcasecmp("normal_dir", name)) {
+  } else if (0 == strcasecmp("normal-dir", name)) {
     const int space = 
       (0 == cohesiveDim) ? 0 : (1 == cohesiveDim) ? 1 : 2;
     _bufferVertexVector = _orientation->getFibration(space);
     *fieldType = VECTOR_FIELD;
     return _bufferVertexVector;
 
-  } else if (0 == strcasecmp("final_slip", name)) {
+  } else if (0 == strcasecmp("final-slip", name)) {
     _bufferVertexVector = _eqsrc->finalSlip();
     *fieldType = VECTOR_FIELD;
     return _bufferVertexVector;
-  } else if (0 == strcasecmp("slip_time", name)) {
+  } else if (0 == strcasecmp("slip-time", name)) {
     _bufferVertexScalar = _eqsrc->slipTime();
     *fieldType = SCALAR_FIELD;
     return _bufferVertexScalar;
-  } else if (0 == strcasecmp("traction_change", name)) {
+  } else if (0 == strcasecmp("traction-change", name)) {
     *fieldType = VECTOR_FIELD;
     const ALE::Obj<real_section_type>& solution = fields->getSolution();
     _calcTractionsChange(&_bufferVertexVector, solution);

Modified: short/3D/PyLith/trunk/pylith/faults/FaultCohesiveKin.py
===================================================================
--- short/3D/PyLith/trunk/pylith/faults/FaultCohesiveKin.py	2008-03-30 21:50:35 UTC (rev 11642)
+++ short/3D/PyLith/trunk/pylith/faults/FaultCohesiveKin.py	2008-03-30 21:51:34 UTC (rev 11643)
@@ -73,10 +73,10 @@
 
     self.availableFields = \
         {'vertex': \
-           {'info': ["normal_dir",
-                     "final_slip",
-                     "slip_time"],
-            'data': ["slip", "traction_change"]},
+           {'info': ["normal-dir",
+                     "final-slip",
+                     "slip-time"],
+            'data': ["slip", "traction-change"]},
          'cell': \
            {'info': [],
             'data': []}}
@@ -95,10 +95,10 @@
     self.cppHandle.eqsrc = self.eqsrc.cppHandle
 
     if mesh.dimension() == 2:
-      self.availableFields['vertex']['info'] += ["strike_dir"]
+      self.availableFields['vertex']['info'] += ["strike-dir"]
     elif mesh.dimension() == 3:
-      self.availableFields['vertex']['info'] += ["strike_dir",
-                                                 "dip_dir"]
+      self.availableFields['vertex']['info'] += ["strike-dir",
+                                                 "dip-dir"]
     return
   
 

Modified: short/3D/PyLith/trunk/pylith/meshio/OutputFaultKin.py
===================================================================
--- short/3D/PyLith/trunk/pylith/meshio/OutputFaultKin.py	2008-03-30 21:50:35 UTC (rev 11642)
+++ short/3D/PyLith/trunk/pylith/meshio/OutputFaultKin.py	2008-03-30 21:51:34 UTC (rev 11643)
@@ -48,13 +48,13 @@
     import pyre.inventory
 
     vertexInfoFields = pyre.inventory.list("vertex_info_fields",
-                                           default=["normal_dir",
-                                                    "final_slip",
-                                                    "slip_time"])
+                                           default=["normal-dir",
+                                                    "final-slip",
+                                                    "slip-time"])
     vertexInfoFields.meta['tip'] = "Names of vertex info fields to output."
 
     vertexDataFields = pyre.inventory.list("vertex_data_fields", 
-                                           default=["slip","traction_change"])
+                                           default=["slip","traction-change"])
     vertexDataFields.meta['tip'] = "Names of vertex data fields to output."
 
   # PUBLIC METHODS /////////////////////////////////////////////////////