[cig-commits] r21336 - in short/3D/PyLith/branches/v1.8-mixedfault: libsrc/pylith libsrc/pylith/faults modulesrc/faults pylith pylith/faults
rjolivet at geodynamics.org
rjolivet at geodynamics.org
Tue Feb 5 13:20:18 PST 2013
Author: rjolivet
Date: 2013-02-05 13:20:18 -0800 (Tue, 05 Feb 2013)
New Revision: 21336
Modified:
short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/Makefile.am
short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/faults/FaultCohesiveDynKin.cc
short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/faults/FaultCohesiveDynKin.hh
short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/faults/Makefile.am
short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/faults/dkSelector.cc
short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/faults/dkSelector.hh
short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/faults/faultsfwd.hh
short/3D/PyLith/branches/v1.8-mixedfault/modulesrc/faults/Makefile.am
short/3D/PyLith/branches/v1.8-mixedfault/modulesrc/faults/dkSelector.i
short/3D/PyLith/branches/v1.8-mixedfault/pylith/Makefile.am
short/3D/PyLith/branches/v1.8-mixedfault/pylith/faults/__init__.py
short/3D/PyLith/branches/v1.8-mixedfault/pylith/faults/dkSelector.py
Log:
Debugging and Corrections
Modified: short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/Makefile.am
===================================================================
--- short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/Makefile.am 2013-02-05 13:15:49 UTC (rev 21335)
+++ short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/Makefile.am 2013-02-05 21:20:18 UTC (rev 21336)
@@ -60,6 +60,8 @@
faults/FaultCohesiveLagrange.cc \
faults/FaultCohesiveKin.cc \
faults/FaultCohesiveDyn.cc \
+ faults/FaultCohesiveDynKin.cc \
+ faults/DKSelector.cc \
faults/FaultCohesiveImpulses.cc \
faults/FaultCohesiveTract.cc \
faults/EqKinSrc.cc \
Modified: short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/faults/FaultCohesiveDynKin.cc
===================================================================
--- short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/faults/FaultCohesiveDynKin.cc 2013-02-05 13:15:49 UTC (rev 21335)
+++ short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/faults/FaultCohesiveDynKin.cc 2013-02-05 21:20:18 UTC (rev 21336)
@@ -22,7 +22,8 @@
#include "CohesiveTopology.hh" // USES CohesiveTopology
#include "TractPerturbation.hh" // HOLDSA TractPerturbation
-#include "dkSelector.hh" // USES dkSelector
+#include "DKSelector.hh" // USES DKSelector
+#include "EqKinSrc.hh" // USES EqKinSrc
#include "pylith/feassemble/Quadrature.hh" // USES Quadrature
#include "pylith/feassemble/CellGeometry.hh" // USES CellGeometry
@@ -108,8 +109,8 @@
// ----------------------------------------------------------------------
// Sets the spatial database for the dynamic-kinematic selector
void
-pylith::faults::FaultCohesiveDynKin::dkSelector(dkSelector* dksel)
-{ // dkSelector
+pylith::faults::FaultCohesiveDynKin::dkSelector(DKSelector* dksel)
+{ // DKSelector
_dkSelector = dksel;
} // dkSelector
@@ -184,7 +185,7 @@
// Get the DynKin Selector using a spatial database.
if (_dkSelector) {
- _dkSelector->initialize(*_faultMesh, *_normalizer)
+ _dkSelector->initialize(*_faultMesh, *_normalizer);
} // if
// Setup fault constitutive model.
@@ -217,6 +218,11 @@
src->initialize(*_faultMesh, *_normalizer);
} // for
+ // Get the DynKin Selector using a spatial database.
+ if (_dkSelector) {
+ _dkSelector->initialize(*_faultMesh, *_normalizer);
+ } // if should be useless
+
logger.stagePop();
} // initialize
@@ -307,6 +313,19 @@
residualSection);
assert(!globalOrder.isNull());
+ // Get the dkSelector
+ if (_dkSelector) {
+ _fields->add("Dynamic Kinematic Selector","dynamic_kinematic_selector")
+ topology::Field<topology::SubMesh>& dk = _fields->get("Dynamic Kinematic Selector");
+ _dkSelector->dk(&dk);
+ const ALE::Obj<RealSection>& dkSelSection = dk->section();
+ assert(!0 = dkSelSection);
+ } else { // should never be here
+ std::ostringstream msg;
+ msg << "No Dynamic Kinematic Selector available.";
+ throw std::runtime_error(msg.str());
+ }
+
_logger->eventEnd(setupEvent);
#if !defined(DETAILED_EVENT_LOGGING)
_logger->eventBegin(computeEvent);
@@ -328,16 +347,6 @@
_logger->eventBegin(restrictEvent);
#endif
- // Get the dkSelector
- if (_dkSelector) {
- const ALE::Obj<RealUniformSection}& dkSelSection = _dkSelector->dk();
- assert(dkSelSection);
- } else { // should never be here
- std::ostringstream msg;
- msg << "No Dynamic Kinematic Selector available.";
- throw std::runtime_error(msg.str());
- }
-
// Common needs
// Get area associated with fault vertex.
@@ -374,9 +383,8 @@
dispTIncrSection->restrictPoint(v_lagrange);
assert(dispTIncrVertexL);
- if (dkSelSection[iVertex] > 0.5) {
+ if (dkSelSection[iVertex] > 0.5) { // Kinematic Case
- // Kinematic Case
// Get relative dislplacement at fault vertex.
assert(spaceDim == dispRelSection->getFiberDimension(v_fault));
const PylithScalar* dispRelVertex = dispRelSection->restrictPoint(v_fault);
@@ -419,9 +427,8 @@
dispTpdtVertexL[iDim] = dispTVertexL[iDim] + dispTIncrVertexL[iDim];
} // for
- if (dkSelSection[iVertex]>0.5) {
+ if (dkSelSection[iVertex]>0.5) { // Kinematic Case
- // Kinematic Case
residualVertexN = areaVertex * dispTpdtVertexL;
residualVertexP = -residualVertexN;
@@ -483,9 +490,8 @@
residualSection->getFiberDimension(v_positive));
residualSection->updateAddPoint(v_positive, &residualVertexP[0]);
- if (dkSelSection[iVertex]) {
+ if (dkSelSection[iVertex]>0.5) { // Kinematic Case
- // Kinematic Case
assert(residualVertexL.size() ==
residualSection->getFiberDimension(v_lagrange));
residualSection->updateAddPoint(v_lagrange, &residualVertexL[0]);
@@ -663,9 +669,15 @@
scalar_array tractionTpdtVertex(spaceDim);
scalar_array dDispRelVertex(spaceDim);
- // Get sections
- const ALE:Obj<RealSection>& dkSelSection = _dkSelector->dk();
- assert(dkSelSection);
+ // Get the dkSelector
+ if (_dkSelector) {
+ const ALE::Obj<RealSection>& dkSelSection = _dkSelector->dk(_faultMesh);
+ assert(dkSelSection);
+ } else { // should never be here
+ std::ostringstream msg;
+ msg << "No Dynamic Kinematic Selector available.";
+ throw std::runtime_error(msg.str());
+ }
scalar_array slipTpdtVertex(spaceDim);
const ALE::Obj<RealSection>& dispRelSection =
@@ -728,7 +740,7 @@
const int numVertices = _cohesiveVertices.size();
for (int iVertex=0; iVertex < numVertices; ++iVertex) {
- if (dkSelSection[iVertex]<0.5)
+ if (dkSelSection[iVertex]<0.5) // Dynamic Case
continue;
const int v_lagrange = _cohesiveVertices[iVertex].lagrange;
Modified: short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/faults/FaultCohesiveDynKin.hh
===================================================================
--- short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/faults/FaultCohesiveDynKin.hh 2013-02-05 13:15:49 UTC (rev 21335)
+++ short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/faults/FaultCohesiveDynKin.hh 2013-02-05 21:20:18 UTC (rev 21336)
@@ -31,13 +31,13 @@
#include "pylith/friction/frictionfwd.hh" // HOLDSA Friction model
#include "pylith/utils/petscfwd.h" // HASA PetscKSP
-// FaultCohesiveDyn -----------------------------------------------------
+// FaultCohesiveDynKin --------------------------------------------------
/**
* @brief C++ implementation for a fault surface with spontaneous
* (dynamic) slip implemented with cohesive cells.
*
*/
-class pylith::faults::FaultCohesiveDynKin : public FaultCohesiveLagrange
+class pylith::faults::FaultCohesiveDynKin : public FaultCohesiveLagrange
{ // class FaultCohesiveDynKin
// PUBLIC METHODS /////////////////////////////////////////////////////
@@ -64,7 +64,7 @@
*
* @param dksel Spatial (and temporal, next version) variations of dk Selector
*/
- void dkSelector(dkSelector* dksel);
+ void dkSelector(DKSelector* dksel);
/** Set the friction (constitutive) model.
*
@@ -285,9 +285,16 @@
const scalar_array& tractionTpdt,
const bool iterating =true);
+ // PRIVATE TYPEDEFS ///////////////////////////////////////////////////
+private :
+
+ typedef std::map<std::string, EqKinSrc*> srcs_type;
+
// PRIVATE MEMBERS ////////////////////////////////////////////////////
private :
+ srcs_type _eqSrcs; ///< Array of kinematic earthquake sources.
+
/// Flag to control whether to continue to impose initial tractions
/// on the fault surface when it opens. If it is a frictional
/// contact, then it should be a free surface.
@@ -300,7 +307,7 @@
TractPerturbation* _tractPerturbation;
/// To get the dynamic kinematic selector.
- dkSelector* _dkSelector;
+ DKSelector* _dkSelector;
/// To identify constitutive model
friction::FrictionModel* _friction;
@@ -314,14 +321,14 @@
private :
/// Not implemented
- FaultCohesiveDyn(const FaultCohesiveDyn&);
+ FaultCohesiveDynKin(const FaultCohesiveDynKin&);
/// Not implemented
- const FaultCohesiveDyn& operator=(const FaultCohesiveDyn&);
+ const FaultCohesiveDynKin& operator=(const FaultCohesiveDynKin&);
-}; // class FaultCohesiveDyn
+}; // class FaultCohesiveDynKin
-#endif // pylith_faults_faultcohesivedyn_hh
+#endif // pylith_faults_faultcohesivedynkin_hh
// End of file
Modified: short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/faults/Makefile.am
===================================================================
--- short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/faults/Makefile.am 2013-02-05 13:15:49 UTC (rev 21335)
+++ short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/faults/Makefile.am 2013-02-05 21:20:18 UTC (rev 21336)
@@ -34,6 +34,7 @@
TimeHistorySlipFn.hh \
TimeHistorySlipFn.icc \
TractPerturbation.hh \
+ DKSelector.hh \
Fault.hh \
Fault.icc \
FaultCohesive.hh \
@@ -43,7 +44,6 @@
FaultCohesiveDyn.hh \
FaultCohesiveKin.hh \
FaultCohesiveDynKin.hh \
- dkSelector.hh \
FaultCohesiveImpulses.hh \
faultsfwd.hh
Modified: short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/faults/dkSelector.cc
===================================================================
--- short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/faults/dkSelector.cc 2013-02-05 13:15:49 UTC (rev 21335)
+++ short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/faults/dkSelector.cc 2013-02-05 21:20:18 UTC (rev 21336)
@@ -19,7 +19,7 @@
#include <portinfo>
-#include "dkSelector.hh" // implementation of object methods
+#include "DKSelector.hh" // implementation of object methods
#include "pylith/topology/SubMesh.hh" // USES SubMesh
#include "pylith/topology/Fields.hh" // USES Fields
@@ -37,17 +37,18 @@
typedef pylith::topology::SubMesh::SieveMesh SieveMesh;
typedef pylith::topology::SubMesh::SieveMesh::label_sequence label_sequence;
typedef pylith::topology::SubMesh::RealSection RealSection;
+typedef pylith::topology::SubMesh::RealUniformSection RealUniformSection;
// ----------------------------------------------------------------------
// Default constructor.
-pylith::faults::dkSelector::dkSelector(void) :
- _dbdksel(0),
+pylith::faults::DKSelector::DKSelector(void) :
+ _dbdksel(0)
{ // constructor
} // constructor
// ----------------------------------------------------------------------
// Destructor.
-pylith::faults::dkSelector::~dkSelector(void)
+pylith::faults::DKSelector::~DKSelector(void)
{ // destructor
deallocate();
} // destructor
@@ -55,7 +56,7 @@
// ----------------------------------------------------------------------
// Deallocate PETSc and local data structures.
void
-pylith::faults::dkSelector::deallocate(void)
+pylith::faults::DKSelector::deallocate(void)
{ // deallocate
_dbdksel = 0;
} // deallocate
@@ -63,7 +64,7 @@
// ----------------------------------------------------------------------
// Initialize dkselector
void
-pylith::faults::dkSelector::initialize(
+pylith::faults::DKSelector::initialize(
const topology::SubMesh& faultMesh,
const spatialdata::units::Nondimensional& normalizer)
{ // initialize
@@ -88,16 +89,16 @@
ALE::MemoryLogger& logger = ALE::MemoryLogger::singleton();
logger.stagePush("Fault");
- // Create a parameter to go fetch into the spatial data (DKsel is a par array between 0 and 1; >0.5 is kinematic, <=0.5 is dynamic)
- delete _parameters; _parameters = new topology::Fields<topology::Field<topology::SubMesh> >(faultMesh);
- assert(0 != _parameters);
+ // Use parameter to go fetch into the spatial data (DKSel is a par array between 0 and 1; >0.5 is kinematic, <=0.5 is dynamic)
+ delete _parameters;
+ _parameters = new topology::FieldsNew<topology::SubMesh>(faultMesh);
_parameters->add("Dynamic Kinematic Selector","dynamic_kinematic_selector");
topology::Field<topology::SubMesh>& DKSel = _parameters->get("Dynamic Kinematic Selector");
DKSel.newSection(vertices, spaceDim);
- DKsel.allocate();
- DKsel.vectorFieldType(topology::FieldBase::VECTOR);
- const ALE::Obj<RealSection>& DKselSection = DKsel.section();
- assert(!DKselSection.isNull());
+ DKSel.allocate();
+ DKSel.vectorFieldType(topology::FieldBase::VECTOR);
+ const ALE::Obj<RealSection>& DKSelSection = DKSel.section();
+ assert(!DKSelSection.isNull());
logger.stagePop();
@@ -121,7 +122,7 @@
normalizer.dimensionalize(&vCoordsGlobal[0], vCoordsGlobal.size(),
lengthScale);
- int err = _dbdksel->query(&_dkselVertex[0], _dkSelVertex.size(),
+ int err = _dbdksel->query(&_dkselVertex[0], _dkselVertex.size(),
&vCoordsGlobal[0], vCoordsGlobal.size(), cs);
if (err) {
std::ostringstream msg;
@@ -132,7 +133,7 @@
throw std::runtime_error(msg.str());
} // if
- DKselSection->updatePoint(*v_iter, &_dkselVertex[0]);
+ DKSelSection->updatePoint(*v_iter, &_dkselVertex[0]);
} // for
// Close databases
@@ -140,42 +141,53 @@
} // initialize
// ----------------------------------------------------------------------
-// Get dynamic kinematic selector field on fault surface
+// Get dynamic kinematic selector field on fault surface (time will be the argument in the future)
void
-pylith::faults::dkSelector::dk(topology::Field<topology::SubMesh>* dk)
+pylith::faults::DKSelector::dk(const topology::Field<topology::SubMesh>& dk)
{ // dk
- assert(0 != dk);
assert(0 != _parameters);
- // Get vertices in fault mesh
- const ALE::Obj<SieveMesh>& sieveMesh = dk->mesh().sieveMesh();
+ // Get fault mesh
+ const ALE::Obj<SieveMesh>& sieveMesh = dk.sieveMesh();
assert(!sieveMesh.isNull());
const ALE::Obj<label_sequence>& vertices = sieveMesh->depthStratum(0);
assert(!vertices.isNull());
const label_sequence::iterator verticesBegin = vertices->begin();
const label_sequence::iterator verticesEnd = vertices->end();
- // Get sections
- const topology::Field<topology::SubMesh>& DKSel =
- _parameters->get("Dynamic Kinematic Selector");
- const ALE::Obj<RealSection>& DKselSection = DKsel.section();
- assert(!DKselSection.isNull());
+ // Get the spatial coordinate and the dimension of the problem
+ const spatialdata::geocoords::CoordSys* cs = dk.coordsys();
+ assert(0 != cs);
+ const int spaceDim = cs->spaceDim();
+ // Build the section
+ const topology::Field<topology::SubMesh>& DKSel = _parameters->get("Dynamic Kinematic Selector");
+ const ALE::Obj<RealSection>& DKSelSection = DKSel.section();
+ assert(!DKSelSection.isNull());
+ const ALE::Obj<RealSection>& dkSection = dk->section()
+
+ // Iterate over vertices
for (label_sequence::iterator v_iter=verticesBegin;
v_iter != verticesEnd;
++v_iter) {
- DKselSection->restrictPoint(*v_iter, &_dkselVertex[0],
- _dkselVertex.size());
- // if dkselVertex is under 0.5, the vertex is kinematically controled
- if ( _dkselVertex < 0.5 ){
- _dkselVertex = 0.0;
- else {
- _dkselVertex = 1.0;
+
+ // take the good vertex in DKSelSection, put it in _dkselvv
+ DKSelSection->restrictPoint(*v_iter, &_dkselvv,1);
+ // if _dkselvv is under 0.5, the vertex is kinematically controled (put the time condition here)
+ if ( _dkselvv< 0.5 ){
+ _dkselvv = 0.0;
+ } else {
+ _dkselvv = 1.0;
}
- DKselSection->updateAddPoint(*v_iter, &_dkselVertex[0]);
+ // Put that thing in dkSection
+ dkSection->updatePoint(*v_iter, &_dkselvv);
+
} // for
PetscLogFlops(vertices->size());
-} // slip
+ return dkSection;
+
+} // dk
+
// End of file
Modified: short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/faults/dkSelector.hh
===================================================================
--- short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/faults/dkSelector.hh 2013-02-05 13:15:49 UTC (rev 21335)
+++ short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/faults/dkSelector.hh 2013-02-05 21:20:18 UTC (rev 21336)
@@ -16,7 +16,7 @@
// ----------------------------------------------------------------------
//
-/** @file libsrc/faults/dkSelector.hh
+/** @file libsrc/faults/DKSelector.hh
*
* @brief C++ implementation of the dynamic kinematic selector
*/
@@ -25,29 +25,39 @@
#define pylith_faults_dkselector_hh
// Include directives ---------------------------------------------------
+#include "faultsfwd.hh" // forward declaration
+
+
#include "pylith/topology/topologyfwd.hh" // USES Fields<Field<SubMesh> >
-
#include "spatialdata/spatialdb/spatialdbfwd.hh" // USES SpatialDB
+#include "spatialdata/units/unitsfwd.hh" // USES Nondimensional
+#include "pylith/topology/SubMesh.hh" // USES Mesh
+
#include "pylith/utils/array.hh" // HASA scalar_array
-// dkSelector -----------------------------------------------------------
+// DKSelector -----------------------------------------------------------
/** @brief Dynamic-Kinematic Selector
*
- * If value is under .5 the fault vertex has its slip value controlled by EQsrc
+ * If value is over .5 the fault vertex has its slip value controlled by EQsrc
*
*/
-class pylith::faults::dkSelector
-{ // class dkSelector
+// ----------------------------------------------------------------------
+typedef pylith::topology::SubMesh::RealUniformSection RealUniformSection;
+
+// ----------------------------------------------------------------------
+class pylith::faults::DKSelector
+{ // class DKSelector
+
// PUBLIC METHODS ///////////////////////////////////////////////////////
public :
/// Default constructor.
- dkSelector(void);
+ DKSelector(void);
/// Destructor.
- ~dkSelector(void);
+ ~DKSelector(void);
/// Deallocate PETSc and local data structures.
virtual
@@ -69,28 +79,32 @@
/** Get dk on fault surface (time will be implemented through this guy)
*
- * @param dk DK selector field over fault surface
- *
- * @returns dk for the time
+ * @params faultMesh Finite-element mesh of fault.
+ *
+ * @returns a section for the given time (future)
*/
- void dk(topology::Field<topology::SubMesh>* const dkField);
+ void dk(const topology::Field<topology::SubMesh>& dk);
// NOT IMPLEMENTED //////////////////////////////////////////////////////
private :
- dkSelector(const dkSelector&); ///< Not implemented
- const dkSelector& operator=(const dkSelector&); ///< Not implemented
+ DKSelector(const DKSelector&); ///< Not implemented
+ const DKSelector& operator=(const DKSelector&); ///< Not implemented
// PRIVATE MEMBERS //////////////////////////////////////////////////////
private :
- PylithScalar _dkselVertex; ///< Slip time at a vertex.
+ scalar_array _dkselVertex; ///< dk sel at vertex.
+ PylithScalar _dkselvv; ///< used to check
- /// Spatial database for slip rate.
+ /// Spatial database for dk selector.
spatialdata::spatialdb::SpatialDB* _dbdksel;
-}; // class dkSelector
+ /// Parameters for perturbations.
+ topology::FieldsNew<topology::SubMesh>* _parameters;
+}; // class DKSelector
+
#endif // pylith_faults_dkselector_hh
Modified: short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/faults/faultsfwd.hh
===================================================================
--- short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/faults/faultsfwd.hh 2013-02-05 13:15:49 UTC (rev 21335)
+++ short/3D/PyLith/branches/v1.8-mixedfault/libsrc/pylith/faults/faultsfwd.hh 2013-02-05 21:20:18 UTC (rev 21336)
@@ -37,6 +37,7 @@
class FaultCohesiveLagrange;
class FaultCohesiveKin;
class FaultCohesiveDyn;
+ class FaultCohesiveDynKin;
class FaultCohesiveImpulses;
class FaultCohesiveTract;
@@ -50,6 +51,7 @@
class Nucleator;
class TractPerturbation;
+ class DKSelector;
class StaticPerturbation;
class SpaceTimePerturbation;
Modified: short/3D/PyLith/branches/v1.8-mixedfault/modulesrc/faults/Makefile.am
===================================================================
--- short/3D/PyLith/branches/v1.8-mixedfault/modulesrc/faults/Makefile.am 2013-02-05 13:15:49 UTC (rev 21335)
+++ short/3D/PyLith/branches/v1.8-mixedfault/modulesrc/faults/Makefile.am 2013-02-05 21:20:18 UTC (rev 21336)
@@ -38,6 +38,8 @@
FaultCohesiveLagrange.i \
FaultCohesiveKin.i \
FaultCohesiveDyn.i \
+ FaultCohesiveDynKin.i \
+ DKSelector.i \
FaultCohesiveImpulses.i \
FaultCohesiveTract.i \
../topology/SubMesh.i \
Modified: short/3D/PyLith/branches/v1.8-mixedfault/modulesrc/faults/dkSelector.i
===================================================================
--- short/3D/PyLith/branches/v1.8-mixedfault/modulesrc/faults/dkSelector.i 2013-02-05 13:15:49 UTC (rev 21335)
+++ short/3D/PyLith/branches/v1.8-mixedfault/modulesrc/faults/dkSelector.i 2013-02-05 21:20:18 UTC (rev 21336)
@@ -24,8 +24,8 @@
namespace pylith {
namespace faults {
- class dkSelector
- { // class dkSelector
+ class DKSelector
+ { // class DKSelector
// PUBLIC METHODS /////////////////////////////////////////////////
public :
@@ -62,7 +62,7 @@
*/
void dk(pylith::topology::Field<pylith::topology::SubMesh>* const dkField);
- }; // class dkSelector
+ }; // class DKSelector
} // faults
} // pylith
Modified: short/3D/PyLith/branches/v1.8-mixedfault/pylith/Makefile.am
===================================================================
--- short/3D/PyLith/branches/v1.8-mixedfault/pylith/Makefile.am 2013-02-05 13:15:49 UTC (rev 21335)
+++ short/3D/PyLith/branches/v1.8-mixedfault/pylith/Makefile.am 2013-02-05 21:20:18 UTC (rev 21336)
@@ -48,7 +48,7 @@
faults/FaultCohesiveKin.py \
faults/FaultCohesiveDyn.py \
faults/FaultCohesiveDynKin.py \
- faults/dkSelector.py \
+ faults/DKSelector.py \
faults/FaultCohesiveImpulses.py \
faults/FaultCohesiveTract.py \
feassemble/__init__.py \
@@ -115,6 +115,7 @@
meshio/OutputSoln.py \
meshio/OutputFaultKin.py \
meshio/OutputFaultDyn.py \
+ meshio/OutputFaultDynKin.py \
meshio/OutputFaultImpulses.py \
meshio/OutputMatElastic.py \
meshio/OutputNeumann.py \
Modified: short/3D/PyLith/branches/v1.8-mixedfault/pylith/faults/__init__.py
===================================================================
--- short/3D/PyLith/branches/v1.8-mixedfault/pylith/faults/__init__.py 2013-02-05 13:15:49 UTC (rev 21335)
+++ short/3D/PyLith/branches/v1.8-mixedfault/pylith/faults/__init__.py 2013-02-05 21:20:18 UTC (rev 21336)
@@ -27,6 +27,7 @@
'FaultCohesive',
'FaultCohesiveKin',
'FaultCohesiveDyn',
+ 'FaultCohesiveDynKin',
'SlipTimeFn',
'SingleRupture',
'StepSlipFn',
Modified: short/3D/PyLith/branches/v1.8-mixedfault/pylith/faults/dkSelector.py
===================================================================
--- short/3D/PyLith/branches/v1.8-mixedfault/pylith/faults/dkSelector.py 2013-02-05 13:15:49 UTC (rev 21335)
+++ short/3D/PyLith/branches/v1.8-mixedfault/pylith/faults/dkSelector.py 2013-02-05 21:20:18 UTC (rev 21336)
@@ -17,15 +17,15 @@
# ----------------------------------------------------------------------
#
-## @file pylith/faults/dkSelector.py
+## @file pylith/faults/DKSelector.py
##
## @brief Python object for the dynamic-kinematic selector
##
-from faults import dkSelector as ModuledkSelector
+from faults import DKSelector as ModuleDKSelector
-# dkSelector class
-class dkSelector(ModuledkSelector):
+# DKSelector class
+class DKSelector(ModuleDKSelector):
"""
Python object for a dynamic-kinematic selector
@@ -56,7 +56,7 @@
"""
Constructor.
"""
- ModuledkSelector.__init__(self)
+ ModuleDKSelector.__init__(self)
self._loggingPrefix = "DKsel "
return
@@ -67,7 +67,7 @@
"""
Setup members using inventory.
"""
- ModuledkSelector.dbDKSel(self, self.inventory.dbDKSel)
+ ModuleDKSelector.dbDKSel(self, self.inventory.dbDKSel)
return
# End of file
More information about the CIG-COMMITS
mailing list