Skip to content

Commit

Permalink
Redefined how GSA_RigidConstraints are treated, now a part of Structu…
Browse files Browse the repository at this point in the history 
…res_RigidLinks.

Rigid Constraints are now treated by BHoM as a Rigid Link object but with a fragment that if true tells GSA it is a Rigid Constraints. Removed previously added RigidConstraint Type and ENUM from this PR and instead adjusted the RigidLink methods. Also added more possible LinkConstraint options to the FromGsa - LinkConstraint method.
  • Loading branch information
@TosteSkDa
TosteSkDa authored and Fraser Greenroyd committed Jul 7, 2023
1 parent f351070 commit 3920d68
Show file tree
Hide file tree
Showing 9 changed files with 331 additions and 71 deletions.
48 changes: 28 additions & 20 deletions GSA_Adapter/CRUD/Create.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,32 +160,46 @@ private bool CreateObject(ISectionProperty prop)
//
private bool CreateLinks(IEnumerable<RigidLink> links)
{

bool success = true;
foreach (RigidLink link in links)
{
success &= ComCall(Convert.ToGsaString(link, GetAdapterId<int>(link).ToString(), 0));
}

foreach (RigidLink link in links)
{
List<int> allIds = new List<int>();
for (int i = 1; i < link.SecondaryNodes.Count; i++)
if (Convert.CheckRigCon(link) == false)
{
int id = (int)NextFreeId(link.GetType(), i == 1);
success &= ComCall(Convert.ToGsaString(link, id.ToString(), i));
allIds.Add(id);
if (link.SecondaryNodes.Count > 1)
{
List<int> secondaryIds = new List<int>();
foreach (Node secondaryNode in link.SecondaryNodes)
{
int id = (int)NextFreeId(link.GetType(), false);
success &= ComCall(Convert.ToGsaString(link, id.ToString()));
secondaryIds.Add(id);
}

var allIds = new List<int> { GetAdapterId<int>(link) };
allIds.AddRange(secondaryIds);
link.Fragments.Remove(typeof(GSAId));
link.SetAdapterId(typeof(GSAId), allIds);
}
else
{
int id = (int)NextFreeId(link.GetType(), false);
success &= ComCall(Convert.ToGsaString(link, id.ToString()));
link.Fragments.Remove(typeof(GSAId));
link.SetAdapterId(typeof(GSAId), id);
}
}
if (link.SecondaryNodes.Count > 1)
else
{
allIds.Insert(0, GetAdapterId<int>(link));
link.Fragments.Remove(typeof(GSAId)); // to remove the existing single id on the link
link.SetAdapterId(typeof(GSAId), allIds);
success &= ComCall(Convert.ToGsaString(link, GetAdapterId<int>(link).ToString()));
}
}

return success;
}



/***************************************************/

private bool CreateFEMesh(FEMesh mesh)
Expand Down Expand Up @@ -280,12 +294,6 @@ private bool CreateObject(FabricPanelProperty fabricProperty)

/***************************************************/

private bool CreateObject(RigidConstraint rigidConstraint)
{
return ComCall(rigidConstraint.ToGsaString());
}

/***************************************************/
}
}

