RS2Scripting 11.23.0__py3-none-any.whl → 11.23.0.dev2__py3-none-any.whl

{RS2Scripting-11.23.0.dist-info → RS2Scripting-11.23.0.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: RS2Scripting
-Version: 11.23.0
+Version: 11.23.0.dev2
 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
+Requires-Dist: rsmessages ==0.0.2.dev1
 
 ## Introduction 
 This project is a library that can be used to interact with RS2 through python.  

{RS2Scripting-11.23.0.dist-info → RS2Scripting-11.23.0.dev2.dist-info}/RECORD

@@ -1,27 +1,24 @@
-rs2/BaseModel.py,sha256=9seLvsFnTI96H1cb508EzFnquEE0UL0Oz8cflNRjsaA,1181
-rs2/Units.py,sha256=WavPp-CZXPCrv5LXAmNxaovM4pJPt7qlEQlok_i7zQo,200
 rs2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rs2/_common/Client.py,sha256=bq4A6xqOOPy06wqQu8XMVvDMfaSv8iFjVy0eADts5xw,2377
+rs2/_common/Client.py,sha256=SxR_NvCu2FTR6Xwk90Y7sRzJApabnafsyDxuIUY27g8,2659
 rs2/_common/ProxyObject.py,sha256=6c6AJPTTAR7dSBowNhw2OzizAFNHixkRy8sQRv8gqlU,471
+rs2/_common/Units.py,sha256=T0JYsYuxtc2b59_I83GztMETmssqOXI-oQ-KREfgMm8,202
 rs2/_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rs2/_common/documentProxy.py,sha256=W1a2uezHNIG0VXjF1IODN680j0q-hzAH2WEwe0xCKW8,182
+rs2/interpreter/BoltResult.py,sha256=hspIW08yEqH7nXwyvagPsX8SKU_A--wCeLotapvSePw,1994
+rs2/interpreter/CompositeResult.py,sha256=IvCxvSJvBwe1fn_ZQhN3823RUIWDTyWbjxyACszPijc,896
+rs2/interpreter/HistoryQueryResults.py,sha256=7HjZL8mLqNW-apVOhY42Jxo-uMFWzTH_meAwjuEXBMg,956
 rs2/interpreter/InterpreterEnums.py,sha256=LLf6L3t4EdlqTAvV6yEpwGyZTd3Ph-perIKyfLfRbC4,5468
 rs2/interpreter/InterpreterGraphEnums.py,sha256=EzhwBih2TC7Us5NY2GTL6W0_7wsIWi1NDv16Jjl6AC8,1757
-rs2/interpreter/InterpreterModel.py,sha256=apoCrvjR59rqlipCo4a-WY9CoVvemNbLFRzAkp52x-s,12191
+rs2/interpreter/InterpreterModel.py,sha256=DRW4l8GvfyLrFtkKI7NvxAg65N8BfoqdTVhyUyGW3GE,12889
+rs2/interpreter/JointResult.py,sha256=vW04g5hdvkbWaAew6tNmCSeNp-1ecRyIjs_DhbGiJP4,937
+rs2/interpreter/LinerResult.py,sha256=yZpw6ceJNYGDeu8a4iAHJPYFtKeN0xDRDwgmMT2TKE8,1457
+rs2/interpreter/MaterialQueryResults.py,sha256=xlHpPQ0VvysyPkJekP6OU0HPJlSUBo0HEHIvFgZHvUI,2099
+rs2/interpreter/MeshResults.py,sha256=Chwg2Tp7cYuhSpeEmR96TCXUgsdevidWHBI7JQ9yIsI,333
 rs2/interpreter/RS2Interpreter.py,sha256=JOtwxV_EMBBhJwi57HhyOF1rBH1VeGI_U65VVLf6siM,2998
-rs2/interpreter/_UtilityResult.py,sha256=6VsLAdwxXuXyR7a7yAJ-6axxSqSURk92HDDVnyPcZsU,500
+rs2/interpreter/TimeQueryResults.py,sha256=uZxpJQsRsEY4c2nkTs4NYl4LFVAe7MK2AVKZb2UGohg,4231
+rs2/interpreter/UtilityResult.py,sha256=6VsLAdwxXuXyR7a7yAJ-6axxSqSURk92HDDVnyPcZsU,500
 rs2/interpreter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rs2/interpreter/queryResults/HistoryQueryResults.py,sha256=7HjZL8mLqNW-apVOhY42Jxo-uMFWzTH_meAwjuEXBMg,956
-rs2/interpreter/queryResults/MaterialQueryResults.py,sha256=aLKepolt1xESh1RbiHtYq6a8cPx7-alpt16cxFV5LoE,2100
-rs2/interpreter/queryResults/MeshResults.py,sha256=Chwg2Tp7cYuhSpeEmR96TCXUgsdevidWHBI7JQ9yIsI,333
-rs2/interpreter/queryResults/TimeQueryResults.py,sha256=uZxpJQsRsEY4c2nkTs4NYl4LFVAe7MK2AVKZb2UGohg,4231
-rs2/interpreter/queryResults/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rs2/interpreter/supportResults/BoltResult.py,sha256=BX54FcPUb13BAFhZowoarjQRIzf5vFF4FLY2iN0cmfE,2051
-rs2/interpreter/supportResults/CompositeResult.py,sha256=Y6wJ4OteL0O57DQsX_xhXyOj7L5e8dI3BH_zIYnF9so,926
-rs2/interpreter/supportResults/JointResult.py,sha256=WXDIRl_gMTgj8SXUuvKaiFAp1d1BCGmZpjkF5HKW-ZU,938
-rs2/interpreter/supportResults/LinerResult.py,sha256=YDl1lhtm7BEU8emCeOF75-2mKdnLqUEE26vTcnP2j1Q,1458
-rs2/interpreter/supportResults/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rs2/modeler/Model.py,sha256=p9r2kFmmHBSgj0T26CbybnnbnjeiZJufznsdB6mTqtM,14000
+rs2/modeler/Model.py,sha256=pK-8GRjMh29KcWuWwJi2n0J-dCsfKhB22Asj7bo4-tg,14875
 rs2/modeler/RS2Modeler.py,sha256=vISeaUuktlqG4wMPmXvUs1YgB7LIc2m7eoAgY5IF0DQ,2994
 rs2/modeler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rs2/modeler/properties/AbsoluteStageFactorGettersInterface.py,sha256=HpsdM0TBPgZ_wfwyC0pY87PnFZWbbwSBWpwqh8vzBQo,1475
@@ -46,15 +43,15 @@ rs2/modeler/properties/bolt/Swellex.py,sha256=lvJ0S2QnirPeoZftPLW_AWNd_xIV8YFsnu
 rs2/modeler/properties/bolt/Tieback.py,sha256=w9ValpDAWPqn94r7dNMv-fumJ2KXyfE_6SdvT7eC5XQ,11492
 rs2/modeler/properties/bolt/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rs2/modeler/properties/joint/BartonBandis.py,sha256=wgGV63woMdf8OsbkztVyH71mrGPxqh6TgT9pNB1xunQ,9143
-rs2/modeler/properties/joint/BartonBandisMaterial.py,sha256=m6wsMu2PD5zQ7zC1lRnhiCTebLgtln8mciF7FdOCLdM,4809
+rs2/modeler/properties/joint/BartonBandisMaterial.py,sha256=rAsBahIrtT8q7Cw-G5l5k0lJEW60VCCCRjmhQl6BvVU,4562
 rs2/modeler/properties/joint/DisplacementDependent.py,sha256=sUobR_QbVzY2UQh9hnM8dlzN4CPTgDymixbj-usq1eE,9157
 rs2/modeler/properties/joint/GeosyntheticHyperbolic.py,sha256=eAcrrCyeRtPjVh5jyElR7IiIuI4fEpN5cmQFgtWtfUU,10101
-rs2/modeler/properties/joint/GeosyntheticHyperbolicMaterial.py,sha256=bzAv2JwOY_cGSdyY-scfK78dIMk0eFpy4kzX_dIemdQ,6146
+rs2/modeler/properties/joint/GeosyntheticHyperbolicMaterial.py,sha256=VUQv2_CA6sGKYoVWhVtPk8zf1PJ4UWoOWOtTM88-sgs,5899
 rs2/modeler/properties/joint/HyperbolicSoftening.py,sha256=UO7E9zo5l4rp-wkohJez3uW-mwCw9hmAvOuVKOkyoq4,13380
 rs2/modeler/properties/joint/Joint.py,sha256=BEDg_hw4EioZSzINPF06rZK6I5HHX2kerHEAPUBPIC8,3039
 rs2/modeler/properties/joint/MaterialDependent.py,sha256=yZjFudNWNI5BP-LMlQJdy6lSWFwOC0FqKC0ipgseJBg,8565
 rs2/modeler/properties/joint/MohrCoulomb.py,sha256=-u7O1MdIPVpqBx-iaMBfnrNuHsAIpfjruHJDxYRzGOQ,13221
-rs2/modeler/properties/joint/MohrCoulombMaterial.py,sha256=ahKXarSYkVZA4Eunbic7dsWlhGUSazZsTWYWYtCQHpo,7224
+rs2/modeler/properties/joint/MohrCoulombMaterial.py,sha256=FBL__lgMzN8QKr1ccPoLjYvxPMcRz2VJVAobdealGhI,6977
 rs2/modeler/properties/joint/NoneSlip.py,sha256=S7FYiaZMfv-mip4YN_-6WaHU7AW9YJr8iFDNmVQoytM,6749
 rs2/modeler/properties/joint/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rs2/modeler/properties/liner/CableTruss.py,sha256=fON8ShaXsO9WDtKDqe52j6LIo12QXfWCEzj2rIYo_ns,12762
@@ -102,7 +99,7 @@ rs2/modeler/properties/material/stiffness/SoftSoil.py,sha256=UE2zvyWk9ZwLZz_NLs8
 rs2/modeler/properties/material/stiffness/SoftSoilCreep.py,sha256=QilCey1Jh4K6O5oaoZVVruS1r_4HZ8RgGKvhEFchT04,998
 rs2/modeler/properties/material/stiffness/Stiffness.py,sha256=TZHnGmRQMXNrEX5KnXMXgS-07ZCEXbdY89esMYGBuyY,3659
 rs2/modeler/properties/material/stiffness/SwellingRock.py,sha256=_t-jJVbCgWuVg2a4bfttO-XKlglUYt2C9eXDSrJQabU,3205
-rs2/modeler/properties/material/stiffness/TransverselyIsotropic.py,sha256=MqNSMFZpTKcq7Fl0kxxmHcOy5uRcO04-icsAeJdsJMQ,10254
+rs2/modeler/properties/material/stiffness/TransverselyIsotropic.py,sha256=CYwMpI6CCKpAKW3oeGcI6R8aFEpe5Y5h2Gxi5kOCTw8,10147
 rs2/modeler/properties/material/stiffness/ViscoElastic.py,sha256=KWuKen1sz5ZNF0NRzf16cbMsxkvAZx33HL0CoIpS6S8,3206
 rs2/modeler/properties/material/stiffness/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rs2/modeler/properties/material/strength/AnisotropicLinear.py,sha256=U4Bu3qngjb8PEkJC7bYFEUpgg69atTNEK-xtUC56wB8,8292
@@ -130,14 +127,14 @@ rs2/modeler/properties/material/strength/MohrCoulombStrength.py,sha256=cNRKdXwLx
 rs2/modeler/properties/material/strength/MohrCoulombWithCap.py,sha256=PJ44A4MHnmJhJSVeVqMiMrG4PmzRwdSiLR3210lr6p8,6858
 rs2/modeler/properties/material/strength/NorSandStrength.py,sha256=nrWLqF6yFNtfQsHxp7I0FQKkot6HlDARp2lJSlbLVFw,6138
 rs2/modeler/properties/material/strength/PM4SandStrength.py,sha256=sw65gTYMaa6baWNpKRJJkUlG3DLZG7rl45SLx63E08w,9284
-rs2/modeler/properties/material/strength/PM4SiltStrength.py,sha256=7ABvpwKKe53hKPqEvJH8-WLeTMtxYrGaTvN5IopIe8w,12918
+rs2/modeler/properties/material/strength/PM4SiltStrength.py,sha256=AlRXV2sWxcFyFbDFTqroWnGdOBbEpZ3-Ki_hkDK9jRk,12538
 rs2/modeler/properties/material/strength/PowerCurve.py,sha256=dqelX1W1jU_AbtlRSFdcb4hxPS0qNNHmMI9Oz0uHOb0,5200
 rs2/modeler/properties/material/strength/Shansep.py,sha256=O8W9YJaEwcJJEgoSTZd1KLkZUpqWlsbCyqiy_P8GUaM,10586
 rs2/modeler/properties/material/strength/ShearNormalFunction.py,sha256=CMA3CS47H9fyB1fOepld2Oj59nFx59aiUxYop5tvRTI,1024
 rs2/modeler/properties/material/strength/SnowdenModAnisotropicLinear.py,sha256=pNjpWYKpW5Av6NcS9EXDGxngkXC7-ErisGeql6OwAQI,4331
 rs2/modeler/properties/material/strength/SoftSoilCreepStrength.py,sha256=GacOfhHdpoK0wv8wJ7gFIVjMo0irnMiOW1Wkcu1xu2U,4507
 rs2/modeler/properties/material/strength/SoftSoilStrength.py,sha256=Wg8N4Rl5clzQUL2d7Yx9U8zxyVDGsSgQOHS2613xuzw,4211
-rs2/modeler/properties/material/strength/SofteningHardeningModel.py,sha256=4DDUO-fltjAYgNMhjvTyovMy81qrOL0WnmfOwmy-IAw,9480
+rs2/modeler/properties/material/strength/SofteningHardeningModel.py,sha256=jPQKBehZc_JmDce_1vVxP8XFVkDYowxjtPG9oCd5xuo,8961
 rs2/modeler/properties/material/strength/Strength.py,sha256=5XzbTR6l5kZW9WH-uxnQHySza-L3UQmCOxNikrScM1Q,13813
 rs2/modeler/properties/material/strength/SwellingRockStrength.py,sha256=WDStBPpMGO2R6W88_Y6wZvKrazG_7tT8nFMNW6Vy7R4,6886
 rs2/modeler/properties/material/strength/VerticalStressRatio.py,sha256=OH0JKEClwejKE2ReABEYcRdLrnR0oCs8p9ObLf9xHfc,5845
@@ -181,8 +178,8 @@ rs2/modeler/properties/pile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 rs2/utilities/ApplicationManager.py,sha256=u2GS_nW6uJcBcOc_CN5yy1DaBU5CF3yOtFGpJC7tdE4,2586
 rs2/utilities/ColorPicker.py,sha256=nOHwCHtn8p3KkVC-GSpa38AOhRh2urQVE3brViH3vzE,2534
 rs2/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-RS2Scripting-11.23.0.dist-info/License.txt,sha256=_OkJXIBSGMEg07z5G3WiNn3yWOvhXK___X7MHTWR17E,1077
-RS2Scripting-11.23.0.dist-info/METADATA,sha256=pE05N75oAtNUgHQuPzaJ-BYbeop-Eo3Dge6cYsQ11-0,9678
-RS2Scripting-11.23.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-RS2Scripting-11.23.0.dist-info/top_level.txt,sha256=9QT-lM7XOqDZtjDEtW-lpH9z4TZPnuq4_4rYcR1W8jM,4
-RS2Scripting-11.23.0.dist-info/RECORD,,
+RS2Scripting-11.23.0.dev2.dist-info/License.txt,sha256=_OkJXIBSGMEg07z5G3WiNn3yWOvhXK___X7MHTWR17E,1077
+RS2Scripting-11.23.0.dev2.dist-info/METADATA,sha256=fJnW4fSZWYKP1T4VDiFqg6hYs8RzhkjOlIp2dhx06bU,9688
+RS2Scripting-11.23.0.dev2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+RS2Scripting-11.23.0.dev2.dist-info/top_level.txt,sha256=9QT-lM7XOqDZtjDEtW-lpH9z4TZPnuq4_4rYcR1W8jM,4
+RS2Scripting-11.23.0.dev2.dist-info/RECORD,,

rs2/_common/Client.py

@@ -1,8 +1,15 @@
+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"
@@ -24,6 +31,7 @@ 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
 	

rs2/{Units.py → _common/Units.py}

@@ -1,6 +1,7 @@
 
 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

rs2/interpreter/{supportResults/BoltResult.py → BoltResult.py}

@@ -1,12 +1,12 @@
 from enum import Enum
-from rs2.interpreter._UtilityResult import *
+from rs2.interpreter.UtilityResult import *
 
 class BoltElementYieldStatus(Enum):
     BOLT_ELEMENT_NOT_YIELDED = 0
     BOLT_ELEMENT_TYPE_UNKNOWN_YIELDED  = 1
     BOLT_ELEMENT_TENSION_YIELDED = 2
-    BOLT_ELEMENT_SHEAR_YIELDED  = 4
-    BOLT_ELEMENT_TENSIONANDSHEAR_YIELDED = BOLT_ELEMENT_TENSION_YIELDED + BOLT_ELEMENT_SHEAR_YIELDED
+    BOLT_ELEMENT_SHEAR_YIELDED  = 3
+    BOLT_ELEMENT_TENSIONANDSHEAR_YIELDED = 4
     BOLT_ELEMENT_UNDEFINED_YIELDED = -1
   
 class BoltYieldingResult:

rs2/interpreter/{supportResults/CompositeResult.py → CompositeResult.py}

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

rs2/interpreter/InterpreterModel.py

@@ -1,19 +1,37 @@
+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.queryResults.MeshResults import MeshResults
-from rs2.interpreter.queryResults.HistoryQueryResults import *
-from rs2.interpreter.queryResults.TimeQueryResults import *
+from rs2.interpreter.MeshResults import MeshResults
+from rs2.interpreter.HistoryQueryResults import *
+from rs2.interpreter.TimeQueryResults import *
 from rs2.interpreter.InterpreterGraphEnums import *
-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):
+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):
 	"""
 	: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.
@@ -25,10 +43,16 @@ class Model(BaseModel):
 			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):
 		'''
@@ -207,8 +231,7 @@ class Model(BaseModel):
 				# displacement force
 				if len(entity_data) < 3 or len(entity_data[0]) <1 or len(entity_data[0][0]) < 4:
 					continue
-				if len(entity_data[1]) < 1 or len(entity_data[2]) < 1:
-					continue
+
 				for yeilding_vector in entity_data[1]:
 					yielding = BoltYieldingResult(*yeilding_vector)
 					yielding_results.append(yielding)
@@ -313,13 +336,26 @@ class Model(BaseModel):
 		for stage_idx, stage_data in map_data.items():
 			structured_data[stage_idx] = []
 			for entity_name, entity_data in stage_data.items():
-				liner_result = self._process_liner_data(entity_data, entity_name)
-				joint_result = self._process_joint_data(entity_data, entity_name)
+				liner_result = self.process_liner_data(entity_data, entity_name)
+				joint_result = self.process_joint_data(entity_data, entity_name)
 				composition_result = ResultType(entity_name,joint_result,liner_result)
 				structured_data[stage_idx].append(composition_result)
 
 		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):
 		'''

rs2/interpreter/{supportResults/JointResult.py → 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):

rs2/interpreter/{supportResults/LinerResult.py → 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,

rs2/interpreter/{queryResults/MaterialQueryResults.py → 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):

rs2/modeler/Model.py

@@ -1,3 +1,6 @@
+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
@@ -10,12 +13,18 @@ from rs2.modeler.properties.ShearNormalFunction import ShearNormalFunction
 from rs2.modeler.properties.UserDefinedWaterMode import UserDefinedWaterMode
 from rs2.modeler.properties.DiscreteFunction import DiscreteFunction
 
-from rs2.BaseModel import BaseModel
-
-class Model(BaseModel):
+class Model(ProxyObject):
 	"""
 	: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.
