6.3 Deployment (#364)

BHoM · Sep 21, 2023 · 2be248d · 2be248d
2 parents 623c1a0 + 6239443
commit 2be248d
Show file tree

Hide file tree

Showing 103 changed files with 494 additions and 158 deletions.
diff --git a/Lusas_Adapter/AdapterActions/Execute.cs b/Lusas_Adapter/AdapterActions/Execute.cs
@@ -39,6 +39,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Create/Create.cs b/Lusas_Adapter/CRUD/Create/Create.cs
@@ -50,6 +50,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif
@@ -340,8 +342,6 @@ private bool CreateCollection(IEnumerable<Edge> edges)
         {
             if (edges != null)
             {
-                List<Point> allPoints = new List<Point>();
-
                 //Check List<Curve> is not null and Curve is not invalid (i.e. not a Line)
                 List<Edge> validEdges = edges.Where(x => CheckPropertyError(x, y => y.Curve))
                     .Where(x => !Engine.Adapters.Lusas.Query.InvalidEdge(x)).ToList();
@@ -355,19 +355,10 @@ private bool CreateCollection(IEnumerable<Edge> edges)
                         distinctEdges.Add(edge);
                 }
 
-                distinctEdges = Engine.Adapters.Lusas.Query.GetDistinctEdges(distinctEdges);
-
-                foreach (Edge edge in distinctEdges)
-                {
-                    allPoints.Add(edge.Curve.IStartPoint());
-                    allPoints.Add(edge.Curve.IEndPoint());
-                }
-
-                List<Point> distinctPoints = Engine.Adapters.Lusas.Query.GetDistinctPoints(allPoints);
+                List<Point> distinctPoints = distinctEdges.Select(x => x.Curve.IStartPoint()).Union(edges.Select(x => x.Curve.IEndPoint())).ToList();
 
                 List<Point> existingPoints = ReadPoints();
-                List<Point> pointsToPush = distinctPoints.Except(
-                    existingPoints, new PointDistanceComparer()).ToList();
+                List<Point> pointsToPush = distinctPoints.Except(existingPoints, new PointDistanceComparer()).ToList();
 
                 ReduceRuntime(true);
 
@@ -378,13 +369,9 @@ private bool CreateCollection(IEnumerable<Edge> edges)
 
                 ReduceRuntime(false);
 
-                List<IFPoint> lusasPoints = ReadLusasPoints();
-                List<Point> points = new List<Point>();
+                List<Point> points = ReadPoints();
 
-                foreach (IFPoint point in lusasPoints)
-                {
-                    points.Add(Adapters.Lusas.Convert.ToPoint(point));
-                }
+                List<IFPoint> lusasPoints = ReadLusasPoints();
 
                 CreateTags(distinctEdges);
 

diff --git a/Lusas_Adapter/CRUD/Create/Elements/Edge.cs b/Lusas_Adapter/CRUD/Create/Elements/Edge.cs
@@ -34,6 +34,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Create/Elements/Line.cs b/Lusas_Adapter/CRUD/Create/Elements/Line.cs
@@ -40,6 +40,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Create/Elements/Point.cs b/Lusas_Adapter/CRUD/Create/Elements/Point.cs
@@ -35,6 +35,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Create/Elements/Surface.cs b/Lusas_Adapter/CRUD/Create/Elements/Surface.cs
@@ -37,6 +37,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Create/Error.cs b/Lusas_Adapter/CRUD/Create/Error.cs
@@ -34,6 +34,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Create/Loads/BarDistributedLoad.cs b/Lusas_Adapter/CRUD/Create/Loads/BarDistributedLoad.cs
@@ -35,6 +35,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif
@@ -50,9 +52,8 @@ private List<IFLoadingBeamDistributed> CreateBarDistributedLoad(
             IFAssignment lusasAssignment = m_LusasApplication.assignment();
             IFLoadcase assignedLoadcase = (IFLoadcase)d_LusasData.getLoadset(barDistributedLoad.Loadcase.AdapterId<int>(typeof(LusasId)));
 
-            Engine.Base.Compute.RecordWarning(
-                barDistributedLoad.GetType().ToString() + " uses parametric distances in the Lusas_Toolkit"
-                );
+            if(!barDistributedLoad.RelativePositions)
+                Engine.Base.Compute.RecordWarning(barDistributedLoad.GetType().ToString() + " uses parametric distances in the Lusas_Toolkit");
 
             List<double> valuesAtA = new List<double> {
                     barDistributedLoad.ForceAtStart.X, barDistributedLoad.ForceAtStart.Y,barDistributedLoad.ForceAtStart.Z,
@@ -75,7 +76,8 @@ private List<IFLoadingBeamDistributed> CreateBarDistributedLoad(
                 axis = "projected";
                 if (barDistributedLoad.RelativePositions)
                 {
-                    Engine.Base.Compute.RecordError("Projected loads with parametric distances are not supported in Lusas.");
+                    Engine.Base.Compute.RecordError(barDistributedLoad.Name + " has not been pushed because the positions are relative and the loads " +
+                        "are projected (this combination is not supported in Lusas).");
                     return null;
                 }
             }
@@ -141,7 +143,7 @@ private List<IFLoadingBeamDistributed> CreateBarDistributedLoad(
                                 lusasBarDistributedLoads.Add(lusasBarDistributedLoad);
                                 lusasAssignment.setLoadset(assignedLoadcase);
                                 if(barDistributedLoad.Projected || barDistributedLoad.Axis == LoadAxis.Global)
-                                        Engine.Base.Compute.RecordWarning("Lusas does not support internal distributed                                                                                 moments in the global axis or as projected loads.");
+                                        Engine.Base.Compute.RecordWarning("Lusas does not support internal distributed moments in the global axis or as projected loads.");
                                 lusasBarDistributedLoad.assignTo(lusasLines, lusasAssignment);
                                 break;
 

diff --git a/Lusas_Adapter/CRUD/Create/Loads/BarPointLoad.cs b/Lusas_Adapter/CRUD/Create/Loads/BarPointLoad.cs
@@ -33,6 +33,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Create/Loads/ConcentratedLoad.cs b/Lusas_Adapter/CRUD/Create/Loads/ConcentratedLoad.cs
@@ -33,6 +33,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Create/Loads/DistributedLoad.cs b/Lusas_Adapter/CRUD/Create/Loads/DistributedLoad.cs
@@ -34,6 +34,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Create/Loads/GravityLoad.cs b/Lusas_Adapter/CRUD/Create/Loads/GravityLoad.cs
@@ -33,6 +33,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Create/Loads/LoadCombination.cs b/Lusas_Adapter/CRUD/Create/Loads/LoadCombination.cs
@@ -36,6 +36,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Create/Loads/Loadcase.cs b/Lusas_Adapter/CRUD/Create/Loads/Loadcase.cs
@@ -34,6 +34,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Create/Loads/PrescribedDisplacement.cs b/Lusas_Adapter/CRUD/Create/Loads/PrescribedDisplacement.cs
@@ -35,6 +35,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Create/Loads/TemperatureLoad.cs b/Lusas_Adapter/CRUD/Create/Loads/TemperatureLoad.cs
@@ -33,6 +33,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Create/Properties/GeometricLine.cs b/Lusas_Adapter/CRUD/Create/Properties/GeometricLine.cs
@@ -37,6 +37,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Create/Properties/GeometricSurface.cs b/Lusas_Adapter/CRUD/Create/Properties/GeometricSurface.cs
@@ -34,6 +34,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Create/Properties/LineMesh.cs b/Lusas_Adapter/CRUD/Create/Properties/LineMesh.cs
@@ -35,6 +35,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Create/Properties/LocalCoordinate.cs b/Lusas_Adapter/CRUD/Create/Properties/LocalCoordinate.cs
@@ -33,6 +33,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Create/Properties/Material.cs b/Lusas_Adapter/CRUD/Create/Properties/Material.cs
@@ -34,6 +34,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Create/Properties/Support.cs b/Lusas_Adapter/CRUD/Create/Properties/Support.cs
@@ -36,6 +36,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Create/Properties/SurfaceMesh.cs b/Lusas_Adapter/CRUD/Create/Properties/SurfaceMesh.cs
@@ -33,6 +33,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Delete/Delete.cs b/Lusas_Adapter/CRUD/Delete/Delete.cs
@@ -40,6 +40,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Delete/Elements/Lines.cs b/Lusas_Adapter/CRUD/Delete/Elements/Lines.cs
@@ -32,6 +32,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Delete/Elements/Points.cs b/Lusas_Adapter/CRUD/Delete/Elements/Points.cs
@@ -32,6 +32,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Delete/Elements/Surface.cs b/Lusas_Adapter/CRUD/Delete/Elements/Surface.cs
@@ -32,6 +32,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Delete/Load/AreaTemperatureLoads.cs b/Lusas_Adapter/CRUD/Delete/Load/AreaTemperatureLoads.cs
@@ -30,6 +30,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Delete/Load/AreaUniformlyDistributeds.cs b/Lusas_Adapter/CRUD/Delete/Load/AreaUniformlyDistributeds.cs
@@ -31,6 +31,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Delete/Load/BarPointLoads.cs b/Lusas_Adapter/CRUD/Delete/Load/BarPointLoads.cs
@@ -30,6 +30,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Delete/Load/BarTemperatureLoads.cs b/Lusas_Adapter/CRUD/Delete/Load/BarTemperatureLoads.cs
@@ -30,6 +30,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Delete/Load/BarUniformlyDistributedLoads.cs b/Lusas_Adapter/CRUD/Delete/Load/BarUniformlyDistributedLoads.cs
@@ -31,6 +31,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Delete/Load/LoadCombinations.cs b/Lusas_Adapter/CRUD/Delete/Load/LoadCombinations.cs
@@ -30,6 +30,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Delete/Load/Loadcases.cs b/Lusas_Adapter/CRUD/Delete/Load/Loadcases.cs
@@ -30,6 +30,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif

diff --git a/Lusas_Adapter/CRUD/Delete/Load/PointDisplacements.cs b/Lusas_Adapter/CRUD/Delete/Load/PointDisplacements.cs
@@ -30,6 +30,8 @@ public partial class LusasV18Adapter
     public partial class LusasV19Adapter
 #elif Debug191 || Release191
     public partial class LusasV191Adapter
+#elif Debug200 || Release200
+    public partial class LusasV200Adapter
 #else
     public partial class LusasV17Adapter
 #endif