Expand Down
19 changes: 4 additions & 15 deletions GSA_Adapter/CRUD/Read.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@ protected override IEnumerable<IBHoMObject> IRead(Type type, IList indices, Acti
return ReadRigidLink(indices as dynamic);
if (type == typeof(LinkConstraint))
return ReadLinkConstraint(indices as dynamic);
if (type == typeof(RigidConstraint))
return ReadRigidConstraint(indices as dynamic);
if (type == typeof(FEMesh))
return ReadFEMesh(indices as dynamic);
if (type == typeof(ISurfaceProperty))
Expand Down Expand Up @@ -406,11 +404,14 @@ public List<RigidLink> ReadRigidLink(List<string> ids = null)
Dictionary<int, LinkConstraint> constraints = GetCachedOrReadAsDictionary<int, LinkConstraint>();
Dictionary<int, Node> nodes = GetCachedOrReadAsDictionary<int, Node>();

string allConstr = m_gsaCom.GwaCommand("GET_ALL, RIGID").ToString();
string[] constrArr = string.IsNullOrWhiteSpace(allConstr) ? new string[0] : allConstr.Split('\n');

int[] potentialBeamRefs = GenerateIndices(ids, typeof(RigidLink));
GsaElement[] gsaElements = new GsaElement[potentialBeamRefs.Length];
m_gsaCom.Elements(potentialBeamRefs, out gsaElements);

return Convert.FromGsaRigidLinks(gsaElements, constraints, nodes);
return Convert.FromGsaRigidLinks(gsaElements, constrArr, constraints, nodes);

//if (ids == null)
// return proArr.Select(x => Convert.FromGsaSectionProperty(x, materials)).ToList();
Expand All @@ -420,18 +421,6 @@ public List<RigidLink> ReadRigidLink(List<string> ids = null)

/***************************************/

public List<RigidConstraint> ReadRigidConstraint(List<string> ids = null)
{
string allProps = m_gsaCom.GwaCommand("GET_ALL, RIGID").ToString();
string[] proArr = string.IsNullOrWhiteSpace(allProps) ? new string[0] : allProps.Split('\n');

Dictionary<int, Node> nodes = GetCachedOrReadAsDictionary<int, Node>();

return Convert.FromGsaRigidConstraint(proArr, nodes);
}

/***************************************/

public List<Spacer> ReadSpacers(List<string> ids = null)
{
Dictionary<int, Node> nodes = GetCachedOrReadAsDictionary<int, Node>();
Expand Down
148 changes: 146 additions & 2 deletions GSA_Adapter/Convert/FromGsa/Elements/RigidLink.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
using BH.oM.Structure.Elements;
using BH.oM.Structure.Constraints;
using System.Collections.Generic;

using System.Linq;

namespace BH.Adapter.GSA
{
Expand All @@ -41,10 +41,12 @@ public static partial class Convert
/**** Public Methods ****/
/***************************************************/

public static List<RigidLink> FromGsaRigidLinks(IEnumerable<GsaElement> gsaElements, Dictionary<int, LinkConstraint> constraints, Dictionary<int, Node> nodes)
public static List<RigidLink> FromGsaRigidLinks(IEnumerable<GsaElement> gsaElements, IEnumerable<string> gsaStrings, Dictionary<int, LinkConstraint> constraints, Dictionary<int, Node> nodes)
{

List<RigidLink> linkList = new List<RigidLink>();

//Rigid Link
foreach (GsaElement gsaLink in gsaElements)
{
if (gsaLink.eType != 9)
Expand All @@ -61,8 +63,150 @@ public static List<RigidLink> FromGsaRigidLinks(IEnumerable<GsaElement> gsaEleme
int id = gsaLink.Ref;
link.SetAdapterId(typeof(GSAId), id);
linkList.Add(link);
}

//Rigid Constraint
foreach (string gsaString in gsaStrings)
{
string[] tokens = gsaString.Split(',');

string linkName = tokens[1];
int primaryNodeName = int.Parse(tokens[2]);
string linkTypeString = tokens[3];
string[] constrainedNodeNames = tokens[4].Split(',');

Node primaryNode;
nodes.TryGetValue(primaryNodeName, out primaryNode);

List<Node> constrainedNodes = new List<Node>();

foreach (string constrainedNodeName in constrainedNodeNames)
{
if (int.TryParse(constrainedNodeName, out int constrainedNodeId))
{
if (nodes.TryGetValue(constrainedNodeId, out Node constrainedNode))
constrainedNodes.Add(constrainedNode);
}
}

LinkConstraint linkType;

switch (linkTypeString)
{
case "ALL":
linkType = Engine.Structure.Create.LinkConstraintFixed();
break;
case "PIN":
linkType = Engine.Structure.Create.LinkConstraintPinned();
break;
case "XY_PLANE":
linkType = Engine.Structure.Create.LinkConstraintXYPlane();
break;
case "ZX_PLANE":
linkType = Engine.Structure.Create.LinkConstraintZXPlane();
break;
case "YZ_PLANE":
linkType = Engine.Structure.Create.LinkConstraintYZPlane();
break;
case "XY_PLANE_PIN":
linkType = Engine.Structure.Create.LinkConstraintXYPlanePin();
break;
case "ZX_PLANE_PIN":
linkType = Engine.Structure.Create.LinkConstraintZXPlanePin();
break;
case "YZ_PLANE_PIN":
linkType = Engine.Structure.Create.LinkConstraintYZPlanePin();
break;
case "XY_PLATE":
linkType = Engine.Structure.Create.LinkConstraintYPlateZPlate(); //Wrong name in engine. Should be just ZPlate.
break;
case "ZX_PLATE":
linkType = Engine.Structure.Create.LinkConstraintYPlate();
break;
case "YZ_PLATE":
linkType = Engine.Structure.Create.LinkConstraintXPlate();
break;
case "XY_PLATE_PIN":
linkType = Engine.Structure.Create.LinkConstraintZPlatePin();
break;
case "ZX_PLATE_PIN":
linkType = Engine.Structure.Create.LinkConstraintYPlatePin();
break;
case "YZ_PLATE_PIN":
linkType = Engine.Structure.Create.LinkConstraintXPlatePin();
break;
default:
//String in format example: X:XYY-Y:YZZXX-Z:YY-XX:XX-YY:YY-ZZ:ZZ
linkType = new LinkConstraint();
string[] constraintProps = linkTypeString.Split('-');

foreach (string c in constraintProps)
{
string[] fromTo = c.Split(':');
string from = fromTo[0];
string to = fromTo[1];
switch (from)
{
case "X":
if (to.Contains('X'))
linkType.XtoX = true;
if (to.Contains('Y'))
linkType.XtoYY = true;
if (to.Contains('Z'))
linkType.XtoZZ = true;
break;
case "Y":
if (to.Contains('X'))
linkType.YtoXX = true;
if (to.Contains('Y'))
linkType.YtoY = true;
if (to.Contains('Z'))
linkType.YtoZZ = true;
break;
case "Z":
if (to.Contains('X'))
linkType.ZtoXX = true;
if (to.Contains('Y'))
linkType.ZtoYY = true;
if (to.Contains('Z'))
linkType.ZtoZ = true;
break;
case "XX":
if (to.Contains("XX"))
linkType.XXtoXX = true;
break;
case "YY":
if (to.Contains("YY"))
linkType.YYtoYY = true;
break;
case "ZZ":
if (to.Contains("ZZ"))
linkType.ZZtoZZ = true;
break;
}
}
break;
}

RigidLink link = new RigidLink()
{
PrimaryNode = primaryNode,
SecondaryNodes = constrainedNodes,
Constraint = linkType
};

link.ApplyTaggedName(linkName);

GSARigidConstraint RCtag = new GSARigidConstraint
{
IsRigidConstraint = true
};

link.Fragments.Add(RCtag);

linkList.Add(link);
}

return linkList;
}

Expand Down
36 changes: 18 additions & 18 deletions GSA_Adapter/Convert/FromGsa/Properties/LinkConstraint.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,24 +68,24 @@ public static LinkConstraint FromGsaLinkConstraint(string gsaProp)
case "YZ_PLANE_PIN":
constraint = Engine.Structure.Create.LinkConstraintYZPlanePin();
break;
//case "XY_PLATE":
// constraint = BHP.LinkConstraint.ZPlate;
// break;
//case "ZX_PLATE":
// constraint = BHP.LinkConstraint.YPlate;
// break;
//case "YZ_PLATE":
// constraint = BHP.LinkConstraint.YPlate;
// break; //TODO: CHECK CONSTRUCTOR NAMES IN BHOM_ENGINE
//case "XY_PLATE_PIN":
// constraint = BHP.LinkConstraint.ZPlatePin;
// break;
//case "ZX_PLATE_PIN":
// constraint = BHP.LinkConstraint.YPlatePin;
// break;
//case "YZ_PLATE_PIN":
// constraint = BHP.LinkConstraint.ZPlatePin;
// break;
case "XY_PLATE":
constraint = Engine.Structure.Create.LinkConstraintYPlateZPlate(); //TODO: Wrong name in engine. Should be just ZPlate.
break;
case "ZX_PLATE":
constraint = Engine.Structure.Create.LinkConstraintYPlate();
break;
case "YZ_PLATE":
constraint = Engine.Structure.Create.LinkConstraintXPlate();
break;
case "XY_PLATE_PIN":
constraint = Engine.Structure.Create.LinkConstraintZPlatePin();
break;
case "ZX_PLATE_PIN":
constraint = Engine.Structure.Create.LinkConstraintYPlatePin();
break;
case "YZ_PLATE_PIN":
constraint = Engine.Structure.Create.LinkConstraintXPlatePin();
break;
default:
//String in format example: X:XYY-Y:YZZXX-Z:YY-XX:XX-YY:YY-ZZ:ZZ
constraint = new LinkConstraint();
Expand Down
Loading

0 comments on commit 3920d68

Please sign in to comment.