9.0 Deployment

.ci/unit-tests/RFEM_Toolkit_Test/BHoMDataStructure/Geometry/Panel/Panel.cs

@@ -116,12 +116,12 @@ public void InitializeOpenings()
         public void PushPullPanel()
         {
 
-            adapter.Push(new List<Panel>() { panel1});
+            //adapter.Push(new List<Panel>() { panel1});
 
             //// Pull it
-            //FilterRequest panelFilter = new FilterRequest() { Type = typeof(Panel) };
-            //var panelPulled = adapter.Pull(panelFilter).ToList();
-            //Panel pp = (Panel)panelPulled[0];
+            FilterRequest panelFilter = new FilterRequest() { Type = typeof(Panel) };
+            var panelPulled = adapter.Pull(panelFilter).ToList();
+            Panel pp = (Panel)panelPulled[0];
 
             //// Check
             //Assert.IsNotNull(pp);

.ci/unit-tests/RFEM_Toolkit_Test/BHoMDataStructure/Loading/UniformlyDistributedAreaLoad.cs

@@ -142,7 +142,7 @@ public void InitializeOpenings()
         [SetUp]
         public void SetUp()
         {
-            adapter.Push(new List<Panel>() { panel1, panel2, panel3 });
+            //adapter.Push(new List<Panel>() { panel1, panel2, panel3 });
         }
 
 
@@ -268,7 +268,19 @@ public void PushOfReversedAreaUniformlyDistributedLoad()
             Assert.True(this.reverseAreaLoadList[i].Axis.Equals(areaLoadList[i].Axis));
         }
 
+        [Test]
+        public void PullUniformlyDistributedLoad()
+        {
+
+            //Act
+
+            // Push
 
+            // Pull
+            FilterRequest loadFilter = new FilterRequest() { Type = typeof(AreaUniformlyDistributedLoad) };
+            List<AreaUniformlyDistributedLoad> areaLoadList = adapter.Pull(loadFilter).ToList().Select(p => (AreaUniformlyDistributedLoad)p).ToList();
+            var a = areaLoadList.First();
+        }
     }
 
 

.ci/unit-tests/RFEM_Toolkit_Test/BHoMDataStructure/Result/BarResults.cs

@@ -36,52 +36,74 @@ namespace RFEM_Toolkit_Test.Elements
 {
 
 
-	public class BarResultTestClass
+    public class BarResultTestClass
 
-	{
+    {
 
-		RFEM6Adapter adapter;
+        RFEM6Adapter adapter;
 
-		//[TearDown]
-		//public void TearDown()
-		//{
-		//	adapter.Wipeout();
-		//}
+        //[TearDown]
+        //public void TearDown()
+        //{
+        //	adapter.Wipeout();
+        //}
 
-		[OneTimeSetUp]
-		public void InitializeRFEM6Adapter()
-		{
-			adapter = new RFEM6Adapter(active:true);
+        [OneTimeSetUp]
+        public void InitializeRFEM6Adapter()
+        {
+            adapter = new RFEM6Adapter(active: true);
 
-		}
+        }
 
-		[Test]
-		public void ReadResult()
-		{
-			List<LoadCombination?> loadCombList = adapter.Pull(new FilterRequest() { Type = typeof(LoadCombination) }).Select(l=> l as LoadCombination).ToList();
+        [Test]
+        public void ReadResult()
+        {
+            List<LoadCombination?> loadCombList = adapter.Pull(new FilterRequest() { Type = typeof(LoadCombination) }).Select(l => l as LoadCombination).ToList();
 
-			Loadcase loadcase1 = new Loadcase() { Name = "LC1", Nature = LoadNature.Dead, Number = 1 };
-			LoadCombination loadCombination = new LoadCombination { Name = "LoadCombination1", Number = 1 };
+            Loadcase loadcase1 = new Loadcase() { Name = "LC1", Nature = LoadNature.Dead, Number = 1 };
+            LoadCombination loadCombination = new LoadCombination { Name = "LoadCombination1", Number = 1 };
 
-			BarResultRequest request = new BarResultRequest();
+            BarResultRequest request = new BarResultRequest();
 
-			request.ResultType = BarResultType.BarForce;
-			request.DivisionType = DivisionType.EvenlyDistributed;
-			request.Divisions = 3;
-			request.Cases = new List<Object> { loadCombList.First() };
-			//request.Cases = new List<Object> {1};
-			request.Modes = new List<string>();
-			request.ObjectIds = new List<object> {1};
-			//request.ObjectIds = new List<object> {1,2,3,4};
+            request.ResultType = BarResultType.BarForce;
+            request.DivisionType = DivisionType.EvenlyDistributed;
+            request.Divisions = 3;
+            request.Cases = new List<Object> { loadCombList.First() };
+            //request.Cases = new List<Object> {1};
+            request.Modes = new List<string>();
+            request.ObjectIds = new List<object> { 1 };
+            //request.ObjectIds = new List<object> {1,2,3,4};
 
-			var obj = adapter.Pull(request);
+            var obj = adapter.Pull(request);
 
-			obj.First();
+            obj.First();
 
-		}
+        }
 
+        [Test]
+        public void ReadResult2()
+        {
+            List<LoadCombination?> loadCombList = adapter.Pull(new FilterRequest() { Type = typeof(LoadCombination) }).Select(l => l as LoadCombination).ToList();
+            List<LoadCombination?> relevantLoadComb = loadCombList.Take(38).ToList();
 
+            BarResultRequest request = new BarResultRequest();
 
-	}
+            request.ResultType = BarResultType.BarForce;
+            request.DivisionType = DivisionType.EvenlyDistributed;
+            request.Divisions = 2;
+            request.Cases = new List<Object> {relevantLoadComb.First()};
+            request.Modes = new List<string>();
+            //request.ObjectIds = new List<object> { 1 };
+            //request.ObjectIds = new List<object> {1,2,3,4};
+
+            var obj = adapter.Pull(request);
+
+
+            var obj_first = obj.First();
+        }
+
+
+
+    }
 }
 