@@ -288,6 +297,14 @@ class Model(BaseModel):
 		'''
 		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.
@@ -299,9 +316,16 @@ class Model(BaseModel):
 			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
@@ -337,7 +361,18 @@ class Model(BaseModel):
 		'''
 		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):
 		'''

rs2/modeler/properties/joint/BartonBandisMaterial.py

@@ -17,8 +17,6 @@ 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)
@@ -30,8 +28,6 @@ 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)

rs2/modeler/properties/joint/GeosyntheticHyperbolicMaterial.py

@@ -19,8 +19,6 @@ 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)
@@ -34,8 +32,6 @@ 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)

rs2/modeler/properties/joint/MohrCoulombMaterial.py

@@ -23,8 +23,6 @@ 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)
@@ -42,8 +40,6 @@ 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)

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 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])
+	def getYoungsModulusE2Factor(self) -> float:
+		return self._callFunction("getDoubleFactor", ["MP_YOUNGS_MODULUS_E2", self.propertyID], proxyArgumentIndices=[1])
 class TransverselyIsotropicDefinedStageFactor(TransverselyIsotropicStageFactor):
 	def __init__(self, client : Client, ID, propertyID):
 		super().__init__(client, ID, propertyID)
@@ -32,11 +32,10 @@ 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)

rs2/modeler/properties/material/strength/PM4SiltStrength.py

@@ -32,10 +32,6 @@ 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):
@@ -136,7 +132,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, 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):
+	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):
 		if AutoCalculateSuParameter is not None:
 			self._setBoolProperty("MP_USE_AUTO_SU", AutoCalculateSuParameter)
 		if SuParameter is not None:
@@ -151,8 +147,6 @@ 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:
@@ -212,7 +206,6 @@ class PM4SiltStrength(PropertyProxy):
 		"EInitial" : self.getEInitial(), 
 		"AutoCalculateLambda" : self.getAutoCalculateLambda(), 
 		"Lambda" : self.getLambda(), 
-		"AutoCalculateFsu" : self.getAutoCalculateFsu(), 
 		"Fsu" : self.getFsu(), 
 		"AutoCalculatePhiCv" : self.getAutoCalculatePhiCv(), 
 		"PhiCv" : self.getPhiCv(), 

rs2/modeler/properties/material/strength/SofteningHardeningModel.py

@@ -76,10 +76,6 @@ 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):
@@ -111,7 +107,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, CapHardeningType : CapHardeningTypes = 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, InitialMeanStress : float = None, LambdaKappa : float = None):
 		if PeakTensileStrength is not None:
 			self._setDoubleProperty("MP_PEAK_TENSILE_STRENGTH", PeakTensileStrength)
 		if PeakFrictionAngle is not None:
@@ -128,8 +124,6 @@ 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:
@@ -144,7 +138,6 @@ class SofteningHardeningModel(PropertyProxy):
 		"DilationAngle" : self.getDilationAngle(), 
 		"ConeDilationType" : self.getConeDilationType(), 
 		"CapType" : self.getCapType(), 
-		"CapHardeningType" : self.getCapHardeningType(), 
 		"InitialMeanStress" : self.getInitialMeanStress(), 
 		"LambdaKappa" : self.getLambdaKappa(), 
 		}

rs2/BaseModel.py

@@ -1,46 +0,0 @@
-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)