midas-civil 0.2.0__tar.gz → 0.2.2__tar.gz

{midas_civil-0.2.0 → midas_civil-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: midas_civil
-Version: 0.2.0
+Version: 0.2.2
 Summary: Python library for MIDAS Civil NX
 Author: Sumit Shekhar
 Author-email: sumit.midasit@gmail.com

{midas_civil-0.2.0 → midas_civil-0.2.2}/midas_civil/_element.py

@@ -231,7 +231,10 @@ class Element:
             _ADD(self)
 
         @staticmethod
-        def SDL(s_loc:list,dir:list,l:float,n:int=1,mat:int=1,sect:int=1,angle:float=0, group = "" , id: int = 0): #CHANGE TO TUPLE
+        def SDL(s_loc:list|Node,dir:list,l:float,n:int=1,mat:int=1,sect:int=1,angle:float=0, group = "" , id: int = 0): #CHANGE TO TUPLE
+                if isinstance(s_loc,Node):
+                    s_loc = (s_loc.X,s_loc.Y,s_loc.Z)
+
                 beam_nodes =[]
                 beam_obj = []
                 s_locc = np.array(s_loc)
@@ -251,7 +254,12 @@ class Element:
                     
 
         @staticmethod
-        def SE(s_loc:list,e_loc:list,n:int=1,mat:int=1,sect:int=1,angle:float=0, group = "" , id: int = 0):
+        def SE(s_loc:list|Node,e_loc:list|Node,n:int=1,mat:int=1,sect:int=1,angle:float=0, group = "" , id: int = 0):
+                if isinstance(s_loc,Node):
+                    s_loc = (s_loc.X,s_loc.Y,s_loc.Z)
+                if isinstance(e_loc,Node):
+                    s_loc = (e_loc.X,e_loc.Y,e_loc.Z)
+
                 beam_nodes =[]
                 beam_obj = []
                 i_loc = np.linspace(s_loc,e_loc,n+1)
@@ -302,7 +310,10 @@ class Element:
             _ADD(self)
 
         @staticmethod
-        def SDL(s_loc:list,dir:list,l:float,n:int=1,mat:int=1,sect:int=1,angle:float=0, group = "" , id: int = 0):
+        def SDL(s_loc:list|Node,dir:list,l:float,n:int=1,mat:int=1,sect:int=1,angle:float=0, group = "" , id: int = 0):
+            if isinstance(s_loc,Node):
+                    s_loc = (s_loc.X,s_loc.Y,s_loc.Z)
+
             beam_nodes =[]
             beam_obj =[]
             s_locc = np.array(s_loc)
@@ -322,7 +333,13 @@ class Element:
                 
 
         @staticmethod
-        def SE(s_loc:list,e_loc:list,n:int=1,mat:int=1,sect:int=1,angle:float=0, group = "" , id: int = 0):
+        def SE(s_loc:list|Node,e_loc:list|Node,n:int=1,mat:int=1,sect:int=1,angle:float=0, group = "" , id: int = 0):
+            
+            if isinstance(s_loc,Node):
+                s_loc = (s_loc.X,s_loc.Y,s_loc.Z)
+            if isinstance(e_loc,Node):
+                s_loc = (e_loc.X,e_loc.Y,e_loc.Z)
+
             beam_nodes =[]
             beam_obj = []
             i_loc = np.linspace(s_loc,e_loc,n+1)

{midas_civil-0.2.0 → midas_civil-0.2.2}/midas_civil/_load.py

@@ -420,45 +420,52 @@ class Load:
 
     #20 Class to add Load to Mass:
     class LoadToMass:
-        """Creates load to mass conversion and converts to JSON format.
-        Example: LoadToMass("Z", ["DL", "LL"], [1.0, 0.5])
+        """
+        Creates load-to-mass conversion entries and converts them to JSON format.
+
+        Example:
+            Load.LoadToMass("Z", ["DL", "LL"], [1.0, 0.5])
+
+        Args:
+            dir (str): 
+                Mass Direction - "X", "Y", "Z", "XY", "YZ", "XZ", "XYZ".
+                If invalid, defaults to "XYZ".
+            load_case (list | str): 
+                List of load case names or a single case name as string.
+            load_factor (list | float, optional): 
+                List of scale factors corresponding to `load_case`.
+                If None or shorter than `load_case`, remaining factors default to 1.0.
+            nodal_load (bool, optional): 
+                Include nodal loads. Defaults to True.
+            beam_load (bool, optional): 
+                Include beam loads. Defaults to True.
+            floor_load (bool, optional): 
+                Include floor loads. Defaults to True.
+            pressure (bool, optional): 
+                Include pressure loads. Defaults to True.
+            gravity (float, optional): 
+                Gravity acceleration. Defaults to 9.806.
         """
         data = []
         
         def __init__(self, dir, load_case, load_factor=None, nodal_load=True, beam_load=True, 
                     floor_load=True, pressure=True, gravity=9.806):
-            """
-            dir (str): Mass Direction - "X", "Y", "Z", "XY", "YZ", "XZ", "XYZ"
-            load_case (list): List of load case names
-            load_factor (list, optional): List of scale factors corresponding to load cases. 
-                                        If None or shorter than load_case, remaining factors default to 1.0
-            nodal_load (bool): Include nodal loads. Defaults to True
-            beam_load (bool): Include beam loads. Defaults to True  
-            floor_load (bool): Include floor loads. Defaults to True
-            pressure (bool): Include pressure loads. Defaults to True
-            gravity (float): Gravity acceleration. Defaults to 9.806
-            """
-            
-            # Validate direction
+
             valid_directions = ["X", "Y", "Z", "XY", "YZ", "XZ", "XYZ"]
             if dir not in valid_directions:
-                dir = "XYZ"  # Default to XYZ if invalid
+                dir = "XYZ"
                 
-            # Ensure load_case is a list
             if not isinstance(load_case, list):
                 load_case = [load_case]
                 
-            # Handle load_factor - ensure it matches load_case length
             if load_factor is None:
                 load_factor = [1.0] * len(load_case)
             elif not isinstance(load_factor, list):
                 load_factor = [load_factor]
                 
-            # Pad load_factor with 1.0 if shorter than load_case
             while len(load_factor) < len(load_case):
                 load_factor.append(1.0)
                 
-            # Check if load cases exist - give warning if not
             for case in load_case:
                 chk = 0
                 for i in Load_Case.cases:
@@ -482,8 +489,7 @@ class Load:
         def json(cls):
             json_data = {"Assign": {}}
             
-            for load_obj in enumerate(cls.data):
-                # Create vLC array with load case names and factors
+            for idx, load_obj in enumerate(cls.data, start=1):
                 vlc_array = []
                 for i, case_name in enumerate(load_obj.LOAD_CASE):
                     vlc_array.append({
@@ -491,7 +497,7 @@ class Load:
                         "FACTOR": load_obj.LOAD_FACTOR[i]
                     })
                 
-                json_data["Assign"]["1"] = {
+                json_data["Assign"][str(idx)] = {
                     "DIR": load_obj.DIR,
                     "bNODAL": load_obj.NODAL,
                     "bBEAM": load_obj.BEAM, 
@@ -500,7 +506,7 @@ class Load:
                     "GRAV": load_obj.GRAVITY,
                     "vLC": vlc_array
                 }
-                
+            
             return json_data
         
         @classmethod
@@ -523,15 +529,13 @@ class Load:
             
             if response != {'message': ''}:
                 for key, item_data in response.get('LTOM', {}).items():
-                    # Extract load cases and factors from vLC array
                     load_cases = []
                     load_factors = []
                     
-                    for lc_item in item_data.get('vLC'):
+                    for lc_item in item_data.get('vLC', []):
                         load_cases.append(lc_item.get('LCNAME'))
                         load_factors.append(lc_item.get('FACTOR'))
                     
-                    # Create LoadToMass object
                     Load.LoadToMass(
                         dir=item_data.get('DIR'),
                         load_case=load_cases,
@@ -543,6 +547,7 @@ class Load:
                         gravity=item_data.get('GRAV')
                     )
 
+
     #-----------------------------------------------------------NodalMass-----------------
     #21NodalMass
 

{midas_civil-0.2.0 → midas_civil-0.2.2}/midas_civil/_tendon.py

@@ -201,7 +201,7 @@ class Tendon:
             Tendon.Property.create()
         if Tendon.Profile.profiles !=[]:
             Tendon.Profile.create()
-        if Tendon.Prestress.load !=[]:
+        if Tendon.Prestress.loads !=[]:
             Tendon.Prestress.create()
 
     class Relaxation:
@@ -880,10 +880,9 @@ class Tendon:
 
 
     class Prestress:
-        """Creates node loads and converts to JSON format.
-        Example: Load_Node(101, "LC1", "Group1", FZ = 10)
+        """Prestress Loading for Tendons.
         """
-        load = []
+        loads = []
         ids = []
         def __init__(self, profile_name, load_case, load_group = "", prestress_type = "STRESS", jack_step = "BEGIN", jack_begin = 0, jack_end=0, grouting_stage = 0, id = 0):
 
@@ -904,7 +903,7 @@ class Tendon:
                 if jack_step not in ['BEGIN' , 'END' , 'BOTH']: jack_step = 'BEGIN'
 
                 self.TDN_ID = 0
-                if id == 0: id = len(Tendon.Prestress.load) + 1
+                if id == 0: id = len(Tendon.Prestress.loads) + 1
                 self.ID = id
             else:
                 self.TDN_ID = -id//100000
@@ -924,14 +923,14 @@ class Tendon:
 
             
 
-            Tendon.Prestress.load.append(self)
+            Tendon.Prestress.loads.append(self)
             Tendon.Prestress.ids.append(self.ID)
             
 
         @classmethod
         def json(cls):
             json = {"Assign": {}}
-            for self in cls.load:
+            for self in cls.loads:
 
                 # Finding Tendon ID
                 tdn_id = self.TDN_ID
@@ -943,7 +942,7 @@ class Tendon:
                             tdn_check=1
                             break
                     if not tdn_check: 
-                        print(f'⚠️   "{self.TDN_NAME}" tendon name is not found for Prestress load application. Prestress load skipped.\n📑  Try Tendon.Profile.sync() to retrieve Profile Names first')
+                        print(f'⚠️   "{self.TDN_NAME}" Tendon name is not found for Prestress load application. Prestress load skipped.\n📑  Try Tendon.Profile.sync() to retrieve Profile Names first')
                         continue
 
 
@@ -973,12 +972,12 @@ class Tendon:
         
         @classmethod
         def delete(cls):
-            cls.load=[]
+            cls.loads=[]
             return MidasAPI("DELETE", "/db/TDPL")
         
         @classmethod
         def sync(cls):
-            cls.load = []
+            cls.loads = []
             a = cls.get()
             if a != {'message': ''}:
                 for i in a['TDPL'].keys():

{midas_civil-0.2.0 → midas_civil-0.2.2}/midas_civil.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: midas_civil
-Version: 0.2.0
+Version: 0.2.2
 Summary: Python library for MIDAS Civil NX
 Author: Sumit Shekhar
 Author-email: sumit.midasit@gmail.com

{midas_civil-0.2.0 → midas_civil-0.2.2}/setup.py

@@ -5,7 +5,7 @@ with open('README.md','r') as f:
 
 
 setup(name='midas_civil',
-    version='0.2.0',
+    version='0.2.2',
     description='Python library for MIDAS Civil NX',
     author='Sumit Shekhar',
     author_email='sumit.midasit@gmail.com',