midas-civil 0.1.5__py3-none-any.whl → 0.1.7__py3-none-any.whl

midas_civil/_element.py

@@ -1,9 +1,15 @@
 from ._mapi import *
 from ._node import *
 from ._group import _add_elem_2_stGroup
+from ._group import _add_node_2_stGroup
 
 import numpy as np
 
+
+
+
+
+
 def _ADD(self):
     """
     Adds an element to the main list. If the ID is 0, it auto-increments.
@@ -37,8 +43,12 @@ def _ADD(self):
     elif isinstance(self._GROUP, list):
         for gpName in self._GROUP:
             _add_elem_2_stGroup(self.ID,gpName)
+            for nd in self.NODE:
+                _add_node_2_stGroup(nd,gpName)
     elif isinstance(self._GROUP, str):
         _add_elem_2_stGroup(self.ID,self._GROUP)
+        for nd in self.NODE:
+            _add_node_2_stGroup(nd,self._GROUP)
             
 
 
@@ -516,10 +526,179 @@ class Element:
             _ADD(self)
 
     
+#-----------------------------------------------Stiffness Scale Factor------------------------------
 
+    class StiffnessScaleFactor:
+    
+        data = []
+        
+        def __init__(self, 
+                    element_id,
+                    area_sf: float = 1.0,
+                    asy_sf: float = 1.0,
+                    asz_sf: float = 1.0,
+                    ixx_sf: float = 1.0,
+                    iyy_sf: float = 1.0,
+                    izz_sf: float = 1.0,
+                    wgt_sf: float = 1.0,
+                    group: str = "",
+                    id: int = None):
+            """
+                element_id: Element ID(s) where scale factor is applied (can be int or list)
+                area_sf: Cross-sectional area scale factor
+                asy_sf: Effective Shear Area scale factor (y-axis)
+                asz_sf: Effective Shear Area scale factor (z-axis)
+                ixx_sf: Torsional Resistance scale factor (x-axis)
+                iyy_sf: Area Moment of Inertia scale factor (y-axis)
+                izz_sf: Area Moment of Inertia scale factor (z-axis)
+                wgt_sf: Weight scale factor
+                group: Group name (default "")
+                id: Scale factor ID (optional, auto-assigned if None)
+            
+            Examples:
+                StiffnessScaleFactor(908, area_sf=0.5, asy_sf=0.6, asz_sf=0.7, 
+                                ixx_sf=0.8, iyy_sf=0.8, izz_sf=0.9, wgt_sf=0.95)
+                
+            """
+            
+            # Check if group exists, create if not
+            if group != "":
+                chk = 0
+                a = [v['NAME'] for v in Group.Boundary.json()["Assign"].values()]
+                if group in a:
+                    chk = 1
+                if chk == 0:
+                    Group.Boundary(group)
+            
+            # Handle element_id as single int or list
+            if isinstance(element_id, (list, tuple)):
+                self.ELEMENT_IDS = list(element_id)
+            else:
+                self.ELEMENT_IDS = [element_id]
+            
+            self.AREA_SF = area_sf
+            self.ASY_SF = asy_sf
+            self.ASZ_SF = asz_sf
+            self.IXX_SF = ixx_sf
+            self.IYY_SF = iyy_sf
+            self.IZZ_SF = izz_sf
+            self.WGT_SF = wgt_sf
+            self.GROUP_NAME = group
+            
+            # Auto-assign ID if not provided
+            if id is None:
+                self.ID = len(Element.StiffnessScaleFactor.data) + 1
+            else:
+                self.ID = id
+            
+            # Add to static list
+            Element.StiffnessScaleFactor.data.append(self)
+        
+        @classmethod
+        def json(cls):
+            """
+            Converts StiffnessScaleFactor data to JSON format
+            """
+            json_data = {"Assign": {}}
+            
+            for scale_factor in cls.data:
+                # Create scale factor item
+                scale_factor_item = {
+                    "ID": scale_factor.ID,
+                    "AREA_SF": scale_factor.AREA_SF,
+                    "ASY_SF": scale_factor.ASY_SF,
+                    "ASZ_SF": scale_factor.ASZ_SF,
+                    "IXX_SF": scale_factor.IXX_SF,
+                    "IYY_SF": scale_factor.IYY_SF,
+                    "IZZ_SF": scale_factor.IZZ_SF,
+                    "WGT_SF": scale_factor.WGT_SF,
+                    "GROUP_NAME": scale_factor.GROUP_NAME
+                }
+                
+                # Assign to each element ID
+                for element_id in scale_factor.ELEMENT_IDS:
+                    if str(element_id) not in json_data["Assign"]:
+                        json_data["Assign"][str(element_id)] = {"ITEMS": []}
+                    
+                    json_data["Assign"][str(element_id)]["ITEMS"].append(scale_factor_item)
+            
+            return json_data
+        
+        @classmethod
+        def create(cls):
+            """
+            Sends all StiffnessScaleFactor data to the API
+            """
+            MidasAPI("PUT", "/db/essf", cls.json())
+        
+        @classmethod
+        def get(cls):
+            """
+            Retrieves StiffnessScaleFactor data from the API
+            """
+            return MidasAPI("GET", "/db/essf")
+        
+        @classmethod
+        def sync(cls):
+            """
+            Updates the StiffnessScaleFactor class with data from the API
+            """
+            cls.data = []
+            response = cls.get()
+            
+            if response != {'message': ''}:
+                processed_ids = set()  # To avoid duplicate processing
+                
+                for element_data in response.get("ESSF", {}).items():
+                    for item in element_data.get("ITEMS", []):
+                        scale_factor_id = item.get("ID", 1)
+                        
+                        # Skip if already processed (for multi-element scale factors)
+                        if scale_factor_id in processed_ids:
+                            continue
+                        
+                        # Find all elements with the same scale factor ID
+                        element_ids = []
+                        for eid, edata in response.get("ESSF", {}).items():
+                            for eitem in edata.get("ITEMS", []):
+                                if eitem.get("ID") == scale_factor_id:
+                                    element_ids.append(int(eid))
+                        
+                        # Create StiffnessScaleFactor object
+                        Element.StiffnessScaleFactor(
+                            element_id=element_ids if len(element_ids) > 1 else element_ids[0],
+                            area_sf=item.get("AREA_SF", 1.0),
+                            asy_sf=item.get("ASY_SF", 1.0),
+                            asz_sf=item.get("ASZ_SF", 1.0),
+                            ixx_sf=item.get("IXX_SF", 1.0),
+                            iyy_sf=item.get("IYY_SF", 1.0),
+                            izz_sf=item.get("IZZ_SF", 1.0),
+                            wgt_sf=item.get("WGT_SF", 1.0),
+                            group=item.get("GROUP_NAME", ""),
+                            id=scale_factor_id
+                        )
+                        
+                        processed_ids.add(scale_factor_id)
+        
+        @classmethod
+        def delete(cls):
+            """
+            Deletes all stiffness scale factors from the database and resets the class.
+            """
+            cls.data = []
+            return MidasAPI("DELETE", "/db/essf")
 
 
 
 
+# ---- GET ELEMENT OBJECT FROM ID ----------
 
+def elemByID(elemID:int) -> Element:
+    ''' Return Element object with the input ID '''
+    for elem in Element.elements:
+        if elem.ID == elemID:
+            return elem
+        
+    print(f'There is no element with ID {elemID}')
+    return None
 

midas_civil/_group.py

@@ -8,18 +8,21 @@ from ._mapi import *
 # ----------- HELPER FUNCTION -----------
     # --------   RETRIEVE NODE / ELEMENT FROM STRUCTURE GROUP -------
 
-def getNode(groupName):
+def nodesInGroup(groupName:str) -> list | int:
     ''' Returns Node ID list in a Structure Group '''
     for i in Group.Structure.Groups:
             if i.NAME == groupName:
                 return i.NLIST
+    print('⚠️   Structure group not found !')
     return []
 
-def getElement(groupName):
+
+def elemsInGroup(groupName:str) -> list:
     ''' Returns Element ID list in a Structure Group '''
     for i in Group.Structure.Groups:
             if i.NAME == groupName:
                 return i.ELIST
+    print('⚠️   Structure group not found !')
     return []
 
 

midas_civil/_load.py

@@ -2,6 +2,28 @@ from ._mapi import *
 from ._model import *
 from ._group import *
 
+
+
+# -----  Extend for list of nodes/elems -----
+
+def _ADD_NodalLoad(self):
+    if isinstance(self.NODE,int):
+        Load.Nodal.data.append(self)
+    elif isinstance(self.NODE,list):
+        for nID in self.NODE:
+            Load.Nodal(nID,self.LCN,self.LDGR,self.FX,self.FY,self.FZ,self.MX,self.MY,self.MZ,self.ID)
+
+
+def _ADD_BeamLoad(self):
+    if isinstance(self.ELEMENT,int):
+        Load.Beam.data.append(self)
+    elif isinstance(self.ELEMENT,list):
+        for eID in self.ELEMENT:
+            Load.Beam(eID,self.LCN,self.LDGR,self.VALUE,self.DIRECTION,self.ID,self.D,self.P,self.CMD,self.TYPE,self.USE_ECCEN,self.USE_PROJECTION,
+                      self.ECCEN_DIR,self.ECCEN_TYPE,self.IECC,self.JECC,self.USE_H,self.I_H,self.J_H)
+
+
+
 #11 Class to define Load Cases:
 class Load_Case:
     """Type symbol (Refer Static Load Case section in the Onine API Manual, Load Case names.  
@@ -74,10 +96,12 @@ class Load:
         Sample: Load_SW("Self-Weight", "Z", -1, "DL")"""
         data = []
         def __init__(self, load_case, dir = "Z", value = -1, load_group = ""):
+
             chk = 0
             for i in Load_Case.cases:
                 if load_case in i.NAME: chk = 1
             if chk == 0: Load_Case("D", load_case)
+            
             if load_group != "":
                 chk = 0
                 a = [v['NAME'] for v in Group.Load.json()["Assign"].values()]
@@ -177,7 +201,9 @@ class Load:
             self.MZ = MZ
             if id == "": id = len(Load.Nodal.data) + 1
             self.ID = id
-            Load.Nodal.data.append(self)
+
+            _ADD_NodalLoad(self)
+            # Load.Nodal.data.append(self)
         
         @classmethod
         def json(cls):
@@ -228,9 +254,9 @@ class Load:
     #19 Class to define Beam Loads:
     class Beam:
         data = []
-        def __init__(self, element: int, load_case: str, value: float, load_group: str = "", direction: str = "GZ",
+        def __init__(self, element, load_case: str, load_group: str = "", value: float=0, direction: str = "GZ",
             id = "", D = [0, 1, 0, 0], P = [0, 0, 0, 0], cmd = "BEAM", typ = "UNILOAD", use_ecc = False, use_proj = False,
-            eccn_dir = "LZ", eccn_type = 1, ieccn = 0, jeccn = 0.0000195, adnl_h = False, adnl_h_i = 0, adnl_h_j = 0.0000195): 
+            eccn_dir = "LZ", eccn_type = 1, ieccn = 0, jeccn = 0, adnl_h = False, adnl_h_i = 0, adnl_h_j = 0): 
             """
             element: Element Number 
             load_case (str): Load case name
@@ -276,7 +302,7 @@ class Load:
             if cmd not in ("BEAM", "LINE", "TYPICAL"): cmd = "BEAM"
             if typ not in ("CONLOAD", "CONMOMENT", "UNILOAD", "UNIMOMENT","PRESSURE"): typ = "UNILOAD"
             if use_ecc == False:
-                if ieccn != 0 or jeccn != 0.0000195: use_ecc = True
+                if ieccn != 0 or jeccn != 0: use_ecc = True
             self.ELEMENT = element
             self.LCN = load_case
             self.LDGR = load_group
@@ -289,7 +315,7 @@ class Load:
             self.ECCEN_TYPE = eccn_type
             self.ECCEN_DIR = eccn_dir
             self.IECC = ieccn
-            if jeccn == 0.0000195:
+            if jeccn == 0:
                 self.JECC = 0
                 self.USE_JECC = False
             else:
@@ -299,7 +325,7 @@ class Load:
             self.P = P
             self.USE_H = adnl_h
             self.I_H = adnl_h_i
-            if adnl_h == 0.0000195:
+            if adnl_h == 0:
                 self.USE_JH = False
                 self.J_H = 0
             else:
@@ -309,7 +335,8 @@ class Load:
             if id == "":
                 id = len(Load.Beam.data) + 1
             self.ID = id
-            Load.Beam.data.append(self)
+            _ADD_BeamLoad(self)
+            # Load.Beam.data.append(self)
         
         @classmethod
         def json(cls):
@@ -368,23 +395,23 @@ class Load:
                 for i in a['BMLD'].keys():
                     for j in range(len(a['BMLD'][i]['ITEMS'])):
                         if a['BMLD'][i]['ITEMS'][j]['USE_ECCEN'] == True and a['BMLD'][i]['ITEMS'][j]['USE_ADDITIONAL'] == True:
-                            Load.Beam(i,a['BMLD'][i]['ITEMS'][j]['LCNAME'], a['BMLD'][i]['ITEMS'][j]['P'][0], a['BMLD'][i]['ITEMS'][j]['GROUP_NAME'],
+                            Load.Beam(i,a['BMLD'][i]['ITEMS'][j]['LCNAME'], a['BMLD'][i]['ITEMS'][j]['GROUP_NAME'], a['BMLD'][i]['ITEMS'][j]['P'][0],
                                 a['BMLD'][i]['ITEMS'][j]['DIRECTION'], a['BMLD'][i]['ITEMS'][j]['ID'], a['BMLD'][i]['ITEMS'][j]['D'], a['BMLD'][i]['ITEMS'][j]['P'],
                                 a['BMLD'][i]['ITEMS'][j]['CMD'], a['BMLD'][i]['ITEMS'][j]['TYPE'], a['BMLD'][i]['ITEMS'][j]['USE_ECCEN'], a['BMLD'][i]['ITEMS'][j]['USE_PROJECTION'],
                                 a['BMLD'][i]['ITEMS'][j]['ECCEN_DIR'], a['BMLD'][i]['ITEMS'][j]['ECCEN_TYPE'], a['BMLD'][i]['ITEMS'][j]['I_END'], a['BMLD'][i]['ITEMS'][j]['J_END'],
                                 a['BMLD'][i]['ITEMS'][j]['USE_ADDITIONAL'], a['BMLD'][i]['ITEMS'][j]['ADDITIONAL_I_END'], a['BMLD'][i]['ITEMS'][j]['ADDITIONAL_J_END'])
                         elif a['BMLD'][i]['ITEMS'][j]['USE_ECCEN'] == False and a['BMLD'][i]['ITEMS'][j]['USE_ADDITIONAL'] == True:
-                            Load.Beam(i,a['BMLD'][i]['ITEMS'][j]['LCNAME'], a['BMLD'][i]['ITEMS'][j]['P'][0], a['BMLD'][i]['ITEMS'][j]['GROUP_NAME'],
+                            Load.Beam(i,a['BMLD'][i]['ITEMS'][j]['LCNAME'], a['BMLD'][i]['ITEMS'][j]['GROUP_NAME'], a['BMLD'][i]['ITEMS'][j]['P'][0],
                                 a['BMLD'][i]['ITEMS'][j]['DIRECTION'], a['BMLD'][i]['ITEMS'][j]['ID'], a['BMLD'][i]['ITEMS'][j]['D'], a['BMLD'][i]['ITEMS'][j]['P'],
                                 a['BMLD'][i]['ITEMS'][j]['CMD'], a['BMLD'][i]['ITEMS'][j]['TYPE'], a['BMLD'][i]['ITEMS'][j]['USE_ECCEN'], a['BMLD'][i]['ITEMS'][j]['USE_PROJECTION'],
                                 adnl_h = a['BMLD'][i]['ITEMS'][j]['USE_ADDITIONAL'], adnl_h_i = a['BMLD'][i]['ITEMS'][j]['ADDITIONAL_I_END'], adnl_h_j = a['BMLD'][i]['ITEMS'][j]['ADDITIONAL_J_END'])
                         elif a['BMLD'][i]['ITEMS'][j]['USE_ECCEN'] == True and a['BMLD'][i]['ITEMS'][j]['USE_ADDITIONAL'] == False:
-                            Load.Beam(i,a['BMLD'][i]['ITEMS'][j]['LCNAME'], a['BMLD'][i]['ITEMS'][j]['P'][0], a['BMLD'][i]['ITEMS'][j]['GROUP_NAME'],
+                            Load.Beam(i,a['BMLD'][i]['ITEMS'][j]['LCNAME'], a['BMLD'][i]['ITEMS'][j]['GROUP_NAME'], a['BMLD'][i]['ITEMS'][j]['P'][0],
                                 a['BMLD'][i]['ITEMS'][j]['DIRECTION'], a['BMLD'][i]['ITEMS'][j]['ID'], a['BMLD'][i]['ITEMS'][j]['D'], a['BMLD'][i]['ITEMS'][j]['P'],
                                 a['BMLD'][i]['ITEMS'][j]['CMD'], a['BMLD'][i]['ITEMS'][j]['TYPE'], a['BMLD'][i]['ITEMS'][j]['USE_ECCEN'], a['BMLD'][i]['ITEMS'][j]['USE_PROJECTION'],
                                 a['BMLD'][i]['ITEMS'][j]['ECCEN_DIR'], a['BMLD'][i]['ITEMS'][j]['ECCEN_TYPE'], a['BMLD'][i]['ITEMS'][j]['I_END'], a['BMLD'][i]['ITEMS'][j]['J_END'])
                         else:
-                            Load.Beam(i,a['BMLD'][i]['ITEMS'][j]['LCNAME'], a['BMLD'][i]['ITEMS'][j]['P'][0], a['BMLD'][i]['ITEMS'][j]['GROUP_NAME'],
+                            Load.Beam(i,a['BMLD'][i]['ITEMS'][j]['LCNAME'], a['BMLD'][i]['ITEMS'][j]['GROUP_NAME'],a['BMLD'][i]['ITEMS'][j]['P'][0],
                                 a['BMLD'][i]['ITEMS'][j]['DIRECTION'], a['BMLD'][i]['ITEMS'][j]['ID'], a['BMLD'][i]['ITEMS'][j]['D'], a['BMLD'][i]['ITEMS'][j]['P'],
                                 a['BMLD'][i]['ITEMS'][j]['CMD'], a['BMLD'][i]['ITEMS'][j]['TYPE'], a['BMLD'][i]['ITEMS'][j]['USE_ECCEN'], a['BMLD'][i]['ITEMS'][j]['USE_PROJECTION'])
   
@@ -521,12 +548,13 @@ class Load:
 
     class NodalMass:
         """Creates nodal mass and converts to JSON format.
-        Example: NodalMass(1.5, 2.0, 3.0, 0.1, 0.2, 0.3)
+        Example: NodalMass(1, 1.5, 2.0, 3.0, 0.1, 0.2, 0.3)
         """
         data = []
-        
-        def __init__(self, mX, mY=0, mZ=0, rmX=0, rmY=0, rmZ=0):
+
+        def __init__(self, node_id, mX, mY=0, mZ=0, rmX=0, rmY=0, rmZ=0):
             """
+            node_id (int): Node ID where the mass is applied (Required)
             mX (float): Translational Lumped Mass in GCS X-direction (Required)
             mY (float): Translational Lumped Mass in GCS Y-direction. Defaults to 0
             mZ (float): Translational Lumped Mass in GCS Z-direction. Defaults to 0
@@ -534,6 +562,7 @@ class Load:
             rmY (float): Rotational Mass Moment of Inertia about GCS Y-axis. Defaults to 0
             rmZ (float): Rotational Mass Moment of Inertia about GCS Z-axis. Defaults to 0
             """
+            self.NODE_ID = node_id
             self.MX = mX
             self.MY = mY
             self.MZ = mZ
@@ -547,10 +576,8 @@ class Load:
         def json(cls):
             json_data = {"Assign": {}}
             
-            # Use the last added mass data (or first if only one exists)
-            if cls.data:
-                mass_obj = cls.data[-1]  # Get the most recent mass object
-                json_data["Assign"]["1"] = {
+            for mass_obj in cls.data:
+                json_data["Assign"][mass_obj.NODE_ID] = {
                     "mX": mass_obj.MX,
                     "mY": mass_obj.MY,
                     "mZ": mass_obj.MZ,
@@ -567,23 +594,24 @@ class Load:
         
         @classmethod
         def get(cls):
-            return MidasAPI("GET", "/db/nmas")
+            MidasAPI("GET", "/db/nmas")
         
         @classmethod
         def delete(cls):
             cls.data = []
-            return MidasAPI("DELETE", "/db/nmas")
+            MidasAPI("DELETE", "/db/nmas")
         
         @classmethod
         def sync(cls):
             cls.data = []
             response = cls.get()
             
-            if response != {'message': ''}:
+            if response and response != {'message': ''}:
                 nmas_data = response.get('NMAS', {})
-                if "1" in nmas_data:
-                    item_data = nmas_data["1"]
+        
+                for node_id, item_data in nmas_data.items():
                     Load.NodalMass(
+                        node_id=int(node_id),
                         mX=item_data.get('mX'),
                         mY=item_data.get('mY'),
                         mZ=item_data.get('mZ'),

midas_civil/_mapi.py

@@ -11,17 +11,63 @@ def Midas_help():
 
 
 
-class MAPI_PRODUCT:
-    product = "civil"
+class MAPI_COUNTRY:
+    
+    country = "US"
+
+    def __init__(self,country:str):
+        ''' Define Civil NX country to automatically set Base URL and MAPI Key from registry.
+        ```
+        MAPI_COUNTRY('US')
+        MAPI_COUNTRY('CN')
+
+        ```
+        '''
+        if country.lower() == 'cn':
+            MAPI_COUNTRY.country = 'CN'
+        else:
+            MAPI_COUNTRY.country = 'US'
+        
+        MAPI_BASEURL.set_url()
+        MAPI_KEY.get_key()
+
+
+class MAPI_BASEURL:
+    baseURL = "https://moa-engineers.midasit.com:443/civil"
+    
+    def __init__(self, baseURL:str):
+        ''' Define the Base URL for API connection.
+        ```
+        MAPI_BASEURL('https://moa-engineers.midasit.com:443/civil')
+        ```
+        '''
+        MAPI_BASEURL.baseURL = baseURL
+        
+    @classmethod
+    def get_url(cls):
+        return MAPI_BASEURL.baseURL
+    
+    @classmethod
+    def set_url(cls):
+        try:
+            key_path = f"Software\\MIDAS\\CVLwNX_{MAPI_COUNTRY.country}\\CONNECTION"  
+            registry_key = winreg.OpenKey(winreg.HKEY_CURRENT_USER, key_path, 0, winreg.KEY_READ)
+            url_reg = winreg.QueryValueEx(registry_key, "URI")
+            url_reg_key = url_reg[0]
+
+            port_reg = winreg.QueryValueEx(registry_key, "PORT")
+            port_reg_key = port_reg[0]
 
-    def __init__(self,product:str):
-        """Product 'civil' or 'gen'"""
-        if product.lower() == 'gen':
-            MAPI_PRODUCT.product = 'gen'
+            url_comb = f'https://{url_reg_key}:{port_reg_key}/civil'
 
+            print(f' 🌐   BASE URL is taken from Registry entry.  >>  {url_comb}')
+            MAPI_BASEURL(url_comb)
+        except:
+            print(" 🌐   BASE URL is not defined. Click on Apps > API Settings to copy the BASE URL Key.\nDefine it using MAPI_BASEURL('https://moa-engineers.midasit.com:443/civil')")
+            sys.exit(0)
 
 class MAPI_KEY:
-    """MAPI key from Civil NX.\n\nEg: MAPI_Key("eadsfjaks568wqehhf.ajkgj345")"""
+    """MAPI key from Civil NX.\n\nEg: MAPI_Key("eadsfjaks568wqehhf.ajkgj345qfhh")"""
     data = ""
     
     def __init__(self, mapi_key:str):
@@ -31,14 +77,14 @@ class MAPI_KEY:
     def get_key(cls):
         if MAPI_KEY.data == "":
             try:
-                key_path = r"Software\\MIDAS\\CVLwNX_US\\CONNECTION"  
+                key_path = f"Software\\MIDAS\\CVLwNX_{MAPI_COUNTRY.country}\\CONNECTION"  
                 registry_key = winreg.OpenKey(winreg.HKEY_CURRENT_USER, key_path, 0, winreg.KEY_READ)
                 value = winreg.QueryValueEx(registry_key, "Key")
                 my_key = value[0]
-                print(' 🔑  MAPI KEY is not defined. MAPI-KEY is taken from Registry entry.')
+                print(f' 🔑   MAPI-KEY is taken from Registry entry.  >>  {my_key[:35]}...')
                 MAPI_KEY(my_key)
             except:
-                print(f"🔑   MAPI KEY is not defined. Click on Apps > API Settings to copy the MAPI Key.")
+                print(f"🔑   MAPI KEY is not defined. Click on Apps > API Settings to copy the MAPI Key.\n Define it using MAPI_KEY('xxxx')")
                 sys.exit(0)
         else:
             my_key = MAPI_KEY.data
@@ -57,7 +103,7 @@ def MidasAPI(method:str, command:str, body:dict={})->dict:
                 # Create a node
                 MidasAPI("PUT","/db/NODE",{{"Assign":{{"1":{{'X':0, 'Y':0, 'Z':0}}}}}})"""
     
-    base_url = f"https://moa-engineers.midasit.com:443/{MAPI_PRODUCT.product}"
+    base_url = MAPI_BASEURL.baseURL
     mapi_key = MAPI_KEY.get_key()
 
     url = base_url + command

midas_civil/_model.py

@@ -11,6 +11,7 @@ from ._material import *
 from ._thickness import *
 
 from ._tendon import *
+from ._result import *
 
 class Model:
 
@@ -242,6 +243,8 @@ class Model:
         Load.create()
         Tendon.create()
 
+        LoadCombination.create()
+
 
 
 

midas_civil/_node.py

@@ -12,7 +12,10 @@ def dist_tol(a,b):
 def cell(point,size=1): #SIZE OF GRID
     return (int(point.X//size),int(point.Y//size),int(point.Z//size))
 
-#-- NEW SYSTEM
+
+# -------- FUNCTIONS ARE DEFINED BELOW TO RECOGNISE NODE CLASS ----------------
+
+
 
 #5 Class to create nodes
 class Node:
@@ -161,6 +164,16 @@ class Node:
 
 
 
+# ---- GET NODE OBJECT FROM ID ----------
+
+def nodeByID(nodeID:int) -> Node:
+    ''' Return Node object with the input ID '''
+    for node in Node.nodes:
+        if node.ID == nodeID:
+            return node
+        
+    print(f'There is no node with ID {nodeID}')
+    return None
 
 
 

midas_civil/_result.py

@@ -111,7 +111,7 @@ class LoadCombination:
     @classmethod
     def create(cls, classification = "All"):
         if len(LoadCombination.data) == 0:
-            print("No Load Combinations defined!  Define the load combination using the 'LoadCombination' class before creating these in the model.")
+            # print("No Load Combinations defined!  Define the load combination using the 'LoadCombination' class before creating these in the model.")
             return
         if classification not in LoadCombination.valid:
             print(f'"{classification}" is not a valid input.  It is changed to "General".')