9.3 Deployment

.gitignore

@@ -5,7 +5,6 @@
 *.exe
 *.o
 *.so
-*.dll
 
 # Packages #
 ############

README.md

@@ -9,14 +9,6 @@ This toolkit allows interoperability between the BHoM and SAP2000. Enables creat
 ### Known Versions of Software Supported
 The adapter is intended to support SAP2000 version 21 and all future versions. It is currently tested on version 23 exclusively.
 
-### Net runtime issues
-
-There are currently some internal failures in the SAP2000 API when called in a NET Core environment. For this reason, running the ETABSAdapter in runtimes above NET4 is disabled.
-
-If you are using the SAP2000 Adapter with Grasshopper in Rhino 8 you can change the runtime used by Rhino to framework. To do this, please see this link: https://www.rhino3d.com/en/docs/guides/netcore/#to-change-rhino-to-always-use-net-framework
-
-A fix to allow for higher net runtimes is being worked on.
-
 ### Documentation
 For more information about functionality see [Object Relation Table](https://github.com/BHoM/SAP2000_Toolkit/wiki/BHoM-SAP2000-Object-Relations)
 

SAP2000_Adapter/CRUD/Create/Bar.cs

@@ -70,20 +70,20 @@ private bool CreateObject(Bar bhBar)
                 return false;
             }
 
-            // Set AdapterID
-            if (name != bhBar.Name & bhBar.Name != "")
-                Engine.Base.Compute.RecordNote($"Bar {bhBar.Name} was assigned SAP2000_id of {name}");
+            // Assign the Unique Name to the SAP2000 Element
+            string newName = SetUniqueName(bhBar, name);
+
+            if (newName == null) return false;
 
             string guid = null;
-            m_model.FrameObj.GetGUID(name, ref guid);
+            m_model.FrameObj.GetGUID(newName, ref guid);
 
-            SAP2000Id sap2000IdFragment = new SAP2000Id { Id = name, PersistentId = guid };
+            SAP2000Id sap2000IdFragment = new SAP2000Id { Id = newName, PersistentId = guid };
             bhBar.SetAdapterId(sap2000IdFragment);
 
             // Set Properties
-            SetObject(bhBar);
+            return SetObject(bhBar);
 
-            return true;
         }
 
         /***************************************************/

SAP2000_Adapter/CRUD/Create/Node.cs

@@ -55,20 +55,20 @@ private bool CreateObject(Node bhNode)
                 return false;
             }
 
-            // Set Adapter ID
-            if (name != bhNode.Name & bhNode.Name != "")
-                Engine.Base.Compute.RecordNote($"Node {bhNode.Name} was assigned SAP2000_id of {name}");
+            // Assign the Unique Name to the SAP2000 Element
+            string newName = SetUniqueName(bhNode, name);
+
+            if (newName == null) return false;
 
+            // Set Adapter ID
             string guid = null;
-            m_model.PointObj.GetGUID(name, ref guid);
+            m_model.PointObj.GetGUID(newName, ref guid);
 
-            SAP2000Id sap2000IdFragment = new SAP2000Id { Id = name, PersistentId = guid };
+            SAP2000Id sap2000IdFragment = new SAP2000Id { Id = newName, PersistentId = guid };
             bhNode.SetAdapterId(sap2000IdFragment);
 
             // Set Properties
-            SetObject(bhNode);            
-
-            return true;            
+            return SetObject(bhNode);                      
         }
 
         /***************************************************/

SAP2000_Adapter/CRUD/Create/Panel.cs

@@ -67,17 +67,18 @@ private bool CreateObject(Panel bhPanel)
                 return false;
             }
 
-            // Set AdapterID
-            if (name != bhPanel.Name & bhPanel.Name != "")
-                Engine.Base.Compute.RecordNote($"Panel {bhPanel.Name} was assigned SAP2000_id of {name}.");
+            // Assign the Unique Name to the SAP2000 Element
+            string newName = SetUniqueName(bhPanel, name);
+
+            if (newName == null) return false;
 
+            // Set AdapterID
             string guid = null;
-            m_model.AreaObj.GetGUID(name, ref guid);
-            SAP2000Id sap2000IdFragment = new SAP2000Id{Id = name, PersistentId = guid};
+            m_model.AreaObj.GetGUID(newName, ref guid);
+            SAP2000Id sap2000IdFragment = new SAP2000Id{Id = newName, PersistentId = guid};
             bhPanel.SetAdapterId(sap2000IdFragment);
             // Set Properties
-            SetObject(bhPanel);
-            return true;
+            return SetObject(bhPanel);
         }
 
         /***************************************************/

SAP2000_Adapter/CRUD/Create/RigidLink.cs

@@ -24,6 +24,7 @@
 using BH.oM.Adapters.SAP2000;
 using BH.oM.Structure.Elements;
 using System.Collections.Generic;
+using System.ComponentModel;
 
 namespace BH.Adapter.SAP2000
 {
@@ -86,13 +87,59 @@ private bool CreateObject(RigidLink bhLink)
                 }
             }
 
-            sap2000id.Id = linkIds;
+            // Assign the Unique Name to the SAP2000 Element
+            List<string> newLinkNames = SetUniqueName(bhLink, linkIds);
+
+            if (newLinkNames == null) return false;
+
+            sap2000id.Id = newLinkNames;
             bhLink.SetAdapterId(sap2000id);
 
             return true;
         }
 
         /***************************************************/
