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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: midas_civil
-Version: 0.2.0
+Version: 0.2.1
 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.1}/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.1}/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.1}/midas_civil.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: midas_civil
-Version: 0.2.0
+Version: 0.2.1
 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.1}/setup.py

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