Skip to content

Commit 4a113d5

Browse files
Fix bugs related to the upgrade to MidasCivil_NX (#401)
2 parents c68c7dc + f32185f commit 4a113d5

File tree

5 files changed

+23
-6
lines changed

5 files changed

+23
-6
lines changed

MidasCivil_Adapter/Convert/ToBHoM/Elements/ToRigidLink.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public static RigidLink ToRigidLink(string rigidLink, Dictionary<string, Node> n
5454
case "9.4.0":
5555
case "9.4.5":
5656
case "9.5.0":
57+
case "9.5.0.nx":
5758
primaryId = delimitted[0].Trim();
5859
fixity = delimitted[1].Replace(" ", "");
5960
secondaryIds = delimitted[2].Split(' ').Where(m => !string.IsNullOrWhiteSpace(m)).ToList();

MidasCivil_Adapter/Convert/ToMidasCivil/Elements/FromRigidLink.cs

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
using BH.oM.Adapters.MidasCivil;
2424
using BH.Engine.Adapter;
2525
using BH.oM.Structure.Elements;
26+
using BH.oM.Structure.Constraints;
27+
using System;
2628

2729
namespace BH.Adapter.Adapters.MidasCivil
2830
{
@@ -34,6 +36,11 @@ public static partial class Convert
3436

3537
public static string FromRigidLink(this RigidLink link, string version)
3638
{
39+
LinkConstraint con = link.Constraint;
40+
41+
if (con.XtoYY || con.XtoZZ || con.YtoXX || con.YtoZZ || con.ZtoXX || con.ZtoYY)
42+
Engine.Base.Compute.RecordError("Imposed rotations due to translations are not supported in this Adapter.");
43+
3744
string midasLink = "";
3845

3946
string primaryId = link.PrimaryNode.AdapterId<string>(typeof(MidasCivilId));
@@ -44,12 +51,12 @@ public static string FromRigidLink(this RigidLink link, string version)
4451
secondaryId = secondaryId + " " + secondaryNode.AdapterId<string>(typeof(MidasCivilId));
4552
}
4653

47-
string fixity = BoolToFixity(link.Constraint.XtoX) +
48-
BoolToFixity(link.Constraint.YtoY) +
49-
BoolToFixity(link.Constraint.ZtoZ) +
50-
BoolToFixity(link.Constraint.XXtoXX) +
51-
BoolToFixity(link.Constraint.YYtoYY) +
52-
BoolToFixity(link.Constraint.ZZtoZZ);
54+
string fixity = BoolToFixity(con.XtoX) +
55+
BoolToFixity(con.YtoY) +
56+
BoolToFixity(con.ZtoZ) +
57+
BoolToFixity(con.XXtoXX) +
58+
BoolToFixity(con.YYtoYY) +
59+
BoolToFixity(con.ZZtoZZ);
5360

5461
switch (version)
5562
{
@@ -58,6 +65,7 @@ public static string FromRigidLink(this RigidLink link, string version)
5865
case "9.4.0":
5966
case "9.4.5":
6067
case "9.5.0":
68+
case "9.5.0.nx":
6169
midasLink = primaryId + "," + fixity + "," + secondaryId + "," + link.Name;
6270
break;
6371
default:

MidasCivil_Adapter/Convert/ToMidasCivil/Loads/FromAreaUniformlyDistributedLoad.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ public static string FromAreaUniformlyDistributedLoad(this AreaUniformlyDistribu
4848
case "9.1.0":
4949
case "9.4.5":
5050
case "9.5.0":
51+
case "9.5.0.nx":
52+
5153
midasFEMeshLoad = assignedFEMesh + ", PRES, PLATE, FACE, " + FromLoadAxis(femeshLoad.Axis) + direction +
5254
", 0, 0, 0, " + FromLoadProjection(femeshLoad.Projected) + ", " +
5355
FromVectorDirection(femeshLoad.Pressure, direction).PressureFromSI(forceUnit, lengthUnit).ToString() +

MidasCivil_Adapter/Convert/ToMidasCivil/Loads/FromLoadCombination.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ public static List<string> FromLoadCombination(this LoadCombination loadCombinat
4444
case "8.6.5":
4545
line1 = "NAME=" + loadCombination.Name + ", GEN, ACTIVE, 0, 0, , 0, 0";
4646
break;
47+
case "9.4.5":
48+
case "9.5.0":
49+
case "9.5.0.nx":
50+
line1 = "NAME=" + loadCombination.Name + ", GEN, ACTIVE, 0, 0, , 0, 0, 0, 1";
51+
break;
4752
default:
4853
line1 = "NAME=" + loadCombination.Name + ", GEN, ACTIVE, 0, 0, , 0, 0, 0";
4954
break;

MidasCivil_Adapter/Convert/ToMidasCivil/Loads/FromPointForce.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public static string FromPointLoad(this PointLoad pointLoad, string assignedNode
4141
case "9.1.0":
4242
case "9.4.5":
4343
case "9.5.0":
44+
case "9.5.0.nx":
4445
midasPointLoad = assignedNode + "," + pointLoad.Force.X.ForceFromSI(forceUnit).ToString() +
4546
"," + pointLoad.Force.Y.ForceFromSI(forceUnit).ToString() +
4647
"," + pointLoad.Force.Z.ForceFromSI(forceUnit).ToString() +

0 commit comments

Comments
 (0)