+
+        [Description("Concatenates the last 7 characters of the SAP2000 Element GUID and the Link Name to get the Unique Name to assign to the SAP2000 Element.")]
+        private List<string> SetUniqueName(RigidLink bhLink, List<string> names)
+        {
+
+            int ret01, ret02;
+            string guid = null;
+            string tempLinkName = "";
+            List<string> newLinkNames = new List<string>();
+
+            foreach (string name in names)
+            {
+
+                /* 1. GET THE SAP2000 ELEMENT GUID */
+                tempLinkName = "";
+                ret01 = m_model.LinkObj.GetGUID(name, ref guid);
+
+                /* 2. CREATE THE NEW UNIQUE NAME */
+                if (bhLink.Name == "")
+                {
+                    tempLinkName = guid.Substring(guid.Length - 7);
+                }
+                else
+                {
+                    tempLinkName = bhLink.Name + "::" + guid.Substring(guid.Length - 7);
+                }
+
+                /* 3. ASSIGN THE NEW UNIQUE NAME TO THE SAP2000 ELEMENT */
+                ret02 = m_model.LinkObj.ChangeName(name, tempLinkName);
+
+                /* 4. ADD THE NEW NAME TO THE LIST */
+                newLinkNames.Add(tempLinkName);
+
+                if (!(ret01 == 0 && ret02 == 0)) return null;
+
+            }
+
+            return newLinkNames;
+        }
+
+        /***************************************************/
     }
 }
 

SAP2000_Adapter/CRUD/Create/_ICreate.cs

@@ -20,21 +20,22 @@
  * along with this code. If not, see <https://www.gnu.org/licenses/lgpl-3.0.html>.      
  */
 
+using BH.oM.Adapter;
+using BH.oM.Adapters.SAP2000;
+using BH.oM.Analytical;
 using BH.oM.Base;
 using BH.oM.Dimensional;
+using BH.oM.Structure.Constraints;
 using BH.oM.Structure.Elements;
 using BH.oM.Structure.Loads;
-using BH.oM.Structure.Constraints;
+using BH.oM.Structure.MaterialFragments;
 using BH.oM.Structure.SectionProperties;
 using BH.oM.Structure.SurfaceProperties;
-using BH.oM.Structure.MaterialFragments;
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
-using BH.oM.Analytical;
-using BH.oM.Adapter;
-using BH.oM.Adapters.SAP2000;
 
 namespace BH.Adapter.SAP2000
 {
@@ -46,16 +47,26 @@ public partial class SAP2000Adapter
 
         protected override bool ICreate<T>(IEnumerable<T> objects, ActionConfig actionConfig)
         {
+            bool success = true;
+
             this.SAPPushConfig = actionConfig as SAP2000PushConfig;
 
+            if (!objects.Any()) //Return if no objects
+                return true;
+
             if (typeof(BH.oM.Base.IBHoMObject).IsAssignableFrom(typeof(T)))
             {
-                return (CreateCollection(objects));
+                success = CreateCollection(objects);
             }
             else
             {
-                return false;
+                success = false;
             }
+
+            // Refresh the view to ensure that the newly created objects are displayed correctly
+            m_model.View.RefreshView(0, false);
+
+            return success;
         }
 
         /***************************************************/
@@ -82,6 +93,41 @@ private bool CreateObject(IBHoMObject obj)
         }
 
         /***************************************************/
+
+        [Description("Concatenates the the BHoM Object Name and the last 7 characters of the SAP2000 Element GUID to get the Unique Name to assign to the SAP2000 Element.")]
+        private string SetUniqueName(BHoMObject obj, string name)
+        {
+            /* 1. CHECK OBJECT TYPE IS ACCEPTABLE */
+            if (!(obj.GetType() == typeof(Node) ||
+                  obj.GetType() == typeof(Bar) ||
+                  obj.GetType() == typeof(Panel) ||
+                  obj.GetType() == typeof(Opening)))
+            {
+                return null;
+            }
+
+            /* 2. GET THE SAP2000 ELEMENT GUID */
+            int ret01 = 1;
+            int ret02 = 1;
+            string guid = null;
+
+            if (obj.GetType() == typeof(Node)) ret01 = m_model.PointObj.GetGUID(name, ref guid);
+            if (obj.GetType() == typeof(Bar)) ret01 = m_model.FrameObj.GetGUID(name, ref guid);
+            if (obj.GetType() == typeof(Panel) || obj.GetType() == typeof(Opening)) ret01 = m_model.AreaObj.GetGUID(name, ref guid);
+
+            string tempObjName = obj.Name == "" ? guid.Substring(guid.Length - 7) : obj.Name + "::" + guid.Substring(guid.Length - 7);
+
+            /* 4. ASSIGN THE NEW UNIQUE NAME TO THE SAP2000 ELEMENT */
+            if (obj.GetType() == typeof(Node)) ret02 = m_model.PointObj.ChangeName(name, tempObjName);
+            if (obj.GetType() == typeof(Bar)) ret02 = m_model.FrameObj.ChangeName(name, tempObjName);
+            if (obj.GetType() == typeof(Panel) || obj.GetType() == typeof(Opening)) ret02 = m_model.AreaObj.ChangeName(name, tempObjName);
+
+            if (!(ret01 == 0 && ret02 == 0)) return "";
+
+            return tempObjName;
+
+            /***************************************************/
+        }
     }
 }
 

SAP2000_Adapter/CRUD/Read/Bar.cs

@@ -60,7 +60,11 @@ private List<Bar> ReadBars(List<string> ids = null)
 
                 try
                 {
-                    Bar bhomBar = new Bar();
+
+                    string bhomName = GetBhomNameFromSAP2000Id(id);
+
+                    Bar bhomBar = new Bar() { Name = bhomName };
+
                     string startId = "";
                     string endId = "";
                     m_model.FrameObj.GetPoints(id, ref startId, ref endId);