gsagh-366 step1

arup-group · Oct 5, 2023 · 9894fc5 · 9894fc5
1 parent e807abf
commit 9894fc5
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/GsaGH/Parameters/5_Results/GsaNodeDisplacement.cs b/GsaGH/Parameters/5_Results/GsaNodeDisplacement.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GsaGH.Parameters._5_Results {
+  public class GsaNodeDisplacement {
+    internal Dictionary<string, GsaResultsValues> ACaseResultValues { get; private set; }
+      = new Dictionary<string, GsaResultsValues>();
+
+    internal void AddACaseValue(string nodelist, GsaResultsValues values) {
+      ACaseResultValues.Add(nodelist, values);
+    }
+  }
+}
diff --git a/GsaGH/Parameters/5_Results/GsaResult.cs b/GsaGH/Parameters/5_Results/GsaResult.cs
@@ -7,6 +7,7 @@
 using GsaAPI;
 using GsaGH.Helpers;
 using GsaGH.Helpers.GsaApi;
+using GsaGH.Parameters._5_Results;
 using OasysUnits.Units;
 using Rhino.Geometry;
 using EnergyUnit = OasysUnits.Units.EnergyUnit;
@@ -139,8 +140,8 @@ internal Dictionary<string, ReadOnlyDictionary<int, Element3DResult>>
     ///   Append to this dictionary to chache results
     ///   key = elementList
     /// </summary>
-    internal Dictionary<string, GsaResultsValues> ACaseNodeDisplacementValues { get; set; }
-      = new Dictionary<string, GsaResultsValues>();
+    internal GsaNodeDisplacement ACaseNodeDisplacementValues { get; set; }
+      = new GsaNodeDisplacement();
     /// <summary>
     ///   Analysis Case Node Footfall Result VALUES Dictionary
     ///   Append to this dictionary to chache results
@@ -931,17 +932,17 @@ internal Tuple<List<GsaResultsValues>, List<int>> NodeDisplacementValues(
       }
 
       if (Type == CaseType.AnalysisCase) {
-        if (!ACaseNodeDisplacementValues.ContainsKey(nodelist)) {
+        if (!ACaseNodeDisplacementValues.ACaseResultValues.ContainsKey(nodelist)) {
           if (!ACaseNodeResults.ContainsKey(nodelist)) {
             ACaseNodeResults.Add(nodelist, AnalysisCaseResult.NodeResults(nodelist));
           }
 
-          ACaseNodeDisplacementValues.Add(nodelist,
+          ACaseNodeDisplacementValues.AddACaseValue(nodelist,
             ResultHelper.GetNodeResultValues(ACaseNodeResults[nodelist], lengthUnit));
         }
 
         return new Tuple<List<GsaResultsValues>, List<int>>(new List<GsaResultsValues> {
-          ACaseNodeDisplacementValues[nodelist],
+          ACaseNodeDisplacementValues.ACaseResultValues[nodelist],
         }, Model.Model.Nodes(nodelist).Keys.ToList());
       }