midas-civil 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

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/_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.dist-info → midas_civil-0.2.1.dist-info}/METADATA

@@ -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.dist-info → midas_civil-0.2.1.dist-info}/RECORD

@@ -2,7 +2,7 @@ midas_civil/__init__.py,sha256=t0XkmZiEBYodUkU2gJWLQmqrpQdZc8ikPM3Z0xrSVPg,575
 midas_civil/_boundary.py,sha256=s5mgZIc1b0-P7AdWuaPAQ5cIbHL5CR1YRKJA7KE4W_U,32958
 midas_civil/_construction.py,sha256=q9C3gGdvky5t7jCDzd6lBRv6pm8cMycI91xfkgDV37Y,40673
 midas_civil/_construction_backup.py,sha256=Pj7V-NYCkkT-aMjKXfs1jKa9klsGh48UXDLwn3BLYTY,18225
-midas_civil/_element.py,sha256=4IjJSlsXMr2llv7gC66KBxPoikt9rWbwGBePMaH9gYg,26935
+midas_civil/_element.py,sha256=hlH6NZfSBOrKQO7R22wZYbmLA20MB8rX7g_Td6G4mgo,27544
 midas_civil/_group.py,sha256=9EsPGW8lWpzJBW25Gfd-G5S_9oP8ER3zNzeqknDsfmw,11480
 midas_civil/_load.py,sha256=kPDcgyd-D_HD59ABQuYmry92ruCovdYos65g06wMq84,30360
 midas_civil/_mapi.py,sha256=Fabn3QX6OHJeV_s_01KMvOwkSye0kfgpiUUgPplAzxA,4597
@@ -16,12 +16,12 @@ midas_civil/_result_extract.py,sha256=J-9eeWDbFeaDL-C41TAynYuooiHYsayAe3WbfGRO8s
 midas_civil/_section.py,sha256=-mpGOYceus_dURE80lsGExSBDDpqDKqsNjBeOE3kZEM,36433
 midas_civil/_settlement.py,sha256=U7lJYBqGbuCv7qziEEznDyA4M_SCjJeIjc0lDeGfE4Y,5125
 midas_civil/_temperature.py,sha256=EfvivFWfxyM8yFCvWJgXLhaCofGwLKEBGFUuW8yHnfQ,24209
-midas_civil/_tendon.py,sha256=Qt3mPawTT1qeBEqLupUzQKlrT-2mpJ9Togj9rF-K80s,33463
+midas_civil/_tendon.py,sha256=mXNJeLikFsBpgn8u9fED2qx9oqnKh3XtIpYwp3moEfk,33395
 midas_civil/_thickness.py,sha256=4xQsLA3Q_gIGCwLc_glFmiErdWdQUSwhlEhJ_IPJseA,3248
 midas_civil/_utils.py,sha256=eymiqO8KaTKdhVY3saebqNS0BbUUmGmgw3-ELKqew0A,2611
 midas_civil/_view.py,sha256=o7rkfoQzmgAb3dT0ujPIQLVwVlveo3rMRIbZU1UosZo,849
-midas_civil-0.2.0.dist-info/licenses/LICENSE,sha256=zrL4RwZC4rb-by_ZHKXwKdIwcs6ATy59TPZ9HxPHCrs,1071
-midas_civil-0.2.0.dist-info/METADATA,sha256=ghutGORe9iMlEhGTgd_BAsbUUPIZTCuCXR1DcmunLOM,1709
-midas_civil-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-midas_civil-0.2.0.dist-info/top_level.txt,sha256=_NFmrlN5V9OxJ-PAO4s_om8OA8uupXho3QqZcSsnbuI,12
-midas_civil-0.2.0.dist-info/RECORD,,
+midas_civil-0.2.1.dist-info/licenses/LICENSE,sha256=zrL4RwZC4rb-by_ZHKXwKdIwcs6ATy59TPZ9HxPHCrs,1071
+midas_civil-0.2.1.dist-info/METADATA,sha256=8-47-vWOP5-EPDzO4K4r9Am0nEFhZLSPbH5XlXntSgQ,1709
+midas_civil-0.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+midas_civil-0.2.1.dist-info/top_level.txt,sha256=_NFmrlN5V9OxJ-PAO4s_om8OA8uupXho3QqZcSsnbuI,12
+midas_civil-0.2.1.dist-info/RECORD,,