RS2Scripting 11.23.0.dev4__tar.gz → 11.23.0rc1__tar.gz

{RS2Scripting-11.23.0.dev4/src/RS2Scripting.egg-info → RS2Scripting-11.23.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: RS2Scripting
-Version: 11.23.0.dev4
+Version: 11.23.0rc1
 Summary: Client library for interacting with RS2 through python
 Author: Rocscience
 License: MIT License
@@ -13,7 +13,7 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: License.txt
-Requires-Dist: rsmessages==0.0.2.dev1
+Requires-Dist: rsmessages==0.0.2rc1
 
 ## Introduction 
 This project is a library that can be used to interact with RS2 through python.  

{RS2Scripting-11.23.0.dev4 → RS2Scripting-11.23.0rc1}/pyproject.toml

@@ -4,9 +4,9 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "RS2Scripting"
-version = "11.23.0.dev4"
+version = "11.23.0rc1"
 dependencies = [
-  "rsmessages == 0.0.2.dev1"
+  "rsmessages == 0.0.2rc1"
 ]
 authors = [
   { name="Rocscience"},

{RS2Scripting-11.23.0.dev4 → RS2Scripting-11.23.0rc1/src/RS2Scripting.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: RS2Scripting
-Version: 11.23.0.dev4
+Version: 11.23.0rc1
 Summary: Client library for interacting with RS2 through python
 Author: Rocscience
 License: MIT License
@@ -13,7 +13,7 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: License.txt
-Requires-Dist: rsmessages==0.0.2.dev1
+Requires-Dist: rsmessages==0.0.2rc1
 
 ## Introduction 
 This project is a library that can be used to interact with RS2 through python.  

{RS2Scripting-11.23.0.dev4 → RS2Scripting-11.23.0rc1}/src/RS2Scripting.egg-info/SOURCES.txt

@@ -6,26 +6,29 @@ src/RS2Scripting.egg-info/SOURCES.txt
 src/RS2Scripting.egg-info/dependency_links.txt
 src/RS2Scripting.egg-info/requires.txt
 src/RS2Scripting.egg-info/top_level.txt
+src/rs2/BaseModel.py
+src/rs2/Units.py
 src/rs2/__init__.py
 src/rs2/_common/Client.py
 src/rs2/_common/ProxyObject.py
-src/rs2/_common/Units.py
 src/rs2/_common/__init__.py
 src/rs2/_common/documentProxy.py
-src/rs2/interpreter/BoltResult.py
-src/rs2/interpreter/CompositeResult.py
-src/rs2/interpreter/HistoryQueryResults.py
 src/rs2/interpreter/InterpreterEnums.py
 src/rs2/interpreter/InterpreterGraphEnums.py
 src/rs2/interpreter/InterpreterModel.py
-src/rs2/interpreter/JointResult.py
-src/rs2/interpreter/LinerResult.py
-src/rs2/interpreter/MaterialQueryResults.py
-src/rs2/interpreter/MeshResults.py
 src/rs2/interpreter/RS2Interpreter.py
-src/rs2/interpreter/TimeQueryResults.py
-src/rs2/interpreter/UtilityResult.py
+src/rs2/interpreter/_UtilityResult.py
 src/rs2/interpreter/__init__.py
+src/rs2/interpreter/queryResults/HistoryQueryResults.py
+src/rs2/interpreter/queryResults/MaterialQueryResults.py
+src/rs2/interpreter/queryResults/MeshResults.py
+src/rs2/interpreter/queryResults/TimeQueryResults.py
+src/rs2/interpreter/queryResults/__init__.py
+src/rs2/interpreter/supportResults/BoltResult.py
+src/rs2/interpreter/supportResults/CompositeResult.py
+src/rs2/interpreter/supportResults/JointResult.py
+src/rs2/interpreter/supportResults/LinerResult.py
+src/rs2/interpreter/supportResults/__init__.py
 src/rs2/modeler/Model.py
 src/rs2/modeler/RS2Modeler.py
 src/rs2/modeler/__init__.py
@@ -195,5 +198,6 @@ tests/testMaterialJointOptions.py
 tests/testModelerMultipleFileCloseProgram.py
 tests/testModelerSingleFileCloseProgram.py
 tests/testOpenFileNoResults.py
+tests/testSaveAs.py
 tests/testShearNormalFunction.py
 tests/testSnowdenAnisotropicFunction.py

RS2Scripting-11.23.0rc1/src/RS2Scripting.egg-info/requires.txt

@@ -0,0 +1 @@
+rsmessages==0.0.2rc1

RS2Scripting-11.23.0rc1/src/rs2/BaseModel.py

@@ -0,0 +1,46 @@
+from rs2._common.ProxyObject import ProxyObject
+from rs2._common.documentProxy import DocumentProxy
+from rs2.Units import Units
+class BaseModel(ProxyObject):
+
+	def __init__(self, client, ID):
+		super().__init__(client, ID)
+		self._documentProxy = self._getDocument()
+
+	def _getDocument(self):
+		documentObjectID = self._callFunction('getDocument', [], keepReturnValueReference=True)
+		return DocumentProxy(self._client, documentObjectID)
+	
+	def _enforceFeaFezEnding(self, path: str):
+		if not (path.endswith('.fea') or path.endswith('.fez')):
+			raise ValueError('Path must end with .fea or .fez')
+		
+	def close(self):
+		'''
+		:ref:`Model Example`
+
+		|  Closes the model
+		
+		'''
+		return self._callFunction('close', [])
+	
+	def save(self):
+		'''
+		:ref:`Model Example`
+
+		|  Saves the model
+
+		'''
+		return self._callFunction('save', [])
+	
+	def getUnits(self):
+		'''
+		:ref:`Get Model Units Example`
+
+		|  Get Solid, Hydro and Thermal units for your model
+		'''
+		NUM_UNITS = 3
+		data = self._callFunction('getUnits', [])
+		if (len (data) !=NUM_UNITS) :
+			assert False, "Expected 3 units, got " + str(len(data))
+		return Units(*data)

{RS2Scripting-11.23.0.dev4/src/rs2/_common → RS2Scripting-11.23.0rc1/src/rs2}/Units.py

@@ -1,7 +1,6 @@
 
 class Units:
 	def __init__(self, solid_units=None, hydro_units=None, thermal_units=None):
-
 		self.solid_units = solid_units
 		self.hydro_units = hydro_units
 		self.thermal_units = thermal_units

{RS2Scripting-11.23.0.dev4 → RS2Scripting-11.23.0rc1}/src/rs2/_common/Client.py

@@ -1,15 +1,8 @@
-import logging
 import warnings
 from rsmessages.requestFormat import functionRequest
 from rsmessages.responseFormat import functionResponse, functionStatus
 from multiprocessing.connection import Client as multiProcessingClient
 
-
-logging.basicConfig(filename='python_client.log', filemode='w', format='%(process)d - %(asctime)s - %(levelname)s - %(message)s')
-logger = logging.getLogger(__name__)
-logger.level = logging.INFO
-
-
 class Client:
 	def __init__(self, host, port):
 		self.compatibleProgramVersion = "11.023"
@@ -31,7 +24,6 @@ class Client:
 		try:
 			connection = multiProcessingClient((host, port) ,'AF_INET')
 		except Exception as e:
-			logger.error(f"Unable to create client. Full error: {e}")
 			return
 		return connection
 	

{RS2Scripting-11.23.0.dev4 → RS2Scripting-11.23.0rc1}/src/rs2/interpreter/InterpreterModel.py

@@ -1,37 +1,19 @@
-from rs2._common.ProxyObject import ProxyObject
-from rs2._common.documentProxy import DocumentProxy
-from rs2._common.Units import Units
 from rs2.interpreter.InterpreterEnums import *
-from rs2.interpreter.MeshResults import MeshResults
-from rs2.interpreter.HistoryQueryResults import *
-from rs2.interpreter.TimeQueryResults import *
+from rs2.interpreter.queryResults.MeshResults import MeshResults
+from rs2.interpreter.queryResults.HistoryQueryResults import *
+from rs2.interpreter.queryResults.TimeQueryResults import *
 from rs2.interpreter.InterpreterGraphEnums import *
-from rs2.interpreter.JointResult import *
-from rs2.interpreter.LinerResult import *
-from rs2.interpreter.BoltResult import*
-from rs2.interpreter.CompositeResult import*
-from rs2.interpreter.MaterialQueryResults import *
-class Model(ProxyObject):
+from rs2.interpreter.supportResults.JointResult import *
+from rs2.interpreter.supportResults.LinerResult import *
+from rs2.interpreter.supportResults.BoltResult import*
+from rs2.interpreter.supportResults.CompositeResult import*
+from rs2.interpreter.queryResults.MaterialQueryResults import *
+from rs2.BaseModel import BaseModel
+
+class Model(BaseModel):
 	"""
 	:ref:`Model Example`
 	"""
-	def __init__(self, client, ID):
-		super().__init__(client, ID)
-		self._documentProxy = self._getDocument()
-
-	def _getDocument(self):
-		documentObjectID = self._callFunction('getDocument', [], keepReturnValueReference=True)
-		return DocumentProxy(self._client, documentObjectID)
-
-	def close(self):
-		'''
-		:ref:`Model Example`
-
-		|  Closes the model
-		
-		'''
-		return self._callFunction('close', [])
-
 	def saveCopyAs(self, fileName : str):
 		'''
 		Saves the model using the given file name.
@@ -43,16 +25,10 @@ class Model(ProxyObject):
 			model.saveCopyAs('C:/simple_3_stage.fez')
 		'''
 		formattedFileName = fileName.replace('/', '\\')
+		self._enforceFeaFezEnding(formattedFileName)
 		return self._callFunction('saveAs', [formattedFileName])
 
-	def save(self):
-		'''
-		:ref:`Model Example`
-
-		|  Saves the model
 
-		'''
-		return self._callFunction('save', [])
 	
 	def SetActiveStage(self, stageNumber: int):
 		'''
@@ -344,19 +320,6 @@ class Model(ProxyObject):
 
 		return structured_data
 
-	def getUnits(self) -> Units:
-		'''
-		:ref:`Get Model Units Example`
-
-		|  Get Solid, Hydro and Thermal units for your model
-		
-		'''
-		NUM_UNITS = 3
-		data = self._callFunction('getUnits', [])
-		if len(data) != NUM_UNITS:
-			assert False
-			return Units()
-		return Units(*data)
 
 	def getCriticalSRF(self):
 		'''

{RS2Scripting-11.23.0.dev4/src/rs2/interpreter → RS2Scripting-11.23.0rc1/src/rs2/interpreter/queryResults}/MaterialQueryResults.py

@@ -1,4 +1,4 @@
-from rs2.interpreter.UtilityResult import *
+from rs2.interpreter._UtilityResult import *
 
 class QueryResult:
     def __init__(self, x_location, y_location, distance, value):

{RS2Scripting-11.23.0.dev4/src/rs2/interpreter → RS2Scripting-11.23.0rc1/src/rs2/interpreter/supportResults}/BoltResult.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from rs2.interpreter.UtilityResult import *
+from rs2.interpreter._UtilityResult import *
 
 class BoltElementYieldStatus(Enum):
     BOLT_ELEMENT_NOT_YIELDED = 0

{RS2Scripting-11.23.0.dev4/src/rs2/interpreter → RS2Scripting-11.23.0rc1/src/rs2/interpreter/supportResults}/CompositeResult.py

@@ -1,5 +1,5 @@
-from rs2.interpreter.LinerResult import LinerResult
-from rs2.interpreter.JointResult import JointResult
+from rs2.interpreter.supportResults.LinerResult import LinerResult
+from rs2.interpreter.supportResults.JointResult import JointResult
 
 class PileResult:
     def __init__(self, entity_id, joint_result: JointResult, liner_result: LinerResult):

{RS2Scripting-11.23.0.dev4/src/rs2/interpreter → RS2Scripting-11.23.0rc1/src/rs2/interpreter/supportResults}/JointResult.py

@@ -1,4 +1,4 @@
-from rs2.interpreter.UtilityResult import *
+from rs2.interpreter._UtilityResult import *
 
 class JointElementResult:
     def __init__(self, start_x, start_y, end_x, end_y, distance, normal_stress, shear_stress,confining_stress, normal_displacement, shear_displacement, yielded):

{RS2Scripting-11.23.0.dev4/src/rs2/interpreter → RS2Scripting-11.23.0rc1/src/rs2/interpreter/supportResults}/LinerResult.py

@@ -1,4 +1,4 @@
-from rs2.interpreter.UtilityResult import *
+from rs2.interpreter._UtilityResult import *
 
 class LinerElementResult:
     def __init__(self,composite_layer, node_start, node_end, start_x, start_y, end_x, end_y, distance,axial_force, moment1, moment_mid, moment2, shear_force, displacement_total, displacement_x, displacement_y,

{RS2Scripting-11.23.0.dev4 → RS2Scripting-11.23.0rc1}/src/rs2/modeler/Model.py

@@ -1,6 +1,3 @@
-from rs2._common.ProxyObject import ProxyObject
-from rs2._common.documentProxy import DocumentProxy
-from rs2._common.Units import Units
 from rs2.modeler.properties.bolt.Bolt import BoltProperty
 from rs2.modeler.properties.liner.Liner import LinerProperty
 from rs2.modeler.properties.joint.Joint import JointProperty
@@ -13,18 +10,12 @@ from rs2.modeler.properties.ShearNormalFunction import ShearNormalFunction
 from rs2.modeler.properties.UserDefinedWaterMode import UserDefinedWaterMode
 from rs2.modeler.properties.DiscreteFunction import DiscreteFunction
 
-class Model(ProxyObject):
+from rs2.BaseModel import BaseModel
+
+class Model(BaseModel):
 	"""
 	:ref:`Model Example`
 	"""
-	def __init__(self, client, ID):
-		super().__init__(client, ID)
-		self._documentProxy = self._getDocument()
-
-	def _getDocument(self):
-		documentObjectID = self._callFunction('getDocument', [], keepReturnValueReference=True)
-		return DocumentProxy(self._client, documentObjectID)
-    
 	def getBoltPropertyByName(self, boltName : str) -> BoltProperty:
 		'''
 		|  Returns a Bolt Property object based on its name.
@@ -297,14 +288,6 @@ class Model(ProxyObject):
 		'''
 		return self._callFunction('compute', [True])
 
-	def close(self):
-		'''
-		:ref:`Model Example`
-
-		|  Closes the model
-		'''
-		return self._callFunction('close', [])
-
 	def saveAs(self, fileName : str):
 		'''
 		|  Saves the model using the given file name.
@@ -316,16 +299,9 @@ class Model(ProxyObject):
 			model.saveAs('C:/simple_3_stage.fez')
 		'''
 		formattedFileName = fileName.replace('/', '\\')
+		self._enforceFeaFezEnding(formattedFileName)
 		return self._callFunction('saveAs', [formattedFileName])
 
-	def save(self):
-		'''
-		:ref:`Model Example`
-
-		|  Saves the model
-		'''
-		return self._callFunction('save', [])
-
 	def getDiscreteFunctions(self) -> list[DiscreteFunction]:
 		'''
 		|  Returns a list of all discrete functions
@@ -361,18 +337,7 @@ class Model(ProxyObject):
 		'''
 		return self._callFunction('renameDiscreteFunction', [oldName, newName])	
 	
-	def getUnits(self):
-		'''
-		:ref:`Get Model Units Example`
 
-		|  Get Solid, Hydro and Thermal units for your model
-		'''
-		NUM_UNITS = 3
-		data = self._callFunction('getUnits', [])
-		if (len (data) !=NUM_UNITS) :
-			assert False
-			return Units()
-		return Units(*data)
 
 	def ResetProperties(self):
 		'''

{RS2Scripting-11.23.0.dev4 → RS2Scripting-11.23.0rc1}/src/rs2/modeler/properties/joint/BartonBandisMaterial.py

@@ -17,6 +17,8 @@ class BartonBandisMaterialStageFactor(ProxyObject):
 		return self._callFunction("getDoubleFactor", ["JP_FRICTION_ANGLE_RES_BARTON", self.propertyID], proxyArgumentIndices=[1])
 	def getDilationAngleFactor(self) -> float:
 		return self._callFunction("__getattribute__", ["m_dilation_angle"])
+	def getJointPermeableFactor(self) -> bool:
+		return self._callFunction("__getattribute__", ["m_joint_permeable_factor"])
 class BartonBandisMaterialDefinedStageFactor(BartonBandisMaterialStageFactor):
 	def __init__(self, client : Client, ID, propertyID):
 		super().__init__(client, ID, propertyID)
@@ -28,6 +30,8 @@ class BartonBandisMaterialDefinedStageFactor(BartonBandisMaterialStageFactor):
 		return self._callFunction("setDoubleFactor", ["JP_FRICTION_ANGLE_RES_BARTON", value, self.propertyID], proxyArgumentIndices=[2])
 	def setDilationAngleFactor(self, dilationAngleFactor: float):
 		return self._callFunction("setDilationAngle", [dilationAngleFactor])
+	def setJointPermeableFactor(self, Permeable: bool):
+		return self._callFunction("setJointPermeableFactor", [Permeable])
 class BartonBandisMaterial(PropertyProxy):
 	def __init__(self, client : Client, ID, documentProxyID):
 		super().__init__(client, ID, documentProxyID)

{RS2Scripting-11.23.0.dev4 → RS2Scripting-11.23.0rc1}/src/rs2/modeler/properties/joint/GeosyntheticHyperbolicMaterial.py

@@ -19,6 +19,8 @@ class GeosyntheticHyperbolicMaterialStageFactor(ProxyObject):
 		return self._callFunction("getDoubleFactor", ["JP_FRICTION_ANGLE_RES_GEOSYN", self.propertyID], proxyArgumentIndices=[1])
 	def getDilationRatioFactor(self) -> float:
 		return self._callFunction("__getattribute__", ["m_dilation_ratio"])
+	def getJointPermeableFactor(self) -> bool:
+		return self._callFunction("__getattribute__", ["m_joint_permeable_factor"])
 class GeosyntheticHyperbolicMaterialDefinedStageFactor(GeosyntheticHyperbolicMaterialStageFactor):
 	def __init__(self, client : Client, ID, propertyID):
 		super().__init__(client, ID, propertyID)
@@ -32,6 +34,8 @@ class GeosyntheticHyperbolicMaterialDefinedStageFactor(GeosyntheticHyperbolicMat
 		return self._callFunction("setDoubleFactor", ["JP_FRICTION_ANGLE_RES_GEOSYN", value, self.propertyID], proxyArgumentIndices=[2])
 	def setDilationRatioFactor(self, dilationRatioFactor: float):
 		return self._callFunction("setDilationRatio", [dilationRatioFactor])
+	def setJointPermeableFactor(self, Permeable: bool):
+		return self._callFunction("setJointPermeableFactor", [Permeable])
 class GeosyntheticHyperbolicMaterial(PropertyProxy):
 	def __init__(self, client : Client, ID, documentProxyID):
 		super().__init__(client, ID, documentProxyID)

{RS2Scripting-11.23.0.dev4 → RS2Scripting-11.23.0rc1}/src/rs2/modeler/properties/joint/MohrCoulombMaterial.py

@@ -23,6 +23,8 @@ class MohrCoulombMaterialStageFactor(ProxyObject):
 		return self._callFunction("getDoubleFactor", ["JP_FRICTION_ANGLE_RES", self.propertyID], proxyArgumentIndices=[1])
 	def getDilationAngleFactor(self) -> float:
 		return self._callFunction("__getattribute__", ["m_dilation_angle"])
+	def getJointPermeableFactor(self) -> bool:
+		return self._callFunction("__getattribute__", ["m_joint_permeable_factor"])
 class MohrCoulombMaterialDefinedStageFactor(MohrCoulombMaterialStageFactor):
 	def __init__(self, client : Client, ID, propertyID):
 		super().__init__(client, ID, propertyID)
@@ -40,6 +42,8 @@ class MohrCoulombMaterialDefinedStageFactor(MohrCoulombMaterialStageFactor):
 		return self._callFunction("setDoubleFactor", ["JP_FRICTION_ANGLE_RES", value, self.propertyID], proxyArgumentIndices=[2])
 	def setDilationAngleFactor(self, dilationAngleFactor: float):
 		return self._callFunction("setDilationAngle", [dilationAngleFactor])
+	def setJointPermeableFactor(self, Permeable: bool):
+		return self._callFunction("setJointPermeableFactor", [Permeable])
 class MohrCoulombMaterial(PropertyProxy):
 	def __init__(self, client : Client, ID, documentProxyID):
 		super().__init__(client, ID, documentProxyID)

{RS2Scripting-11.23.0.dev4 → RS2Scripting-11.23.0rc1}/src/rs2/modeler/properties/material/stiffness/TransverselyIsotropic.py

@@ -17,10 +17,10 @@ class TransverselyIsotropicStageFactor(ProxyObject):
 		return self._callFunction("getDoubleFactor", ["MP_POISSONS_RATIO_V12", self.propertyID], proxyArgumentIndices=[1])
 	def getShearModulusFactor(self) -> float:
 		return self._callFunction("getDoubleFactor", ["MP_SHEAR_MODULUS", self.propertyID], proxyArgumentIndices=[1])
-	def getYoungsModulusE1AndEzFactor(self) -> float:
-		return self._callFunction("getDoubleFactor", ["MP_YOUNGS_MODULUS_E1_AND_EZ", self.propertyID], proxyArgumentIndices=[1])
 	def getYoungsModulusE2Factor(self) -> float:
 		return self._callFunction("getDoubleFactor", ["MP_YOUNGS_MODULUS_E2", self.propertyID], proxyArgumentIndices=[1])
+	def getYoungsModulusE1AndEzFactor(self) -> float:
+		return self._callFunction("getDoubleFactor", ["MP_YOUNGS_MODULUS_E1_AND_EZ", self.propertyID], proxyArgumentIndices=[1])
 class TransverselyIsotropicDefinedStageFactor(TransverselyIsotropicStageFactor):
 	def __init__(self, client : Client, ID, propertyID):
 		super().__init__(client, ID, propertyID)
@@ -32,10 +32,11 @@ class TransverselyIsotropicDefinedStageFactor(TransverselyIsotropicStageFactor):
 		return self._callFunction("setDoubleFactor", ["MP_POISSONS_RATIO_V12", value, self.propertyID], proxyArgumentIndices=[2])
 	def setShearModulusFactor(self, value: float):
 		return self._callFunction("setDoubleFactor", ["MP_SHEAR_MODULUS", value, self.propertyID], proxyArgumentIndices=[2])
-	def setYoungsModulusE1AndEzFactor(self, value: float):
-		return self._callFunction("setDoubleFactor", ["MP_YOUNGS_MODULUS_E1_AND_EZ", value, self.propertyID], proxyArgumentIndices=[2])
 	def setYoungsModulusE2Factor(self, value: float):
 		return self._callFunction("setDoubleFactor", ["MP_YOUNGS_MODULUS_E2", value, self.propertyID], proxyArgumentIndices=[2])
+	def setYoungsModulusE1AndEzFactor(self, value: float):
+		self._callFunction("setDoubleFactor", ["MP_YOUNGS_MODULUS_E1", value, self.propertyID], proxyArgumentIndices = [2])
+		self._callFunction("setDoubleFactor", ["MP_YOUNGS_MODULUS_EZ", value, self.propertyID], proxyArgumentIndices = [2])
 class TransverselyIsotropic(PropertyProxy):
 	def __init__(self, client : Client, ID, documentProxyID, stageFactorInterfaceID):
 		super().__init__(client, ID, documentProxyID)

{RS2Scripting-11.23.0.dev4 → RS2Scripting-11.23.0rc1}/src/rs2/modeler/properties/material/strength/PM4SiltStrength.py

@@ -32,6 +32,10 @@ class PM4SiltStrength(PropertyProxy):
 		return self._getDoubleProperty("MP_PM4_SILT_LAMBDA")
 	def setLambda(self, value: float):
 		return self._setDoubleProperty("MP_PM4_SILT_LAMBDA", value)
+	def getAutoCalculateFsu(self) -> bool:
+		return self._getBoolProperty("MP_USE_AUTO_FSU")
+	def setAutoCalculateFsu(self, value: bool):
+		return self._setBoolProperty("MP_USE_AUTO_FSU", value)
 	def getFsu(self) -> float:
 		return self._getDoubleProperty("MP_PM4_SILT_FSU")
 	def setFsu(self, value: float):
@@ -132,7 +136,7 @@ class PM4SiltStrength(PropertyProxy):
 		return self._getDoubleProperty("MP_FABRIC_DILATANCY_TENSOR_CZ")
 	def setCzParameter(self, value: float):
 		return self._setDoubleProperty("MP_FABRIC_DILATANCY_TENSOR_CZ", value)
-	def setProperties(self, AutoCalculateSuParameter : bool = None, SuParameter : float = None, SuRatioParameter : float = None, AutoCalculateEInitial : bool = None, EInitial : float = None, AutoCalculateLambda : bool = None, Lambda : float = None, Fsu : float = None, AutoCalculatePhiCv : bool = None, PhiCv : float = None, AutoCalculateNbWet : bool = None, NbWet : float = None, AutoCalculateNbDry : bool = None, NbDry : float = None, AutoCalculateNdParameter : bool = None, NdParameter : float = None, AutoCalculateADoParameter : bool = None, ADoParameter : float = None, AutoCalculateRuMax : bool = None, RuMax : float = None, Hp0Parameter : float = None, AutoCalculateCEpsParameter : bool = None, CEpsParameter : float = None, YieldSurfaceM : float = None, AutoCalculateH0Parameter : bool = None, H0Parameter : float = None, AutoCalculateCKafParameter : bool = None, CKafParameter : float = None, AutoCalculateZmax : bool = None, Zmax : float = None, AutoCalculateCzParameter : bool = None, CzParameter : float = None):
+	def setProperties(self, AutoCalculateSuParameter : bool = None, SuParameter : float = None, SuRatioParameter : float = None, AutoCalculateEInitial : bool = None, EInitial : float = None, AutoCalculateLambda : bool = None, Lambda : float = None, AutoCalculateFsu : bool = None, Fsu : float = None, AutoCalculatePhiCv : bool = None, PhiCv : float = None, AutoCalculateNbWet : bool = None, NbWet : float = None, AutoCalculateNbDry : bool = None, NbDry : float = None, AutoCalculateNdParameter : bool = None, NdParameter : float = None, AutoCalculateADoParameter : bool = None, ADoParameter : float = None, AutoCalculateRuMax : bool = None, RuMax : float = None, Hp0Parameter : float = None, AutoCalculateCEpsParameter : bool = None, CEpsParameter : float = None, YieldSurfaceM : float = None, AutoCalculateH0Parameter : bool = None, H0Parameter : float = None, AutoCalculateCKafParameter : bool = None, CKafParameter : float = None, AutoCalculateZmax : bool = None, Zmax : float = None, AutoCalculateCzParameter : bool = None, CzParameter : float = None):
 		if AutoCalculateSuParameter is not None:
 			self._setBoolProperty("MP_USE_AUTO_SU", AutoCalculateSuParameter)
 		if SuParameter is not None:
@@ -147,6 +151,8 @@ class PM4SiltStrength(PropertyProxy):
 			self._setBoolProperty("MP_USE_AUTO_LAMBDA", AutoCalculateLambda)
 		if Lambda is not None:
 			self._setDoubleProperty("MP_PM4_SILT_LAMBDA", Lambda)
+		if AutoCalculateFsu is not None:
+			self._setBoolProperty("MP_USE_AUTO_FSU", AutoCalculateFsu)
 		if Fsu is not None:
 			self._setDoubleProperty("MP_PM4_SILT_FSU", Fsu)
 		if AutoCalculatePhiCv is not None:
@@ -206,6 +212,7 @@ class PM4SiltStrength(PropertyProxy):
 		"EInitial" : self.getEInitial(), 
 		"AutoCalculateLambda" : self.getAutoCalculateLambda(), 
 		"Lambda" : self.getLambda(), 
+		"AutoCalculateFsu" : self.getAutoCalculateFsu(), 
 		"Fsu" : self.getFsu(), 
 		"AutoCalculatePhiCv" : self.getAutoCalculatePhiCv(), 
 		"PhiCv" : self.getPhiCv(), 

{RS2Scripting-11.23.0.dev4 → RS2Scripting-11.23.0rc1}/src/rs2/modeler/properties/material/strength/SofteningHardeningModel.py

@@ -76,6 +76,10 @@ class SofteningHardeningModel(PropertyProxy):
 		return CapTypes(self._getEnumECapTypesProperty("MP_SH_CAP_TYPE"))
 	def setCapType(self, value: CapTypes):
 		return self._setEnumECapTypesProperty("MP_SH_CAP_TYPE", value)
+	def getCapHardeningType(self) -> CapHardeningTypes:
+		return CapHardeningTypes(self._getEnumECapHardeningTypesProperty("MP_SH_CAP_HARDENING_TYPE"))
+	def setCapHardeningType(self, value: CapHardeningTypes):
+		return self._setEnumECapHardeningTypesProperty("MP_SH_CAP_HARDENING_TYPE", value)
 	def getInitialMeanStress(self) -> float:
 		return self._getDoubleProperty("MP_INITIAL_MEAN_STRESS")
 	def setInitialMeanStress(self, value: float):
@@ -107,7 +111,7 @@ class SofteningHardeningModel(PropertyProxy):
 		returns a list of (x,y) tuples.
 		"""
 		return self._callFunction("getSHCapMeanStress", [])
-	def setProperties(self, PeakTensileStrength : float = None, PeakFrictionAngle : float = None, PeakCohesion : float = None, ConeHardeningType : ConeHardeningTypes = None, HardeningProperty : float = None, DilationAngle : float = None, ConeDilationType : DilationTypes = None, CapType : CapTypes = None, InitialMeanStress : float = None, LambdaKappa : float = None):
+	def setProperties(self, PeakTensileStrength : float = None, PeakFrictionAngle : float = None, PeakCohesion : float = None, ConeHardeningType : ConeHardeningTypes = None, HardeningProperty : float = None, DilationAngle : float = None, ConeDilationType : DilationTypes = None, CapType : CapTypes = None, CapHardeningType : CapHardeningTypes = None, InitialMeanStress : float = None, LambdaKappa : float = None):
 		if PeakTensileStrength is not None:
 			self._setDoubleProperty("MP_PEAK_TENSILE_STRENGTH", PeakTensileStrength)
 		if PeakFrictionAngle is not None:
@@ -124,6 +128,8 @@ class SofteningHardeningModel(PropertyProxy):
 			self._setEnumEDilationTypesProperty("MP_CONE_DILATION", ConeDilationType)
 		if CapType is not None:
 			self._setEnumECapTypesProperty("MP_SH_CAP_TYPE", CapType)
+		if CapHardeningType is not None:
+			self._setEnumECapHardeningTypesProperty("MP_SH_CAP_HARDENING_TYPE", CapHardeningType)
 		if InitialMeanStress is not None:
 			self._setDoubleProperty("MP_INITIAL_MEAN_STRESS", InitialMeanStress)
 		if LambdaKappa is not None:
@@ -138,6 +144,7 @@ class SofteningHardeningModel(PropertyProxy):
 		"DilationAngle" : self.getDilationAngle(), 
 		"ConeDilationType" : self.getConeDilationType(), 
 		"CapType" : self.getCapType(), 
+		"CapHardeningType" : self.getCapHardeningType(), 
 		"InitialMeanStress" : self.getInitialMeanStress(), 
 		"LambdaKappa" : self.getLambdaKappa(), 
 		}

{RS2Scripting-11.23.0.dev4 → RS2Scripting-11.23.0rc1}/tests/testExampleCode.py

@@ -2,9 +2,12 @@ import unittest
 import types
 import os
 import sys
-from importlib.machinery import SourceFileLoader
+import subprocess
 
 class TestExampleFiles(unittest.TestCase):
+	pathToPythonExecutable = None
+
+	@unittest.skipIf(not pathToPythonExecutable, "Requires path to the python executable to use to run the example files. ex: python or C:\env\Scripts\python.exe")  
 	def test_run_example_files(self):
 		example_files_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'docs', 'example_code')
 		for filename in os.listdir(example_files_dir):
@@ -14,12 +17,6 @@ class TestExampleFiles(unittest.TestCase):
 			if os.path.isdir(filePath):
 				continue
 
-			fullname = filename[:-3]
-
-			try:
-				loader = SourceFileLoader(fullname, os.path.join(example_files_dir, filename))
-				pythonModuleToTest = types.ModuleType(loader.name)
-				loader.exec_module(pythonModuleToTest)
-				
-			except Exception as e:
-				self.fail(f"Failed to run {filename}: {e}")
+			print(f"Running: {filename}...")
+			subprocess.run([self.pathToPythonExecutable, filePath], check=True)
+			print("Finished:" + filename)

{RS2Scripting-11.23.0.dev4 → RS2Scripting-11.23.0rc1}/tests/testMaterialJointOptions.py

@@ -84,4 +84,31 @@ class TestMaterialJointOptions(unittest.TestCase):
         self.matJointOptions.setNumberOfJoints(1)
         joint = self.matJointOptions.getJoint(0)
         with self.assertRaises(Exception):
-            joint.GeosyntheticHyperbolicMaterial.setDilationRatio(-0.1)
+            joint.GeosyntheticHyperbolicMaterial.setDilationRatio(-0.1)
+
+    def testSetPermeabilityFactor(self):
+        self.matJointOptions.setNumberOfJoints(1)
+        joint = self.matJointOptions.getJoint(0)
+        joint.setSlipCriterion(JointTypes.MOHR_COULOMB)
+        joint.MohrCoulombMaterial.setApplyStageFactors(True)        
+        fac1 = joint.MohrCoulombMaterial.stageFactorInterface.createStageFactor(1)
+        fac1.setJointPermeableFactor(True)
+        self.assertEqual(fac1.getJointPermeableFactor(),True)
+        fac1.setJointPermeableFactor(False)
+        self.assertEqual(fac1.getJointPermeableFactor(),False)
+
+        joint.setSlipCriterion(JointTypes.BARTON_BANDIS)
+        joint.BartonBandisMaterial.setApplyStageFactors(True)
+        fac1 = joint.BartonBandisMaterial.stageFactorInterface.getDefinedStageFactors()[1]
+        fac1.setJointPermeableFactor(True)
+        self.assertEqual(fac1.getJointPermeableFactor(),True)
+        fac1.setJointPermeableFactor(False)
+        self.assertEqual(fac1.getJointPermeableFactor(),False)
+
+        joint.setSlipCriterion(JointTypes.GEOSYNTHETIC_HYPERBOLIC)
+        joint.GeosyntheticHyperbolicMaterial.setApplyStageFactors(True)
+        fac1 = joint.GeosyntheticHyperbolicMaterial.stageFactorInterface.getDefinedStageFactors()[1]
+        fac1.setJointPermeableFactor(True)
+        self.assertEqual(fac1.getJointPermeableFactor(),True)
+        fac1.setJointPermeableFactor(False)
+        self.assertEqual(fac1.getJointPermeableFactor(),False)