Update Lusas gravity load conversion to push and pull. (#381)

BHoM · Nov 29, 2023 · a680c5b · a680c5b
2 parents b9a7f9e + fbecebc
commit a680c5b
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 10 deletions.
diff --git a/Lusas_Adapter/CRUD/Create/Loads/GravityLoad.cs b/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();

diff --git a/Lusas_Adapter/CRUD/Read/Loads/GravityLoads.cs b/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);
                     }

diff --git a/Lusas_Adapter/Convert/ToBHoM/Loads/ToGravityLoad.cs b/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(

diff --git a/Lusas_Adapter/LusasAdapter.cs b/Lusas_Adapter/LusasAdapter.cs
@@ -169,6 +169,8 @@ public LusasV17Adapter(string filePath, LusasSettings lusasSettings = null, bool
                         m_mergeTolerance = lusasSettings.MergeTolerance;
                         d_LusasData.getOptions().setDouble("TOLMRG", m_mergeTolerance);
                     }
+
+                    if (lusasSettings != null) { m_g = lusasSettings.StandardGravity; }
                 }
             }
         }
@@ -190,6 +192,7 @@ public static bool IsApplicationRunning()
 
         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>>>();

diff --git a/Lusas_Engine/Create/LusasSettings.cs b/Lusas_Engine/Create/LusasSettings.cs
@@ -36,8 +36,9 @@ public static partial class Create
         [Description("Lusas adapter settings.")]
         [Input("mergeTolerance", "Sets the merging tolerance used in Lusas.")]
         [Input("librarySettings", "Sets the library settings.")]
+        [Input("g", "Sets the standard gravity i.e. the acceleration due to gravity. This is used when GravityLoads are pushed/pulled from Lusas as the BHoM uses a factor of g, whereas Lusas uses a specific acceleration.")]
         [Output("Lusas specific adapter settings to be used by the adapter.")]
-        public static LusasSettings LusasSettings(double mergeTolerance, LibrarySettings librarySettings = null)
+        public static LusasSettings LusasSettings(double mergeTolerance, LibrarySettings librarySettings = null, double g = 9.80665)
         {
             LusasSettings lusasSettings = new LusasSettings();
 
@@ -46,6 +47,8 @@ public static LusasSettings LusasSettings(double mergeTolerance, LibrarySettings
             if (librarySettings != null)
                 lusasSettings.LibrarySettings = librarySettings;
 
+            lusasSettings.StandardGravity = g;
+
             return lusasSettings;
         }
         /***************************************************/

diff --git a/Lusas_oM/Lusas_oM.csproj b/Lusas_oM/Lusas_oM.csproj
@@ -143,6 +143,11 @@
       <HintPath>$(ProgramData)\BHoM\Assemblies\Geometry_oM.dll</HintPath>
       <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
+    </Reference>
+        <Reference Include="Quantities_oM">
+      <HintPath>$(ProgramData)\BHoM\Assemblies\Quantities_oM.dll</HintPath>
+      <Private>False</Private>
+      <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Lusas_oM/Settings/LusasSettings.cs b/Lusas_oM/Settings/LusasSettings.cs
@@ -23,6 +23,7 @@
 using BH.oM.Base;
 using System.ComponentModel;
 using BH.oM.Adapter;
+using BH.oM.Quantities.Attributes;
 
 namespace BH.oM.Adapters.Lusas
 {
@@ -31,13 +32,17 @@ public class LusasSettings : AdapterSettings
         /***************************************************/
         /****            Public Properties              ****/
         /***************************************************/
- 
+
         [Description("Sets the merging tolerance used in Lusas.")]
         public virtual double MergeTolerance { get; set; } = double.NaN;
 
         [Description("Sets the library settings.")]
         public virtual LibrarySettings LibrarySettings { get; set; } = new LibrarySettings();
 
+        [Acceleration]
+        [Description("Sets the standard gravity i.e. the acceleration due to gravity. This is used when GravityLoads are pushed/pulled from Lusas as the BHoM uses a factor of g, whereas Lusas uses a specific acceleration.")]
+        public virtual double StandardGravity { get; set; } = 9.80665;
+
         /***************************************************/
     }
 }