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

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

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

{midas_civil-0.1.9 → 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.1.9 → midas_civil-0.2.1}/midas_civil/_movingload.py

@@ -4,7 +4,7 @@ from ._model import *
 
 # ----------------------------------------------------------------------------------------------------------------
 
-def El_list(Start_id: int, End_id: int) -> list:
+def _El_list(Start_id: int, End_id: int) -> list:
 
     return list(range(Start_id, End_id + 1))
 
@@ -330,7 +330,7 @@ class MovingLoad:
 
             data = {"Assign": {}}
             for lane in lanes_list:
-                E_list = El_list(lane.Elment_start, lane.Elemnt_end)
+                E_list = _El_list(lane.Elment_start, lane.Elemnt_end)
                 Load_Dist = "CROSS" if lane.Group_Name else "LANE"
                 opt_auto_lane = lane.width > 0 or lane.opt_width > 0
 

{midas_civil-0.1.9 → midas_civil-0.2.1}/midas_civil/_section.py

@@ -1,4 +1,20 @@
 from ._mapi import *
+import numpy as np
+
+
+def _poly_dir(poly,rot='CCW'):
+    outer_cg = np.mean(poly,axis=0)
+    outer_t = np.subtract(poly,outer_cg)
+    dir = 0
+    for i in range(len(poly)-1):
+        dir+=outer_t[i][0]*outer_t[i+1][1]-outer_t[i][1]*outer_t[i+1][0]
+    if dir < 0:
+        poly.reverse()
+    
+    if rot == 'CW':
+        poly.reverse()
+
+    return poly
 
 
 
@@ -104,6 +120,66 @@ def _Obj2JS(sect):
                     "JOINT": [sect.J1,sect.JL1,sect.JL2,sect.JL3,sect.JL4,sect.JR1,sect.JR2,sect.JR3,sect.JR4]
                 }
             }
+        elif sect.SHAPE in ['VALUE']:
+            js =  {
+                    "SECTTYPE": "PSC",
+                    "SECT_NAME": sect.NAME,
+                    "CALC_OPT": True,
+                    "SECT_BEFORE": {
+                        "SHAPE": "VALU",
+                        "SECT_I": {
+                            "SECT_NAME": "",
+                            "vSIZE": [0.1, 0.1, 0.1, 0.1],
+                            "OUTER_POLYGON": [
+                                {
+                                    "VERTEX": [
+                                        {"X": 5, "Y": 5},
+                                        {"X": -5, "Y": 5}
+                                    ]
+                                }
+                            ]
+                        },
+                        "SHEAR_CHK": True,
+                        "SHEAR_CHK_POS": [[0.1, 0, 0.1], [0, 0, 0]],
+                        "USE_AUTO_QY": [[True, True, True], [False, False, False]],
+                        "WEB_THICK": [0, 0],
+                        "USE_WEB_THICK_SHEAR": [[True, True, True], [False, False, False]]
+                    }
+                }
+            
+            v_list = []
+            for i in sect.OUTER_POLYGON:
+                v_list.append({"X":i[0],"Y":i[1]})
+            js["SECT_BEFORE"]["SECT_I"]["OUTER_POLYGON"][0]["VERTEX"] =v_list
+
+            
+
+            if sect.N_INNER_POLYGON > 0 :
+
+                js["SECT_BEFORE"]["SECT_I"]["INNER_POLYGON"]= []
+
+                mult_ver = []
+                for n in range(sect.N_INNER_POLYGON):
+                    vi_list = []
+
+                    js["SECT_BEFORE"]["SECT_I"]["INNER_POLYGON"]= [
+                        {
+                            "VERTEX": []
+                        }
+                    ]
+                    for i in sect.INNER_POLYGON[n]:
+                        vi_list.append({"X":i[0],"Y":i[1]})
+
+                    ver_json = {"VERTEX": vi_list}
+                    mult_ver.append(ver_json)
+
+                js["SECT_BEFORE"]["SECT_I"]["INNER_POLYGON"] = mult_ver
+
+
+
+
+
+
 
     elif sect.TYPE == 'COMPOSITE':
         if sect.SHAPE in ['CI']:
@@ -573,6 +649,51 @@ class Section:
 
                 _SectionADD(self)
 
+        class Value(_common):
+            def __init__(self,Name:str,
+                            OuterPolygon:list,InnerPolygon:list=[],
+                            Offset:Offset=Offset.CC(),useShear=True,use7Dof=False,id:int=0):
+                
+                '''
+                    Outer Polygon -> List of points ; Last input is different from first
+                        [(0,0),(1,0),(1,1),(0,1)]
+                    Inner Polygon -> List of points ; Last input is different from first
+                        Only one inner polygon
+                '''
+                
+                self.ID = id
+                self.NAME = Name
+                self.SHAPE = 'VALUE'
+                self.TYPE = 'PSC'
+
+                self.OFFSET = Offset
+                self.USESHEAR = bool(useShear)
+                self.USE7DOF = bool(use7Dof)
+
+
+                self.OUTER_POLYGON = _poly_dir(OuterPolygon)
+                self.INNER_POLYGON = []
+                self.N_INNER_POLYGON = 0
+
+                temp_arr = [] 
+
+                # Finding no. of internal polygons
+                if InnerPolygon != []:
+                    if not isinstance(InnerPolygon[0][0],(int,float)):
+                        self.N_INNER_POLYGON = len(InnerPolygon)
+                        temp_arr = InnerPolygon 
+                        
+                    else:
+                        temp_arr.append(InnerPolygon) #Convert to list
+                        self.N_INNER_POLYGON = 1
+
+                for i in range(len(temp_arr)):
+                    self.INNER_POLYGON.append(_poly_dir(temp_arr[i],'CW'))
+
+
+                _SectionADD(self) 
+
+
     class Composite:
         class PSCI(_common):
 

{midas_civil-0.1.9 → 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.1.9 → midas_civil-0.2.1}/midas_civil.egg-info/PKG-INFO

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

{midas_civil-0.1.9 → midas_civil-0.2.1}/setup.py

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