7.0 Deployment (#384)

Author: Fraser Greenroyd

Lusas_Adapter/AdapterActions/Execute.cs

@@ -71,6 +71,8 @@ public bool RunCommand(NewModel command)
             d_LusasData.setVerticalDir("Z");
             m_LusasApplication.fileOpen("%PerMachineAppDataPlatform%\\config\\AfterNewModel");
             d_LusasData.setAnalysisCategory("3D");
+            if (!double.IsNaN(m_mergeTolerance))
+                d_LusasData.getOptions().setDouble("TOLMRG", m_mergeTolerance);
 
             string fileName = $"{m_directory}\\sections.csv";
             File.Delete(fileName);
@@ -111,6 +113,8 @@ public bool RunCommand(Open command)
             {
                 m_LusasApplication.openDatabase(command.FileName);
                 d_LusasData = m_LusasApplication.getDatabase();
+                if (!double.IsNaN(m_mergeTolerance))
+                    d_LusasData.getOptions().setDouble("TOLMRG", m_mergeTolerance);
                 m_directory = command.FileName;
 
                 return true;

Lusas_Adapter/CRUD/Create/Loads/GravityLoad.cs

@@ -24,6 +24,7 @@
 using BH.oM.Structure.Loads;
 using BH.Engine.Adapter;
 using Lusas.LPI;
+using BH.oM.Geometry;
 
 namespace BH.Adapter.Lusas
 {
@@ -47,15 +48,15 @@ private IFLoadingBody CreateGravityLoad(GravityLoad gravityLoad, IFGeometry[] lu
         {
             IFLoadingBody lusasGravityLoad;
             IFLoadcase assignedLoadcase = (IFLoadcase)d_LusasData.getLoadset(gravityLoad.Loadcase.AdapterId<int>(typeof(LusasId)));
-
+           
             if (d_LusasData.existsAttribute("Loading", gravityLoad.Name))
             {
                 lusasGravityLoad = (IFLoadingBody)d_LusasData.getAttributes("Loading", gravityLoad.Name);
             }
             else
             {
                 lusasGravityLoad = d_LusasData.createLoadingBody(gravityLoad.Name);
-                lusasGravityLoad.setBody(gravityLoad.GravityDirection.X, gravityLoad.GravityDirection.Y, gravityLoad.GravityDirection.Z);
+                lusasGravityLoad.setBody(gravityLoad.GravityDirection.X * m_g, gravityLoad.GravityDirection.Y * m_g, gravityLoad.GravityDirection.Z * m_g);
             }
 
             IFAssignment lusasAssignment = m_LusasApplication.assignment();

Lusas_Adapter/CRUD/Create/Loads/Loadcase.cs

@@ -48,9 +48,16 @@ private IFLoadcase CreateLoadcase(Loadcase loadcase)
         {
             IFLoadcase lusasLoadcase;
 
-            if (d_LusasData.existsLoadset(loadcase.Name))
+            if (d_LusasData.existsLoadset(loadcase.Number))
             {
-                lusasLoadcase = (IFLoadcase)d_LusasData.getLoadset(loadcase.Name);
+                lusasLoadcase = (IFLoadcase)d_LusasData.getLoadset(loadcase.Number);
+                if (lusasLoadcase.getName() != loadcase.Name)
+                {
+                    Compute.RecordWarning(
+                    $"The loadcase {loadcase.Number} already exists but the number {lusasLoadcase.getID()} does not match with the loadcase being pushed: {loadcase.Name}, {loadcase.Number}. \n" +
+                    $"The loadcase {lusasLoadcase.getName()} has been used.");
+                    loadcase.Name = lusasLoadcase.getName();
+                };
             }
             else
             {

Lusas_Adapter/CRUD/Create/Properties/GeometricLine.cs

@@ -257,6 +257,8 @@ private bool CreateProfile(string name, ISectionProfile profile)
             int lusasType = 5;
             CreateLibrarySection(name, dimensionArray, lusasType);
 
+            Engine.Base.Compute.RecordWarning("Toe radius not supported in Lusas. 0 is used for toe radius");
+
             return true;
         }
 

Lusas_Adapter/CRUD/Read/Loads/GravityLoads.cs

@@ -72,9 +72,9 @@ private List<ILoad> ReadGravityLoads(List<string> ids = null)
                     foreach (IEnumerable<IFAssignment> groupedAssignment in groupedByLoadcases)
                     {
                         List<string> analysisName = new List<string> { lusasBodyForce.getAttributeType() };
-
+                        
                         GravityLoad gravityLoad = Adapters.Lusas.Convert.ToGravityLoad(
-                            lusasBodyForce, groupedAssignment, nodes, bars, panels);
+                            lusasBodyForce, groupedAssignment, nodes, bars, panels, m_g);
                         gravityLoad.Tags = new HashSet<string>(analysisName);
                         gravityLoads.Add(gravityLoad);
                     }

Lusas_Adapter/CRUD/Read/Results/ReadResults.cs

@@ -32,6 +32,7 @@
 using System.Linq;
 using BH.Engine.Adapters.Lusas;
 using BH.oM.Adapters.Lusas;
+using Lusas.LPI;
 
 namespace BH.Adapter.Lusas
 {
@@ -179,6 +180,14 @@ private List<int> GetLoadcaseIDs(IResultRequest request)
                 }
             }
 
+            else if (cases.Count == 0)
+            {
+                for (int i = 1; i <= d_LusasData.getLargestLoadsetID(); i++)
+                {
+                    caseNums.Add(i);
+                }
+            }
+
             else
             {
                 List<int> idsOut = new List<int>();

Lusas_Adapter/Convert/ToBHoM/Loads/ToGravityLoad.cs

@@ -42,15 +42,17 @@ public static GravityLoad ToGravityLoad(IFLoading lusasGravityLoad,
             IEnumerable<IFAssignment> lusasAssignments,
             Dictionary<string, Node> nodes,
             Dictionary<string, Bar> bars,
-            Dictionary<string, Panel> panels)
+            Dictionary<string, Panel> panels,
+            double g)
+
         {
             IFLoadcase assignedLoadcase = (IFLoadcase)lusasAssignments.First().getAssignmentLoadset();
             Loadcase loadcase = ToLoadcase(assignedLoadcase);
             Vector gravityVector = new Vector
             {
-                X = lusasGravityLoad.getValue("accX"),
-                Y = lusasGravityLoad.getValue("accY"),
-                Z = lusasGravityLoad.getValue("accZ")
+                X = lusasGravityLoad.getValue("accX") / g,
+                Y = lusasGravityLoad.getValue("accY") / g,
+                Z = lusasGravityLoad.getValue("accZ") / g
             };
 
             IEnumerable<BHoMObject> assignedObjects = GetGeometryAssignments(

Lusas_Adapter/Convert/ToBHoM/Properties/ToProfile.cs

@@ -82,7 +82,7 @@ public static IProfile ToProfile(IFAttribute lusasAttribute, int i)
                             lusasAttribute.getValue("tw",i),
                             lusasAttribute.getValue("tf",i),
                             lusasAttribute.getValue("r",i),
-                            lusasAttribute.getValue("r",i)
+                            0
                         );
                         break;
                     }

Lusas_Adapter/LusasAdapter.cs

@@ -37,6 +37,8 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using BH.oM.Base.Attributes;
+using System.ComponentModel;
 
 namespace BH.Adapter.Lusas
 {
@@ -56,15 +58,45 @@ public partial class LusasV17Adapter : BHoMAdapter
         /**** Constructors                              ****/
         /***************************************************/
 #if Debug18 || Release18
-        public LusasV18Adapter(string filePath, LusasConfig lusasConfig = null, bool active = false)
+        [PreviousVersion("7.0", "BH.Adapter.Lusas.LusasV18Adapter(System.String, BH.oM.Adapters.Lusas.LusasConfig, System.Boolean)")]
+        [Description("Adapter to connect to a Lusas .mdl file.")]
+        [Input("filePath", "Path to the Lusas .mdl file to be used.")]
+        [Input("lusasSettings", "General settings that are applicable to all actions performed by this adapter, e.g. merge tolerance to be used.")]
+        [Input("active", "Initiate the adapter by setting to True. Open a session of Lusas and close any dialogue boxes before setting to True.")]
+        [Output("adapter", "Adapter for Lusas.")]
+        public LusasV18Adapter(string filePath, LusasSettings lusasSettings = null, bool active = false)
 #elif Debug19 || Release19
-        public LusasV19Adapter(string filePath, LusasConfig lusasConfig = null, bool active = false)
+        [PreviousVersion("7.0", "BH.Adapter.Lusas.LusasV19Adapter(System.String, BH.oM.Adapters.Lusas.LusasConfig, System.Boolean)")]
+        [Description("Adapter to connect to a Lusas .mdl file.")]
+        [Input("filePath", "Path to the Lusas .mdl file to be used.")]
+        [Input("lusasSettings", "General settings that are applicable to all actions performed by this adapter, e.g. merge tolerance to be used.")]
+        [Input("active", "Initiate the adapter by setting to True. Open a session of Lusas and close any dialogue boxes before setting to True.")]
+        [Output("adapter", "Adapter for Lusas.")]
+        public LusasV19Adapter(string filePath, LusasSettings lusasSettings = null, bool active = false)
 #elif Debug191 || Release191
-        public LusasV191Adapter(string filePath, LusasConfig lusasConfig = null, bool active = false)
+        [PreviousVersion("7.0", "BH.Adapter.Lusas.LusasV191Adapter(System.String, BH.oM.Adapters.Lusas.LusasConfig, System.Boolean)")]
+        [Description("Adapter to connect to a Lusas .mdl file.")]
+        [Input("filePath", "Path to the Lusas .mdl file to be used.")]
+        [Input("lusasSettings", "General settings that are applicable to all actions performed by this adapter, e.g. merge tolerance to be used.")]
+        [Input("active", "Initiate the adapter by setting to True. Open a session of Lusas and close any dialogue boxes before setting to True.")]
+        [Output("adapter", "Adapter for Lusas.")]
+        public LusasV191Adapter(string filePath, LusasSettings lusasSettings = null, bool active = false)
 #elif Debug200 || Release200
-        public LusasV200Adapter(string filePath, LusasConfig lusasConfig = null, bool active = false)
+        [PreviousVersion("7.0", "BH.Adapter.Lusas.LusasV200Adapter(System.String, BH.oM.Adapters.Lusas.LusasConfig, System.Boolean)")]
+        [Description("Adapter to connect to a Lusas .mdl file.")]
+        [Input("filePath", "Path to the Lusas .mdl file to be used.")]
+        [Input("lusasSettings", "General settings that are applicable to all actions performed by this adapter, e.g. merge tolerance to be used.")]
+        [Input("active", "Initiate the adapter by setting to True. Open a session of Lusas and close any dialogue boxes before setting to True.")]
+        [Output("adapter", "Adapter for Lusas.")]
+        public LusasV200Adapter(string filePath, LusasSettings lusasSettings = null, bool active = false)
 #else
-        public LusasV17Adapter(string filePath, LusasConfig lusasConfig = null, bool active = false)
+        [PreviousVersion("7.0", "BH.Adapter.Lusas.LusasV17Adapter(System.String, BH.oM.Adapters.Lusas.LusasConfig, System.Boolean)")]
+        [Description("Adapter to connect to a Lusas .mdl file.")]
+        [Input("filePath", "Path to Lusas the .mdl file to be used.")]
+        [Input("lusasSettings", "General settings that are applicable to all actions performed by this adapter, e.g. merge tolerance to be used.")]
+        [Input("active", "Initiate the adapter by setting to True. Open a session of Lusas and close any dialogue boxes before setting to True.")]
+        [Output("adapter", "Adapter for Lusas.")]
+        public LusasV17Adapter(string filePath, LusasSettings lusasSettings = null, bool active = false)
 #endif
         {
             if (active)
@@ -131,6 +163,14 @@ public LusasV17Adapter(string filePath, LusasConfig lusasConfig = null, bool act
                     {
                         throw new Exception("An exception has been flagged by Lusas, it is likely the file is from a higher version of Lusas than the adapter being used.");
                     }
+
+                    if (lusasSettings != null && !double.IsNaN(lusasSettings.MergeTolerance))
+                    {
+                        m_mergeTolerance = lusasSettings.MergeTolerance;
+                        d_LusasData.getOptions().setDouble("TOLMRG", m_mergeTolerance);
+                    }
+
+                    if (lusasSettings != null) { m_g = lusasSettings.StandardGravity; }
                 }
             }
         }
@@ -151,10 +191,12 @@ public static bool IsApplicationRunning()
         //Add any comlink object as a private field here, example named:
 
         private string m_directory;
+        public double m_mergeTolerance = double.NaN;
+        public double m_g = 9.80665;
         public LusasWinApp m_LusasApplication;
         public IFDatabase d_LusasData;
         private Dictionary<Type, Dictionary<int, HashSet<string>>> m_tags = new Dictionary<Type, Dictionary<int, HashSet<string>>>();
-        public LusasConfig lusasConfig;
+        public LusasSettings lusasSettings;
 
 
         /***************************************************/

Lusas_Adapter/Private Helpers/GetFeatureResults.cs

@@ -45,6 +45,7 @@ public partial class LusasV17Adapter
         private Dictionary<string, double> GetFeatureResults(List<string> components, Dictionary<string, IFResultsComponentSet> resultsSets, IFUnitSet unitSet, int id, string suffix, int resultType = 6)
         {
             Dictionary<string, double> featureResults = new Dictionary<string, double>();
+            bool invalidResult = false;
             IFResultsComponentSet resultsSet = null;
 
             foreach (string component in components)
@@ -99,12 +100,17 @@ private Dictionary<string, double> GetFeatureResults(List<string> components, Di
                 if (!(resultsSet.isValidValue(featureResult)))
                 {
                     featureResult = 0;
-                    Engine.Base.Compute.RecordWarning($"{suffix}{id} {component} is an invalid result and will be set to zero");
+                    invalidResult = true;
                 }
 
                 featureResults.Add(component, featureResult);
             }
 
+            if (invalidResult)
+            { 
+                Engine.Base.Compute.RecordWarning($"Invalid results (i.e. where DOF is released) will be set to zero.");
+            }
+
             return featureResults;
         }