.ci/unit-tests/RFEM_Toolkit_Test/RFEM_Toolkit_Test.csproj

@@ -2,14 +2,14 @@
 
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
-		<AssemblyVersion>8.0.0.0</AssemblyVersion>
+		<AssemblyVersion>9.0.0.0</AssemblyVersion>
 		<Description>https://github.com/BHoM/RFEM6_Toolkit</Description>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 
 		<IsPackable>false</IsPackable>
 		<IsTestProject>true</IsTestProject>
-		<FileVersion>8.3.0.0</FileVersion>
+		<FileVersion>9.0.0.0</FileVersion>
 	</PropertyGroup>
 
 	<ItemGroup>

RFEM6_Adapter/CRUD/Create/BHoMDataStructure/Loading/Load.cs

@@ -55,12 +55,16 @@
             //Container for Potential Surface IDs. Surface IDs are onle relevant when using Free Line Loads
             int[] surfaceIds = new int[] { };
 
             foreach (ILoad bhLoad in bhLoads)
             {
 
 
                 if (bhLoad is AreaUniformlyDistributedLoad)
                 {
+                    if (bhLoad.CustomData.Values.Any(l=>l is Polygon)) {
+                        CreateLoad_Polygon(bhLoad as AreaUniformlyDistributedLoad);
+                        continue;
+                    }
                     CreateLoad(bhLoad as AreaUniformlyDistributedLoad);
                     continue;
                 }
@@ -233,6 +237,24 @@
 
         }
 
