Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add LusasAdapterV191 #343

Merged
merged 7 commits into from
Jan 12, 2023
Merged

Add LusasAdapterV191 #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a6d0100
Add LusasAdapterV191, change all GetId() requests from Lusas to long …
peterjamesnugent Aug 23, 2022
7233444
Removed casts from long to int and replaced output type as long
peterjamesnugent Aug 24, 2022
2569a26
Remove int cast and replace with long
peterjamesnugent Aug 24, 2022
96dc04c
Add fall back method where numbers exceed int.MaxValue and associated…
peterjamesnugent Sep 28, 2022
ffab07c
Merge branch 'main' into Lusas_Toolkit-#339-UpgradeInteropForMinorVer…
peterjamesnugent Sep 28, 2022
fcf5060
Update ToLoadCombination.cs
peterjamesnugent Sep 28, 2022
c9e9a4b
Fix project-compliance errors
peterjamesnugent Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Lusas_Adapter/AdapterActions/Execute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ namespace BH.Adapter.Lusas
public partial class LusasV18Adapter
#elif Debug19 || Release19
public partial class LusasV19Adapter
#elif Debug191 || Release191
public partial class LusasV191Adapter
#else
public partial class LusasV17Adapter
#endif
Expand Down
2 changes: 2 additions & 0 deletions Lusas_Adapter/CRUD/Create/Create.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ namespace BH.Adapter.Lusas
public partial class LusasV18Adapter
#elif Debug19 || Release19
public partial class LusasV19Adapter
#elif Debug191 || Release191
public partial class LusasV191Adapter
#else
public partial class LusasV17Adapter
#endif
Expand Down
4 changes: 3 additions & 1 deletion Lusas_Adapter/CRUD/Create/Elements/Edge.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ namespace BH.Adapter.Lusas
public partial class LusasV18Adapter
#elif Debug19 || Release19
public partial class LusasV19Adapter
#elif Debug191 || Release191
public partial class LusasV191Adapter
#else
public partial class LusasV17Adapter
#endif
Expand All @@ -44,7 +46,7 @@ private IFLine CreateEdge(Edge edge, IFPoint startPoint, IFPoint endPoint)
{
IFLine lusasLine = d_LusasData.createLineByPoints(startPoint, endPoint);

int adapterIdName = lusasLine.getID();
long adapterIdName = lusasLine.getID();
edge.SetAdapterId(typeof(LusasId), adapterIdName);

if (!(edge.Tags.Count == 0))
Expand Down
4 changes: 3 additions & 1 deletion Lusas_Adapter/CRUD/Create/Elements/Line.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ namespace BH.Adapter.Lusas
public partial class LusasV18Adapter
#elif Debug19 || Release19
public partial class LusasV19Adapter
#elif Debug191 || Release191
public partial class LusasV191Adapter
#else
public partial class LusasV17Adapter
#endif
Expand Down Expand Up @@ -75,7 +77,7 @@ private IFLine CreateLine(Bar bar)
IFPoint endPoint = d_LusasData.getPointByNumber(bar.EndNode.AdapterId<int>(typeof(LusasId)));
IFLine lusasLine = d_LusasData.createLineByPoints(startPoint, endPoint);

int adapterIdName = lusasLine.getID();
long adapterIdName = lusasLine.getID();
bar.SetAdapterId(typeof(LusasId), adapterIdName);

if (bar.Tags.Count != 0)
Expand Down
4 changes: 3 additions & 1 deletion Lusas_Adapter/CRUD/Create/Elements/Point.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ namespace BH.Adapter.Lusas
public partial class LusasV18Adapter
#elif Debug19 || Release19
public partial class LusasV19Adapter
#elif Debug191 || Release191
public partial class LusasV191Adapter
#else
public partial class LusasV17Adapter
#endif
Expand All @@ -52,7 +54,7 @@ private IFPoint CreatePoint(Node node)
IFPoint lusasPoint = d_LusasData.getPointByNumber(d_LusasData.getLargestPointID());


int adapterIdName = lusasPoint.getID();
long adapterIdName = lusasPoint.getID();
node.SetAdapterId(typeof(LusasId), adapterIdName);


Expand Down
4 changes: 3 additions & 1 deletion Lusas_Adapter/CRUD/Create/Elements/Surface.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ namespace BH.Adapter.Lusas
public partial class LusasV18Adapter
#elif Debug19 || Release19
public partial class LusasV19Adapter
#elif Debug191 || Release191
public partial class LusasV191Adapter
#else
public partial class LusasV17Adapter
#endif
Expand Down Expand Up @@ -66,7 +68,7 @@ private IFSurface CreateSurface(Panel panel)

if (lusasSurface != null)
{
int adapterIdName = lusasSurface.getID();
long adapterIdName = lusasSurface.getID();
panel.SetAdapterId(typeof(LusasId), adapterIdName);

if (!(panel.Tags.Count == 0))
Expand Down
2 changes: 2 additions & 0 deletions Lusas_Adapter/CRUD/Create/Error.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ namespace BH.Adapter.Lusas
public partial class LusasV18Adapter
#elif Debug19 || Release19
public partial class LusasV19Adapter
#elif Debug191 || Release191
public partial class LusasV191Adapter
#else
public partial class LusasV17Adapter
#endif
Expand Down
4 changes: 3 additions & 1 deletion Lusas_Adapter/CRUD/Create/Loads/BarDistributedLoad.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ namespace BH.Adapter.Lusas
public partial class LusasV18Adapter
#elif Debug19 || Release19
public partial class LusasV19Adapter
#elif Debug191 || Release191
public partial class LusasV191Adapter
#else
public partial class LusasV17Adapter
#endif
Expand Down Expand Up @@ -64,7 +66,7 @@ private List<IFLoadingBeamDistributed> CreateBarDistributedLoad(

List<string> keys = new List<string>() { "FX", "FY", "FZ", "MX", "MY", "MZ" };

List<int> ids = new List<int>();
List<long> ids = new List<long>();

string positioning = barDistributedLoad.RelativePositions ? "parametric" : "actual";
string axis;
Expand Down
4 changes: 3 additions & 1 deletion Lusas_Adapter/CRUD/Create/Loads/BarPointLoad.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ namespace BH.Adapter.Lusas
public partial class LusasV18Adapter
#elif Debug19 || Release19
public partial class LusasV19Adapter
#elif Debug191 || Release191
public partial class LusasV191Adapter
#else
public partial class LusasV17Adapter
#endif
Expand Down Expand Up @@ -65,7 +67,7 @@ private IFLoadingBeamPoint CreateBarPointLoad(BarPointLoad barPointLoad, object[
lusasAssignment.setLoadset(assignedLoadcase);
lusasBarPointLoad.assignTo(lusasLines, lusasAssignment);

int adapterIdName = lusasBarPointLoad.getID();
long adapterIdName = lusasBarPointLoad.getID();
barPointLoad.SetAdapterId(typeof(LusasId), adapterIdName);

return lusasBarPointLoad;
Expand Down
4 changes: 3 additions & 1 deletion Lusas_Adapter/CRUD/Create/Loads/ConcentratedLoad.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ namespace BH.Adapter.Lusas
public partial class LusasV18Adapter
#elif Debug19 || Release19
public partial class LusasV19Adapter
#elif Debug191 || Release191
public partial class LusasV191Adapter
#else
public partial class LusasV17Adapter
#endif
Expand Down Expand Up @@ -60,7 +62,7 @@ private IFLoadingConcentrated CreateConcentratedLoad(PointLoad pointLoad, object
lusasAssignment.setLoadset(assignedLoadcase);
lusasPointLoad.assignTo(lusasPoints, lusasAssignment);

int adapterIdName = lusasPointLoad.getID();
long adapterIdName = lusasPointLoad.getID();
pointLoad.SetAdapterId(typeof(LusasId), adapterIdName);

return lusasPointLoad;
Expand Down
10 changes: 6 additions & 4 deletions Lusas_Adapter/CRUD/Create/Loads/DistributedLoad.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ namespace BH.Adapter.Lusas
public partial class LusasV18Adapter
#elif Debug19 || Release19
public partial class LusasV19Adapter
#elif Debug191 || Release191
public partial class LusasV191Adapter
#else
public partial class LusasV17Adapter
#endif
Expand All @@ -46,7 +48,7 @@ private IFLoadingGlobalDistributed CreateGlobalDistributedLine(BarUniformlyDistr
IFLoadingGlobalDistributed lusasGlobalDistributed = CreateGlobalDistributed(distributedLoad.Name,
"Length", assignedLoadcase, distributedLoad.Force, distributedLoad.Moment, lusasLines);

int adapterIdName = lusasGlobalDistributed.getID();
long adapterIdName = lusasGlobalDistributed.getID();
distributedLoad.SetAdapterId(typeof(LusasId), adapterIdName);

return lusasGlobalDistributed;
Expand All @@ -60,7 +62,7 @@ private IFLoadingGlobalDistributed CreateGlobalDistributedLoadSurface(AreaUnifor
IFLoadingGlobalDistributed lusasGlobalDistributed = CreateGlobalDistributed(distributedLoad.Name,
"Area", assignedLoadcase, distributedLoad.Pressure, null, lusasSurfaces);

int adapterIdName = lusasGlobalDistributed.getID();
long adapterIdName = lusasGlobalDistributed.getID();
distributedLoad.SetAdapterId(typeof(LusasId), adapterIdName);

return lusasGlobalDistributed;
Expand All @@ -74,7 +76,7 @@ private IFLoadingLocalDistributed CreateLocalDistributedLine(BarUniformlyDistrib
IFLoadingLocalDistributed lusasLocalDistributed = CreateLocalDistributed(distributedLoad.Name,
"Line", assignedLoadcase, distributedLoad.Force, lusasLines);

int adapterIdName = lusasLocalDistributed.getID();
long adapterIdName = lusasLocalDistributed.getID();
distributedLoad.SetAdapterId(typeof(LusasId), adapterIdName);

return lusasLocalDistributed;
Expand All @@ -89,7 +91,7 @@ private IFLoadingLocalDistributed CreateLocalDistributedSurface(AreaUniformlyDis
IFLoadingLocalDistributed lusasLocalDistributed = CreateLocalDistributed(distributedLoad.Name,
"Area", assignedLoadcase, distributedLoad.Pressure, lusasSurfaces);

int adapterIdName = lusasLocalDistributed.getID();
long adapterIdName = lusasLocalDistributed.getID();
distributedLoad.SetAdapterId(typeof(LusasId), adapterIdName);

return lusasLocalDistributed;
Expand Down
4 changes: 3 additions & 1 deletion Lusas_Adapter/CRUD/Create/Loads/GravityLoad.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ namespace BH.Adapter.Lusas
public partial class LusasV18Adapter
#elif Debug19 || Release19
public partial class LusasV19Adapter
#elif Debug191 || Release191
public partial class LusasV191Adapter
#else
public partial class LusasV17Adapter
#endif
Expand Down Expand Up @@ -58,7 +60,7 @@ private IFLoadingBody CreateGravityLoad(GravityLoad gravityLoad, IFGeometry[] lu
lusasAssignment.setLoadset(assignedLoadcase);
lusasGravityLoad.assignTo(lusasGeometry, lusasAssignment);

int adapterIdName = lusasGravityLoad.getID();
long adapterIdName = lusasGravityLoad.getID();
gravityLoad.SetAdapterId(typeof(LusasId), adapterIdName);

return lusasGravityLoad;
Expand Down
2 changes: 2 additions & 0 deletions Lusas_Adapter/CRUD/Create/Loads/LoadCombination.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ namespace BH.Adapter.Lusas
public partial class LusasV18Adapter
#elif Debug19 || Release19
public partial class LusasV19Adapter
#elif Debug191 || Release191
public partial class LusasV191Adapter
#else
public partial class LusasV17Adapter
#endif
Expand Down
4 changes: 3 additions & 1 deletion Lusas_Adapter/CRUD/Create/Loads/Loadcase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ namespace BH.Adapter.Lusas
public partial class LusasV18Adapter
#elif Debug19 || Release19
public partial class LusasV19Adapter
#elif Debug191 || Release191
public partial class LusasV191Adapter
#else
public partial class LusasV17Adapter
#endif
Expand Down Expand Up @@ -61,7 +63,7 @@ private IFLoadcase CreateLoadcase(Loadcase loadcase)
}
}

int adapterIdName = lusasLoadcase.getID();
long adapterIdName = lusasLoadcase.getID();
loadcase.SetAdapterId(typeof(LusasId), adapterIdName);

return lusasLoadcase;
Expand Down
4 changes: 3 additions & 1 deletion Lusas_Adapter/CRUD/Create/Loads/PrescribedDisplacement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ namespace BH.Adapter.Lusas
public partial class LusasV18Adapter
#elif Debug19 || Release19
public partial class LusasV19Adapter
#elif Debug191 || Release191
public partial class LusasV191Adapter
#else
public partial class LusasV17Adapter
#endif
Expand Down Expand Up @@ -85,7 +87,7 @@ private IFPrescribedDisplacementLoad CreatePrescribedDisplacement(PointDisplacem
lusasAssignment.setLoadset(assignedLoadcase);
lusasPrescribedDisplacement.assignTo(lusasPoints, lusasAssignment);

int adapterIdName = lusasPrescribedDisplacement.getID();
long adapterIdName = lusasPrescribedDisplacement.getID();
pointDisplacement.SetAdapterId(typeof(LusasId), adapterIdName);

return lusasPrescribedDisplacement;
Expand Down
6 changes: 4 additions & 2 deletions Lusas_Adapter/CRUD/Create/Loads/TemperatureLoad.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ namespace BH.Adapter.Lusas
public partial class LusasV18Adapter
#elif Debug19 || Release19
public partial class LusasV19Adapter
#elif Debug191 || Release191
public partial class LusasV191Adapter
#else
public partial class LusasV17Adapter
#endif
Expand All @@ -46,7 +48,7 @@ private IFLoadingTemperature CreateBarUniformTemperatureLoad(BarUniformTemperatu
IFLoadingTemperature lusasTemperatureLoad = CreateTemperatureLoad(
temperatureLoad.Name, temperatureLoad.TemperatureChange, lusasLines, assignedLoadcase);

int adapterIdName = lusasTemperatureLoad.getID();
long adapterIdName = lusasTemperatureLoad.getID();
temperatureLoad.SetAdapterId(typeof(LusasId), adapterIdName);

return lusasTemperatureLoad;
Expand All @@ -62,7 +64,7 @@ private IFLoadingTemperature CreateAreaUniformTemperatureLoad(AreaUniformTempera
IFLoadingTemperature lusasTemperatureLoad = CreateTemperatureLoad(temperatureLoad.Name,
temperatureLoad.TemperatureChange, lusasSurfaces, assignedLoadcase);

int adapterIdName = lusasTemperatureLoad.getID();
long adapterIdName = lusasTemperatureLoad.getID();
temperatureLoad.SetAdapterId(typeof(LusasId), adapterIdName);

return lusasTemperatureLoad;
Expand Down
4 changes: 3 additions & 1 deletion Lusas_Adapter/CRUD/Create/Properties/GeometricLine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ namespace BH.Adapter.Lusas
public partial class LusasV18Adapter
#elif Debug19 || Release19
public partial class LusasV19Adapter
#elif Debug191 || Release191
public partial class LusasV191Adapter
#else
public partial class LusasV17Adapter
#endif
Expand All @@ -59,7 +61,7 @@ private IFAttribute CreateGeometricLine(ISectionProperty sectionProperty)

if (lusasAttribute != null)
{
int adapterIdName = lusasAttribute.getID();
long adapterIdName = lusasAttribute.getID();
sectionProperty.SetAdapterId(typeof(LusasId), adapterIdName);

return lusasAttribute;
Expand Down
4 changes: 3 additions & 1 deletion Lusas_Adapter/CRUD/Create/Properties/GeometricSurface.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ namespace BH.Adapter.Lusas
public partial class LusasV18Adapter
#elif Debug19 || Release19
public partial class LusasV19Adapter
#elif Debug191 || Release191
public partial class LusasV191Adapter
#else
public partial class LusasV17Adapter
#endif
Expand All @@ -56,7 +58,7 @@ private IFAttribute CreateGeometricSurface(ISurfaceProperty surfaceProperty)

if (lusasAttribute != null)
{
int adapterIdName = lusasAttribute.getID();
long adapterIdName = lusasAttribute.getID();
surfaceProperty.SetAdapterId(typeof(LusasId), adapterIdName);

return lusasAttribute;
Expand Down
4 changes: 3 additions & 1 deletion Lusas_Adapter/CRUD/Create/Properties/LineMesh.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ namespace BH.Adapter.Lusas
public partial class LusasV18Adapter
#elif Debug19 || Release19
public partial class LusasV19Adapter
#elif Debug191 || Release191
public partial class LusasV191Adapter
#else
public partial class LusasV17Adapter
#endif
Expand Down Expand Up @@ -77,7 +79,7 @@ private IFMeshLine CreateMeshSettings1D(MeshSettings1D meshSettings1D, BarFEATyp

if (lusasLineMesh != null)
{
int adapterNameId = d_LusasData.getLargestAttributeID("Mesh");
long adapterNameId = d_LusasData.getLargestAttributeID("Mesh");
meshSettings1D.SetAdapterId(typeof(LusasId), adapterNameId);

return lusasLineMesh;
Expand Down
2 changes: 2 additions & 0 deletions Lusas_Adapter/CRUD/Create/Properties/LocalCoordinate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ namespace BH.Adapter.Lusas
public partial class LusasV18Adapter
#elif Debug19 || Release19
public partial class LusasV19Adapter
#elif Debug191 || Release191
public partial class LusasV191Adapter
#else
public partial class LusasV17Adapter
#endif
Expand Down
4 changes: 3 additions & 1 deletion Lusas_Adapter/CRUD/Create/Properties/Material.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ namespace BH.Adapter.Lusas
public partial class LusasV18Adapter
#elif Debug19 || Release19
public partial class LusasV19Adapter
#elif Debug191 || Release191
public partial class LusasV191Adapter
#else
public partial class LusasV17Adapter
#endif
Expand Down Expand Up @@ -93,7 +95,7 @@ private IFAttribute CreateMaterial(IMaterialFragment material)

if (lusasMaterial != null)
{
int adapterIdName = lusasMaterial.getID();
long adapterIdName = lusasMaterial.getID();
material.SetAdapterId(typeof(LusasId), adapterIdName);

return lusasMaterial;
Expand Down
6 changes: 4 additions & 2 deletions Lusas_Adapter/CRUD/Create/Properties/Support.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ namespace BH.Adapter.Lusas
public partial class LusasV18Adapter
#elif Debug19 || Release19
public partial class LusasV19Adapter
#elif Debug191 || Release191
public partial class LusasV191Adapter
#else
public partial class LusasV17Adapter
#endif
Expand Down Expand Up @@ -88,7 +90,7 @@ private IFAttribute CreateSupport(Constraint6DOF constraint)

if (lusasSupport != null)
{
int adapterIdName = lusasSupport.getID();
long adapterIdName = lusasSupport.getID();
constraint.SetAdapterId(typeof(LusasId), adapterIdName);

return lusasSupport;
Expand Down Expand Up @@ -150,7 +152,7 @@ private IFAttribute CreateSupport(Constraint4DOF constraint)

if (lusasSupport != null)
{
int adapterIdName = lusasSupport.getID();
long adapterIdName = lusasSupport.getID();
constraint.SetAdapterId(typeof(LusasId), adapterIdName);

return lusasSupport;
Expand Down
Loading