Skip to content

Commit 2be248d

Browse files
author
Fraser Greenroyd
authored
6.3 Deployment (#364)
2 parents 623c1a0 + 6239443 commit 2be248d

File tree

103 files changed

+494
-158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+494
-158
lines changed

‎Lusas_Adapter/AdapterActions/Execute.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ public partial class LusasV18Adapter
3939
public partial class LusasV19Adapter
4040
#elif Debug191 || Release191
4141
public partial class LusasV191Adapter
42+
#elif Debug200 || Release200
43+
public partial class LusasV200Adapter
4244
#else
4345
public partial class LusasV17Adapter
4446
#endif

‎Lusas_Adapter/CRUD/Create/Create.cs‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ public partial class LusasV18Adapter
5050
public partial class LusasV19Adapter
5151
#elif Debug191 || Release191
5252
public partial class LusasV191Adapter
53+
#elif Debug200 || Release200
54+
public partial class LusasV200Adapter
5355
#else
5456
public partial class LusasV17Adapter
5557
#endif
@@ -340,8 +342,6 @@ private bool CreateCollection(IEnumerable<Edge> edges)
340342
{
341343
if (edges != null)
342344
{
343-
List<Point> allPoints = new List<Point>();
344-
345345
//Check List<Curve> is not null and Curve is not invalid (i.e. not a Line)
346346
List<Edge> validEdges = edges.Where(x => CheckPropertyError(x, y => y.Curve))
347347
.Where(x => !Engine.Adapters.Lusas.Query.InvalidEdge(x)).ToList();
@@ -355,19 +355,10 @@ private bool CreateCollection(IEnumerable<Edge> edges)
355355
distinctEdges.Add(edge);
356356
}
357357

358-
distinctEdges = Engine.Adapters.Lusas.Query.GetDistinctEdges(distinctEdges);
359-
360-
foreach (Edge edge in distinctEdges)
361-
{
362-
allPoints.Add(edge.Curve.IStartPoint());
363-
allPoints.Add(edge.Curve.IEndPoint());
364-
}
365-
366-
List<Point> distinctPoints = Engine.Adapters.Lusas.Query.GetDistinctPoints(allPoints);
358+
List<Point> distinctPoints = distinctEdges.Select(x => x.Curve.IStartPoint()).Union(edges.Select(x => x.Curve.IEndPoint())).ToList();
367359

368360
List<Point> existingPoints = ReadPoints();
369-
List<Point> pointsToPush = distinctPoints.Except(
370-
existingPoints, new PointDistanceComparer()).ToList();
361+
List<Point> pointsToPush = distinctPoints.Except(existingPoints, new PointDistanceComparer()).ToList();
371362

372363
ReduceRuntime(true);
373364

@@ -378,13 +369,9 @@ private bool CreateCollection(IEnumerable<Edge> edges)
378369

379370
ReduceRuntime(false);
380371

381-
List<IFPoint> lusasPoints = ReadLusasPoints();
382-
List<Point> points = new List<Point>();
372+
List<Point> points = ReadPoints();
383373

384-
foreach (IFPoint point in lusasPoints)
385-
{
386-
points.Add(Adapters.Lusas.Convert.ToPoint(point));
387-
}
374+
List<IFPoint> lusasPoints = ReadLusasPoints();
388375

389376
CreateTags(distinctEdges);
390377

‎Lusas_Adapter/CRUD/Create/Elements/Edge.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ public partial class LusasV18Adapter
3434
public partial class LusasV19Adapter
3535
#elif Debug191 || Release191
3636
public partial class LusasV191Adapter
37+
#elif Debug200 || Release200
38+
public partial class LusasV200Adapter
3739
#else
3840
public partial class LusasV17Adapter
3941
#endif

‎Lusas_Adapter/CRUD/Create/Elements/Line.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ public partial class LusasV18Adapter
4040
public partial class LusasV19Adapter
4141
#elif Debug191 || Release191
4242
public partial class LusasV191Adapter
43+
#elif Debug200 || Release200
44+
public partial class LusasV200Adapter
4345
#else
4446
public partial class LusasV17Adapter
4547
#endif

‎Lusas_Adapter/CRUD/Create/Elements/Point.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ public partial class LusasV18Adapter
3535
public partial class LusasV19Adapter
3636
#elif Debug191 || Release191
3737
public partial class LusasV191Adapter
38+
#elif Debug200 || Release200
39+
public partial class LusasV200Adapter
3840
#else
3941
public partial class LusasV17Adapter
4042
#endif

‎Lusas_Adapter/CRUD/Create/Elements/Surface.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ public partial class LusasV18Adapter
3737
public partial class LusasV19Adapter
3838
#elif Debug191 || Release191
3939
public partial class LusasV191Adapter
40+
#elif Debug200 || Release200
41+
public partial class LusasV200Adapter
4042
#else
4143
public partial class LusasV17Adapter
4244
#endif

‎Lusas_Adapter/CRUD/Create/Error.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ public partial class LusasV18Adapter
3434
public partial class LusasV19Adapter
3535
#elif Debug191 || Release191
3636
public partial class LusasV191Adapter
37+
#elif Debug200 || Release200
38+
public partial class LusasV200Adapter
3739
#else
3840
public partial class LusasV17Adapter
3941
#endif

‎Lusas_Adapter/CRUD/Create/Loads/BarDistributedLoad.cs‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ public partial class LusasV18Adapter
3535
public partial class LusasV19Adapter
3636
#elif Debug191 || Release191
3737
public partial class LusasV191Adapter
38+
#elif Debug200 || Release200
39+
public partial class LusasV200Adapter
3840
#else
3941
public partial class LusasV17Adapter
4042
#endif
@@ -50,9 +52,8 @@ private List<IFLoadingBeamDistributed> CreateBarDistributedLoad(
5052
IFAssignment lusasAssignment = m_LusasApplication.assignment();
5153
IFLoadcase assignedLoadcase = (IFLoadcase)d_LusasData.getLoadset(barDistributedLoad.Loadcase.AdapterId<int>(typeof(LusasId)));
5254

53-
Engine.Base.Compute.RecordWarning(
54-
barDistributedLoad.GetType().ToString() + " uses parametric distances in the Lusas_Toolkit"
55-
);
55+
if(!barDistributedLoad.RelativePositions)
56+
Engine.Base.Compute.RecordWarning(barDistributedLoad.GetType().ToString() + " uses parametric distances in the Lusas_Toolkit");
5657

5758
List<double> valuesAtA = new List<double> {
5859
barDistributedLoad.ForceAtStart.X, barDistributedLoad.ForceAtStart.Y,barDistributedLoad.ForceAtStart.Z,
@@ -75,7 +76,8 @@ private List<IFLoadingBeamDistributed> CreateBarDistributedLoad(
7576
axis = "projected";
7677
if (barDistributedLoad.RelativePositions)
7778
{
78-
Engine.Base.Compute.RecordError("Projected loads with parametric distances are not supported in Lusas.");
79+
Engine.Base.Compute.RecordError(barDistributedLoad.Name + " has not been pushed because the positions are relative and the loads " +
80+
"are projected (this combination is not supported in Lusas).");
7981
return null;
8082
}
8183
}
@@ -141,7 +143,7 @@ private List<IFLoadingBeamDistributed> CreateBarDistributedLoad(
141143
lusasBarDistributedLoads.Add(lusasBarDistributedLoad);
142144
lusasAssignment.setLoadset(assignedLoadcase);
143145
if(barDistributedLoad.Projected || barDistributedLoad.Axis == LoadAxis.Global)
144-
Engine.Base.Compute.RecordWarning("Lusas does not support internal distributed moments in the global axis or as projected loads.");
146+
Engine.Base.Compute.RecordWarning("Lusas does not support internal distributed moments in the global axis or as projected loads.");
145147
lusasBarDistributedLoad.assignTo(lusasLines, lusasAssignment);
146148
break;
147149

‎Lusas_Adapter/CRUD/Create/Loads/BarPointLoad.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ public partial class LusasV18Adapter
3333
public partial class LusasV19Adapter
3434
#elif Debug191 || Release191
3535
public partial class LusasV191Adapter
36+
#elif Debug200 || Release200
37+
public partial class LusasV200Adapter
3638
#else
3739
public partial class LusasV17Adapter
3840
#endif

‎Lusas_Adapter/CRUD/Create/Loads/ConcentratedLoad.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ public partial class LusasV18Adapter
3333
public partial class LusasV19Adapter
3434
#elif Debug191 || Release191
3535
public partial class LusasV191Adapter
36+
#elif Debug200 || Release200
37+
public partial class LusasV200Adapter
3638
#else
3739
public partial class LusasV17Adapter
3840
#endif

0 commit comments

Comments
 (0)