[cig-commits] r20643 - short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials
brad at geodynamics.org
brad at geodynamics.org
Tue Aug 28 17:04:48 PDT 2012
Author: brad
Date: 2012-08-28 17:04:47 -0700 (Tue, 28 Aug 2012)
New Revision: 20643
Modified:
short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/DruckerPrager3D.i
short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/DruckerPragerPlaneStrain.i
short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticIsotropic3D.i
short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticMaterial.i
short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticPlaneStrain.i
short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticPlaneStress.i
short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticStrain1D.i
short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticStress1D.i
short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellIsotropic3D.i
short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellPlaneStrain.i
short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellQpQsIsotropic3D.i
short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/MaxwellIsotropic3D.i
short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/MaxwellPlaneStrain.i
short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/PowerLaw3D.i
short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/PowerLawPlaneStrain.i
Log:
Added missing methods to SWIG materials bindings.
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/DruckerPrager3D.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/DruckerPrager3D.i 2012-08-28 21:27:07 UTC (rev 20642)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/DruckerPrager3D.i 2012-08-29 00:04:47 UTC (rev 20643)
@@ -213,6 +213,22 @@
const PylithScalar* stateVars,
const int numStateVars) const;
+ /** Get stable time step for explicit time integration.
+ *
+ * @param properties Properties at location.
+ * @param numProperties Number of properties.
+ * @param stateVars State variables at location.
+ * @param numStateVars Number of state variables.
+ * @param minCellWidth Minimum width across cell.
+ *
+ * @returns Time step
+ */
+ PylithScalar _stableTimeStepExplicit(const PylithScalar* properties,
+ const int numProperties,
+ const PylithScalar* stateVars,
+ const int numStateVars,
+ const double minCellWidth) const;
+
/** Update state variables (for next time step).
*
* @param stateVars State variables at location.
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/DruckerPragerPlaneStrain.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/DruckerPragerPlaneStrain.i 2012-08-28 21:27:07 UTC (rev 20642)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/DruckerPragerPlaneStrain.i 2012-08-29 00:04:47 UTC (rev 20643)
@@ -213,6 +213,22 @@
const PylithScalar* stateVars,
const int numStateVars) const;
+ /** Get stable time step for explicit time integration.
+ *
+ * @param properties Properties at location.
+ * @param numProperties Number of properties.
+ * @param stateVars State variables at location.
+ * @param numStateVars Number of state variables.
+ * @param minCellWidth Minimum width across cell.
+ *
+ * @returns Time step
+ */
+ PylithScalar _stableTimeStepExplicit(const PylithScalar* properties,
+ const int numProperties,
+ const PylithScalar* stateVars,
+ const int numStateVars,
+ const double minCellWidth) const;
+
/** Update state variables (for next time step).
*
* @param stateVars State variables at location.
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticIsotropic3D.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticIsotropic3D.i 2012-08-28 21:27:07 UTC (rev 20642)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticIsotropic3D.i 2012-08-29 00:04:47 UTC (rev 20643)
@@ -165,6 +165,22 @@
const PylithScalar* stateVars,
const int numStateVars) const;
+ /** Get stable time step for explicit time integration.
+ *
+ * @param properties Properties at location.
+ * @param numProperties Number of properties.
+ * @param stateVars State variables at location.
+ * @param numStateVars Number of state variables.
+ * @param minCellWidth Minimum width across cell.
+ *
+ * @returns Time step
+ */
+ PylithScalar _stableTimeStepExplicit(const PylithScalar* properties,
+ const int numProperties,
+ const PylithScalar* stateVars,
+ const int numStateVars,
+ const double minCellWidth) const;
+
}; // class ElasticIsotropic3D
} // materials
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticMaterial.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticMaterial.i 2012-08-28 21:27:07 UTC (rev 20642)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticMaterial.i 2012-08-29 00:04:47 UTC (rev 20643)
@@ -81,6 +81,21 @@
virtual
PylithScalar stableTimeStepImplicit(const pylith::topology::Mesh& mesh);
+ /** Get stable time step for explicit time integration.
+ *
+ * @pre Must call retrievePropsAndVars for cell before calling
+ * stableTimeStep().
+ *
+ * Default is MAXFLOAT (or 1.0e+30 if MAXFLOAT is not defined in math.h).
+ *
+ * @param mesh Finite-element mesh.
+ * @param quadrature Quadrature for finite-element integration
+ * @returns Time step
+ */
+ virtual
+ PylithScalar stableTimeStepExplicit(const pylith::topology::Mesh& mesh,
+ pylith::feassemble::Quadrature<pylith::topology::Mesh>* quadrature);
+
/** Set whether elastic or inelastic constitutive relations are used.
*
* @param flag True to use elastic, false to use inelastic.
@@ -190,6 +205,23 @@
const PylithScalar* stateVars,
const int numStateVars) const = 0;
+ /** Get stable time step for explicit time integration.
+ *
+ * @param properties Properties at location.
+ * @param numProperties Number of properties.
+ * @param stateVars State variables at location.
+ * @param numStateVars Number of state variables.
+ * @param minCellWidth Minimum width across cell.
+ *
+ * @returns Time step
+ */
+ virtual
+ PylithScalar _stableTimeStepExplicit(const PylithScalar* properties,
+ const int numProperties,
+ const PylithScalar* stateVars,
+ const int numStateVars,
+ const double minCellWidth) const = 0;
+
}; // class ElasticMaterial
} // materials
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticPlaneStrain.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticPlaneStrain.i 2012-08-28 21:27:07 UTC (rev 20642)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticPlaneStrain.i 2012-08-29 00:04:47 UTC (rev 20643)
@@ -165,6 +165,22 @@
const PylithScalar* stateVars,
const int numStateVars) const;
+ /** Get stable time step for explicit time integration.
+ *
+ * @param properties Properties at location.
+ * @param numProperties Number of properties.
+ * @param stateVars State variables at location.
+ * @param numStateVars Number of state variables.
+ * @param minCellWidth Minimum width across cell.
+ *
+ * @returns Time step
+ */
+ PylithScalar _stableTimeStepExplicit(const PylithScalar* properties,
+ const int numProperties,
+ const PylithScalar* stateVars,
+ const int numStateVars,
+ const double minCellWidth) const;
+
}; // class ElasticPlaneStrain
} // materials
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticPlaneStress.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticPlaneStress.i 2012-08-28 21:27:07 UTC (rev 20642)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticPlaneStress.i 2012-08-29 00:04:47 UTC (rev 20643)
@@ -165,6 +165,22 @@
const PylithScalar* stateVars,
const int numStateVars) const;
+ /** Get stable time step for explicit time integration.
+ *
+ * @param properties Properties at location.
+ * @param numProperties Number of properties.
+ * @param stateVars State variables at location.
+ * @param numStateVars Number of state variables.
+ * @param minCellWidth Minimum width across cell.
+ *
+ * @returns Time step
+ */
+ PylithScalar _stableTimeStepExplicit(const PylithScalar* properties,
+ const int numProperties,
+ const PylithScalar* stateVars,
+ const int numStateVars,
+ const double minCellWidth) const;
+
}; // class ElasticPlaneStress
} // materials
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticStrain1D.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticStrain1D.i 2012-08-28 21:27:07 UTC (rev 20642)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticStrain1D.i 2012-08-29 00:04:47 UTC (rev 20643)
@@ -165,6 +165,22 @@
const PylithScalar* stateVars,
const int numStateVars) const;
+ /** Get stable time step for explicit time integration.
+ *
+ * @param properties Properties at location.
+ * @param numProperties Number of properties.
+ * @param stateVars State variables at location.
+ * @param numStateVars Number of state variables.
+ * @param minCellWidth Minimum width across cell.
+ *
+ * @returns Time step
+ */
+ PylithScalar _stableTimeStepExplicit(const PylithScalar* properties,
+ const int numProperties,
+ const PylithScalar* stateVars,
+ const int numStateVars,
+ const double minCellWidth) const;
+
}; // class ElasticStrain1D
} // materials
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticStress1D.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticStress1D.i 2012-08-28 21:27:07 UTC (rev 20642)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticStress1D.i 2012-08-29 00:04:47 UTC (rev 20643)
@@ -165,6 +165,22 @@
const PylithScalar* stateVars,
const int numStateVars) const;
+ /** Get stable time step for explicit time integration.
+ *
+ * @param properties Properties at location.
+ * @param numProperties Number of properties.
+ * @param stateVars State variables at location.
+ * @param numStateVars Number of state variables.
+ * @param minCellWidth Minimum width across cell.
+ *
+ * @returns Time step
+ */
+ PylithScalar _stableTimeStepExplicit(const PylithScalar* properties,
+ const int numProperties,
+ const PylithScalar* stateVars,
+ const int numStateVars,
+ const double minCellWidth) const;
+
}; // class ElasticStress1D
} // materials
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellIsotropic3D.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellIsotropic3D.i 2012-08-28 21:27:07 UTC (rev 20642)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellIsotropic3D.i 2012-08-29 00:04:47 UTC (rev 20643)
@@ -200,6 +200,22 @@
const PylithScalar* stateVars,
const int numStateVars) const;
+ /** Get stable time step for explicit time integration.
+ *
+ * @param properties Properties at location.
+ * @param numProperties Number of properties.
+ * @param stateVars State variables at location.
+ * @param numStateVars Number of state variables.
+ * @param minCellWidth Minimum width across cell.
+ *
+ * @returns Time step
+ */
+ PylithScalar _stableTimeStepExplicit(const PylithScalar* properties,
+ const int numProperties,
+ const PylithScalar* stateVars,
+ const int numStateVars,
+ const double minCellWidth) const;
+
}; // class GenMaxwellIsotropic3D
} // materials
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellPlaneStrain.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellPlaneStrain.i 2012-08-28 21:27:07 UTC (rev 20642)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellPlaneStrain.i 2012-08-29 00:04:47 UTC (rev 20643)
@@ -200,6 +200,22 @@
const PylithScalar* stateVars,
const int numStateVars) const;
+ /** Get stable time step for explicit time integration.
+ *
+ * @param properties Properties at location.
+ * @param numProperties Number of properties.
+ * @param stateVars State variables at location.
+ * @param numStateVars Number of state variables.
+ * @param minCellWidth Minimum width across cell.
+ *
+ * @returns Time step
+ */
+ PylithScalar _stableTimeStepExplicit(const PylithScalar* properties,
+ const int numProperties,
+ const PylithScalar* stateVars,
+ const int numStateVars,
+ const double minCellWidth) const;
+
}; // class GenMaxwellPlaneStrain
} // materials
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellQpQsIsotropic3D.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellQpQsIsotropic3D.i 2012-08-28 21:27:07 UTC (rev 20642)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellQpQsIsotropic3D.i 2012-08-29 00:04:47 UTC (rev 20643)
@@ -200,6 +200,22 @@
const PylithScalar* stateVars,
const int numStateVars) const;
+ /** Get stable time step for explicit time integration.
+ *
+ * @param properties Properties at location.
+ * @param numProperties Number of properties.
+ * @param stateVars State variables at location.
+ * @param numStateVars Number of state variables.
+ * @param minCellWidth Minimum width across cell.
+ *
+ * @returns Time step
+ */
+ PylithScalar _stableTimeStepExplicit(const PylithScalar* properties,
+ const int numProperties,
+ const PylithScalar* stateVars,
+ const int numStateVars,
+ const double minCellWidth) const;
+
}; // class GenMaxwellQpQsIsotropic3D
} // materials
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/MaxwellIsotropic3D.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/MaxwellIsotropic3D.i 2012-08-28 21:27:07 UTC (rev 20642)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/MaxwellIsotropic3D.i 2012-08-29 00:04:47 UTC (rev 20643)
@@ -202,6 +202,22 @@
const PylithScalar* stateVars,
const int numStateVars) const;
+ /** Get stable time step for explicit time integration.
+ *
+ * @param properties Properties at location.
+ * @param numProperties Number of properties.
+ * @param stateVars State variables at location.
+ * @param numStateVars Number of state variables.
+ * @param minCellWidth Minimum width across cell.
+ *
+ * @returns Time step
+ */
+ PylithScalar _stableTimeStepExplicit(const PylithScalar* properties,
+ const int numProperties,
+ const PylithScalar* stateVars,
+ const int numStateVars,
+ const double minCellWidth) const;
+
}; // class MaxwellIsotropic3D
} // materials
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/MaxwellPlaneStrain.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/MaxwellPlaneStrain.i 2012-08-28 21:27:07 UTC (rev 20642)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/MaxwellPlaneStrain.i 2012-08-29 00:04:47 UTC (rev 20643)
@@ -202,6 +202,22 @@
const PylithScalar* stateVars,
const int numStateVars) const;
+ /** Get stable time step for explicit time integration.
+ *
+ * @param properties Properties at location.
+ * @param numProperties Number of properties.
+ * @param stateVars State variables at location.
+ * @param numStateVars Number of state variables.
+ * @param minCellWidth Minimum width across cell.
+ *
+ * @returns Time step
+ */
+ PylithScalar _stableTimeStepExplicit(const PylithScalar* properties,
+ const int numProperties,
+ const PylithScalar* stateVars,
+ const int numStateVars,
+ const double minCellWidth) const;
+
}; // class MaxwellPlaneStrain
} // materials
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/PowerLaw3D.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/PowerLaw3D.i 2012-08-28 21:27:07 UTC (rev 20642)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/PowerLaw3D.i 2012-08-29 00:04:47 UTC (rev 20643)
@@ -192,6 +192,22 @@
const PylithScalar* stateVars,
const int numStateVars) const;
+ /** Get stable time step for explicit time integration.
+ *
+ * @param properties Properties at location.
+ * @param numProperties Number of properties.
+ * @param stateVars State variables at location.
+ * @param numStateVars Number of state variables.
+ * @param minCellWidth Minimum width across cell.
+ *
+ * @returns Time step
+ */
+ PylithScalar _stableTimeStepExplicit(const PylithScalar* properties,
+ const int numProperties,
+ const PylithScalar* stateVars,
+ const int numStateVars,
+ const double minCellWidth) const;
+
/** Update state variables (for next time step).
*
* @param stateVars State variables at location.
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/PowerLawPlaneStrain.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/PowerLawPlaneStrain.i 2012-08-28 21:27:07 UTC (rev 20642)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/PowerLawPlaneStrain.i 2012-08-29 00:04:47 UTC (rev 20643)
@@ -192,6 +192,22 @@
const PylithScalar* stateVars,
const int numStateVars) const;
+ /** Get stable time step for explicit time integration.
+ *
+ * @param properties Properties at location.
+ * @param numProperties Number of properties.
+ * @param stateVars State variables at location.
+ * @param numStateVars Number of state variables.
+ * @param minCellWidth Minimum width across cell.
+ *
+ * @returns Time step
+ */
+ PylithScalar _stableTimeStepExplicit(const PylithScalar* properties,
+ const int numProperties,
+ const PylithScalar* stateVars,
+ const int numStateVars,
+ const double minCellWidth) const;
+
/** Update state variables (for next time step).
*
* @param stateVars State variables at location.
More information about the CIG-COMMITS
mailing list