Skip to content

Commit

Permalink
7.1 Deployment (#315)
Browse files Browse the repository at this point in the history
  • Loading branch information
Fraser Greenroyd authored Mar 27, 2024
2 parents 9e59a3b + 84eef34 commit 448b700
Show file tree
Hide file tree
Showing 90 changed files with 287 additions and 121 deletions.
3 changes: 2 additions & 1 deletion GSA_Adapter/AdapterActions/Execute.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -229,3 +229,4 @@ public bool RunCommand(IExecuteCommand command)




3 changes: 2 additions & 1 deletion GSA_Adapter/AdapterActions/Pull.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -56,3 +56,4 @@ public override IEnumerable<object> Pull(IRequest request, PullType pullType = P




12 changes: 7 additions & 5 deletions GSA_Adapter/CRUD/Create.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -134,13 +134,13 @@ private bool CreateObject(ISectionProperty prop)
success = false;
}
#else

if (success)
return true;
#endif
}

if(!success)
if (!success)
success = ComCall(Convert.IToGsaString(prop, GetAdapterId<int>(prop).ToString()));

#if GSA_10_1
Expand Down Expand Up @@ -211,7 +211,7 @@ private bool CreateFEMesh(FEMesh mesh)

for (int i = 0; i < mesh.Faces.Count; i++)
{
success &= ComCall(Convert.ToGsaString(mesh,id,i));
success &= ComCall(Convert.ToGsaString(mesh, id, i));
allIds.Add(id);
id++;
}
Expand Down Expand Up @@ -250,7 +250,8 @@ private bool CreateObject(ILoad load)

foreach (string gsaString in load.IToGsaString(unitFactors))
{
success &= ComCall(gsaString);
if (gsaString != "")
success &= ComCall(gsaString);
}

SetAdapterId(load, load.Name ?? "");
Expand Down Expand Up @@ -300,3 +301,4 @@ private bool CreateObject(FabricPanelProperty fabricProperty)




3 changes: 2 additions & 1 deletion GSA_Adapter/CRUD/Delete.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -116,3 +116,4 @@ private List<Tuple<int, int>> GetRanges(Type type, List<int> indices)




3 changes: 2 additions & 1 deletion GSA_Adapter/CRUD/Read.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -560,3 +560,4 @@ private List<IMaterialFragment> GetStandardGsaMaterials()




3 changes: 2 additions & 1 deletion GSA_Adapter/CRUD/ReadResults.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -274,3 +274,4 @@ private int TryExtractMode(string loadcase)




3 changes: 2 additions & 1 deletion GSA_Adapter/CRUD/ReadResultsElements.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -403,3 +403,4 @@ private List<int> GetAllIds(IResultRequest request)




3 changes: 2 additions & 1 deletion GSA_Adapter/CRUD/ReadResultsGlobal.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -145,3 +145,4 @@ private IEnumerable<IResult> ExtractGlobalReaction(List<int> cases)