+        private void CreateLoad_Polygon(AreaUniformlyDistributedLoad bhLoad)
+        {
+            try
+            {
+                UpdateLoadIdDictionary(bhLoad);
+                //Call Panel Load Methond to update the Panel ID Dictionary
+                this.GetCachedOrReadAsDictionary<int, Panel>();
+                int id = m_LoadcaseLoadIdDict[bhLoad.Loadcase][bhLoad.GetType().Name];
+                free_polygon_load rfemAreaLoad = (bhLoad as AreaUniformlyDistributedLoad).ToRFEM6_Polygon(id);
+                var currrSurfaceIds = (bhLoad as AreaUniformlyDistributedLoad).Objects.Elements.ToList().Select(e => m_PanelIDdict[e as Panel]).ToArray();
+                rfemAreaLoad.surfaces = currrSurfaceIds;
+                m_Model.set_free_polygon_load(bhLoad.Loadcase.Number, rfemAreaLoad);
+
+            } catch (Exception ex) {
+                BH.Engine.Base.Compute.RecordError($"The creation of {bhLoad} failed.\nA potential cause is that the applied polygon is non-planar or not parallel to the XY, YZ, or ZX plane.\nException: {ex.Message}\nStackTrace: {ex.StackTrace}");
+            }
+        }
+
         private void CreateLoad(BarUniformlyDistributedLoad bhLoad)
         {
 

RFEM6_Adapter/CRUD/Read/BHoMDataStructure/Geometry/Bar.cs

@@ -63,11 +63,12 @@ private List<Bar> ReadBars(List<string> ids = null)
             foreach (var rfMember in allRfMembers)
             {
 
+
                 Node node0 = null;
-                nodes.TryGetValue(rfMember.nodes[0], out node0);
+                nodes.TryGetValue(rfMember.node_start, out node0);
 
                 Node node1 = null;
-                nodes.TryGetValue(rfMember.nodes[1], out node1);
+                nodes.TryGetValue(rfMember.node_end, out node1);
 
                 ISectionProperty section = null;
                 sections.TryGetValue(rfMember.section_end, out section);

RFEM6_Adapter/CRUD/Read/BHoMDataStructure/Loading/Load.cs

@@ -117,6 +117,7 @@ private List<ILoad> ReadPointLoad(List<string> ids = null)
 
 		private List<ILoad> ReadAreaLoad(List<string> ids = null)
 		{
+
 			List<ILoad> loads = new List<ILoad>();
 
 			//Find all possible Load cases
@@ -136,18 +137,41 @@ private List<ILoad> ReadAreaLoad(List<string> ids = null)
 
 				if (!(surfaceLoad.load_distribution is rfModel.surface_load_load_distribution.LOAD_DISTRIBUTION_UNIFORM))
 				{
-					Engine.Base.Compute.RecordNote("The current RFEM6 includes Surfaceloads with a non-uniformal load distributeion, these Loads will not be pulled.");
+					Engine.Base.Compute.RecordNote("The current RFEM6 includes Surface loads with a non-uniformal load distributeion, these Loads will not be pulled.");
 					continue;
 				}
 
 				loads.Add(surfaceLoad.FromRFEM(loadCaseMap[surfaceLoad.load_case], panels));
 
 			}
 
-			return loads;
+
+            rfModel.object_with_children[] numbers_ = m_Model.get_all_object_numbers_by_type(rfModel.object_types.E_OBJECT_TYPE_FREE_POLYGON_LOAD);
+
+            //IEnumerable<rfModel.surface_load> foundSurfaceLoad = numbers.ToList().Select(n => m_Model.get_surface_load(n.children[0], n.no));
+            IEnumerable<rfModel.free_polygon_load> foundPolygonLoad_ = numbers_.SelectMany(n => n.children.Select(child => m_Model.get_free_polygon_load(child, n.no)));
+
+            foundPolygonLoad_ = foundPolygonLoad_.OrderBy(n => n.load_case).ThenBy(t => t.no);
+            foreach (rfModel.free_polygon_load polygonLoad in foundPolygonLoad_)
+            {
+                List<Panel> panels = polygonLoad.surfaces.ToList().Select(s => panelMap[s]).ToList();
+                if (!(polygonLoad.load_distribution is rfModel.free_polygon_load_load_distribution.LOAD_DISTRIBUTION_UNIFORM))
+                {
+                    Engine.Base.Compute.RecordNote("The current RFEM6 includes Surface loads with a non-uniformal load distributeion, these Loads will not be pulled.");
+                    continue;
+                }
+
+                loads.Add(polygonLoad.FromRFEM(loadCaseMap[polygonLoad.load_case], panels));
+
+            }
+
+
+            return loads;
 		}
 
-		private List<ILoad> ReadFreeLineLoad(List<string> ids = null)
+
+
+        private List<ILoad> ReadFreeLineLoad(List<string> ids = null)
 		{
 			List<ILoad> loads = new List<ILoad>();