fix merge

arup-group · Nov 2, 2023 · f2e942b · f2e942b
1 parent 8fb7587
commit f2e942b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/GsaGH/Components/5_Results/BeamDisplacements.cs b/GsaGH/Components/5_Results/BeamDisplacements.cs
@@ -146,7 +146,7 @@ protected override void SolveInternal(IGH_DataAccess da) {
 
         ReadOnlyCollection<int> elementIds = result.ElementIds(elementlist);
         IElement1dResultSubset<IElement1dDisplacement, IDisplacement, ResultVector6<Element1dExtremaKey>> resultSet = 
-          result.BeamDisplacements.ResultSubset(elementIds, positionsCount);
+          result.Element1dDisplacements.ResultSubset(elementIds, positionsCount);
 
         List<int> permutations = result.SelectedPermutationIds ?? new List<int>() {
           1,

diff --git a/GsaGH/Parameters/5_Results/2_Results/GsaResult2.cs b/GsaGH/Parameters/5_Results/2_Results/GsaResult2.cs
@@ -8,8 +8,10 @@ namespace GsaGH.Parameters.Results {
 
   public class GsaResult2 : IGsaResult {
     // Caches
-    public IElement1dResultCache<IElement1dDisplacement, IDisplacement, ResultVector6<Element1dExtremaKey>> BeamDisplacements { get; private set; }
-    public INodeResultCache<IDisplacement, ResultVector6<NodeExtremaKey>> NodeDisplacements { get; private set; }
+    public IElement1dResultCache<IElement1dDisplacement, IDisplacement, ResultVector6<Element1dExtremaKey>> Element1dDisplacements { 
+      get; 
+      private set; 
+    }
     public INodeResultCache<IDisplacement, ResultVector6<NodeExtremaKey>> NodeDisplacements {
       get;
       private set;
@@ -107,6 +109,7 @@ private void InitialiseAnalysisCaseResults(
       CaseId = caseId;
       CaseName = model.Model.AnalysisCaseName(CaseId);
 
+      Element1dDisplacements = new Element1dDisplacementCache(result);
       NodeDisplacements = new NodeDisplacementCache(result);
       NodeReactionForces = new NodeReactionForceCache(result, model.Model);
       NodeSpringForces = new NodeSpringForceCache(result);
@@ -119,6 +122,7 @@ private void InitialiseCombinationsCaseResults(
       CaseId = caseId;
       SelectedPermutationIds = permutations.ToList();
 
+      Element1dDisplacements = new Element1dDisplacementCache(result);
       NodeDisplacements = new NodeDisplacementCache(result);
       NodeReactionForces = new NodeReactionForceCache(result, model.Model);
       NodeSpringForces = new NodeSpringForceCache(result);