3 changes: 2 additions & 1 deletion GSA_Adapter/CRUD/Update.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -92,3 +92,4 @@ private bool Update(IEnumerable<IMaterialFragment> materials, ActionConfig actio




3 changes: 2 additions & 1 deletion GSA_Adapter/CRUD/UpdateProperty.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -65,3 +65,4 @@ protected override int IUpdateTags(Type type, IEnumerable<object> ids, IEnumerab




9 changes: 5 additions & 4 deletions GSA_Adapter/Convert/FromGsa/Elements/Bar.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -74,7 +74,7 @@ public static List<Bar> FromGsaBars(IEnumerable<GsaElement> gsaElements, Diction
nodes.TryGetValue(gsaBar.Topo[0], out n1);
nodes.TryGetValue(gsaBar.Topo[1], out n2);

Bar bar = new Bar { StartNode = n1, EndNode = n2 };
Bar bar = new Bar { Start = n1, End = n2 };
bar.ApplyTaggedName(gsaBar.Name);

bar.FEAType = feType;
Expand Down Expand Up @@ -135,8 +135,8 @@ public static List<Bar> FromGsaBars(IEnumerable<string> gsaStrings, Dictionary<i

Bar bar = new Bar()
{
StartNode = nodes[int.Parse(arr[7])],
EndNode = nodes[int.Parse(arr[8])],
Start = nodes[int.Parse(arr[7])],
End = nodes[int.Parse(arr[8])],
FEAType = feType,
};

Expand Down Expand Up @@ -230,3 +230,4 @@ public static List<Bar> FromGsaBars(IEnumerable<string> gsaStrings, Dictionary<i




3 changes: 2 additions & 1 deletion GSA_Adapter/Convert/FromGsa/Elements/FEMesh.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -87,3 +87,4 @@ public static List<FEMesh> FromGsaFEMesh(IEnumerable<GsaElement> gsaElements, Di




3 changes: 2 additions & 1 deletion GSA_Adapter/Convert/FromGsa/Elements/Node.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -202,3 +202,4 @@ public static Constraint6DOF FromGsaConstraint(string[] arr, Dictionary<int, dou




3 changes: 2 additions & 1 deletion GSA_Adapter/Convert/FromGsa/Elements/RigidConstraint.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -99,3 +99,4 @@ public static List<RigidConstraint> FromGsaRigidConstraint(IEnumerable<string> g




3 changes: 2 additions & 1 deletion GSA_Adapter/Convert/FromGsa/Elements/RigidLink.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -218,3 +218,4 @@ public static List<RigidLink> FromGsaRigidLinks(IEnumerable<GsaElement> gsaEleme




5 changes: 3 additions & 2 deletions GSA_Adapter/Convert/FromGsa/Elements/Spacer.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -59,7 +59,7 @@ public static List<Spacer> FromGsaSpacers(IEnumerable<GsaElement> gsaElements, D
nodes.TryGetValue(gsaSpacer.Topo[0], out n1);
nodes.TryGetValue(gsaSpacer.Topo[1], out n2);

Spacer spacer = new Spacer { StartNode = n1, EndNode = n2 };
Spacer spacer = new Spacer { Start = n1, End = n2 };
spacer.ApplyTaggedName(gsaSpacer.Name);

SpacerProperty prop;
Expand All @@ -83,3 +83,4 @@ public static List<Spacer> FromGsaSpacers(IEnumerable<GsaElement> gsaElements, D




3 changes: 2 additions & 1 deletion GSA_Adapter/Convert/FromGsa/Loads/BarPrestressLoad.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -119,3 +119,4 @@ public static BarPrestressLoad FromGsaBarPrestressLoad(string gsaString, Diction
}



3 changes: 2 additions & 1 deletion GSA_Adapter/Convert/FromGsa/Loads/LoadCombination.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -116,3 +116,4 @@ public static LoadCombination FromGsaAnalTask(string gsaString, Dictionary<int,




3 changes: 2 additions & 1 deletion GSA_Adapter/Convert/FromGsa/Loads/Loadcase.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -94,3 +94,4 @@ private static LoadNature BHoMLoadNature(string loadNature)




3 changes: 2 additions & 1 deletion GSA_Adapter/Convert/FromGsa/Loads/NodeLoad.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -139,3 +139,4 @@ public static PointLoad FromGsaNodeLoad(string gsaString, Dictionary<int, Loadca
}



Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -73,3 +73,4 @@ public static SoapStress2D FromGsaSoapStress2D(string gsaProp, double unitFactor
}
}


3 changes: 2 additions & 1 deletion GSA_Adapter/Convert/FromGsa/Properties/LinkConstraint.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -151,3 +151,4 @@ public static LinkConstraint FromGsaLinkConstraint(string gsaProp)




3 changes: 2 additions & 1 deletion GSA_Adapter/Convert/FromGsa/Properties/Material.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -269,3 +269,4 @@ private static void FabricMaterialProperties(string gsaString, out double ex, ou




3 changes: 2 additions & 1 deletion GSA_Adapter/Convert/FromGsa/Properties/SectionProperty.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -337,3 +337,4 @@ private static void FromGSAString(string gsaString, out double a, out double iyy
}



3 changes: 2 additions & 1 deletion GSA_Adapter/Convert/FromGsa/Properties/SpacerProperty.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This file is part of the Buildings and Habitats object Model (BHoM)
* Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
* Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
*
* Each contributor holds copyright over their respective contributions.
* The project versioning (Git) records all such contribution source information.
Expand Down Expand Up @@ -94,3 +94,4 @@ public static SpacerProperty FromGsaSpacerProperty(string gsaProp)
}
}


Loading

0 comments on commit 448b700

Please sign in to comment.