Skip to content

Commit d544a91

Browse files
author
Fraser Greenroyd
authored
7.0 Deployment (#228)
2 parents 288c765 + 88789bd commit d544a91

File tree

8 files changed

+38
-34
lines changed

8 files changed

+38
-34
lines changed

RAM_Adapter/Create/Bar.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ private bool CreateCollection(IEnumerable<Bar> bhomBars)
207207
}
208208

209209
//Set column properties
210+
ramColumn.dOrientation = bar.OrientationAngle;
210211
IColumns colsOnStory = barStory.GetColumns();
211212
IColumn column = colsOnStory.Get(ramColumn.lUID);
212213
column.strSectionLabel = bar.SectionProperty.Name;

RAM_Adapter/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
// You can specify all the values or you can default the Build and Revision Numbers
5555
// by using the '*' as shown below:
5656
// [assembly: AssemblyVersion("1.0.*")]
57-
[assembly: AssemblyVersion("6.0.0.0")]
58-
[assembly: AssemblyFileVersion("6.3.0.0")]
57+
[assembly: AssemblyVersion("7.0.0.0")]
58+
[assembly: AssemblyFileVersion("7.0.0.0")]
5959

6060

6161

RAM_Adapter/Read/Bar.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ private List<Bar> ReadBars(List<string> ids = null)
9191
{
9292
IColumn IColumn = IColumns.GetAt(j);
9393
Bar bhomBar = BH.Adapter.RAM.Convert.ToBHoMObject(IColumn);
94+
bhomBar.OrientationAngle = IColumn.dOrientation;
9495
RAMFrameData ramFrameData = bhomBar.FindFragment<RAMFrameData>(typeof(RAMFrameData));
9596
if (ramFrameData != null)
9697
{

RAM_Adapter/Read/Results.cs

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,11 @@
2323
using System;
2424
using System.Collections;
2525
using System.Collections.Generic;
26-
using System.Linq;
26+
2727
using BH.oM.Adapters.RAM;
28-
using BH.oM.Adapter;
29-
using BH.oM.Base;
30-
using BH.oM.Structure.Elements;
31-
using BH.oM.Structure.SectionProperties;
32-
using BH.oM.Structure.SurfaceProperties;
3328
using BH.oM.Structure.Results;
34-
using BH.oM.Structure.Loads;
35-
using BH.oM.Structure.MaterialFragments;
36-
using BH.oM.Structure.Requests;
37-
using BH.oM.Analytical.Results;
29+
3830
using RAMDATAACCESSLib;
39-
using System.IO;
40-
using BH.oM.Spatial.SettingOut;
41-
using BH.Engine.Units;
42-
using BH.Engine.Adapter;
43-
using BH.Engine.Base;
4431

4532
namespace BH.Adapter.RAM
4633
{
@@ -107,21 +94,36 @@ private List<RAMFactoredEndReactions> ReadBeamEndReactions(List<string> ids = nu
10794

10895
IModel ramModel = m_Application.GetDispInterfacePointerByEnum(EINTERFACES.IModel_INT);
10996

97+
IGravityLoads1 gravLoads = m_Application.GetDispInterfacePointerByEnum(EINTERFACES.IGravityLoads_INT);
98+
11099
List<IBeam> ramBeams = ReadRamBeams(ramModel);
111100

101+
double reactLeft = 0;
102+
double reactRight = 0;
103+
double signLeft = 0;
104+
double signRight = 0;
105+
112106
foreach (IBeam beam in ramBeams)
113107
{
114-
IAnalyticalResult result = beam.GetAnalyticalResult();
115-
IMemberForces forces = result.GetMaximumComboReactions(COMBO_MATERIAL_TYPE.GRAV_STEEL);
108+
int beamID = beam.lUID;
116109

117-
RAMFactoredEndReactions bhomEndReactions = new RAMFactoredEndReactions()
110+
try
118111
{
119-
ObjectId = beam.lUID,
120-
StartReaction = forces.GetAt(0).ToBHoMObject(),
121-
EndReaction = forces.GetAt(1).ToBHoMObject(),
122-
};
112+
gravLoads.GetMaxFactoredGravityBeamReact(beamID, ref reactLeft, ref reactRight, ref signLeft, ref signRight);
123113

124-
barEndReactions.Add(bhomEndReactions);
114+
RAMFactoredEndReactions bhomEndReactions = new RAMFactoredEndReactions()
115+
{
116+
ObjectId = beam.lUID,
117+
StartReaction = reactLeft * signLeft,
118+
EndReaction = reactRight * signRight,
119+
};
120+
121+
barEndReactions.Add(bhomEndReactions);
122+
}
123+
catch
124+
{
125+
Engine.Base.Compute.RecordWarning($"Beam {beamID.ToString()} failed.");
126+
}
125127
}
126128

127129
return barEndReactions;

RAM_Engine/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
// You can specify all the values or you can default the Build and Revision Numbers
5555
// by using the '*' as shown below:
5656
// [assembly: AssemblyVersion("1.0.*")]
57-
[assembly: AssemblyVersion("6.0.0.0")]
58-
[assembly: AssemblyFileVersion("6.3.0.0")]
57+
[assembly: AssemblyVersion("7.0.0.0")]
58+
[assembly: AssemblyFileVersion("7.0.0.0")]
5959

6060

6161

RAM_oM/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
// You can specify all the values or you can default the Build and Revision Numbers
5555
// by using the '*' as shown below:
5656
// [assembly: AssemblyVersion("1.0.*")]
57-
[assembly: AssemblyVersion("6.0.0.0")]
58-
[assembly: AssemblyFileVersion("6.3.0.0")]
57+
[assembly: AssemblyVersion("7.0.0.0")]
58+
[assembly: AssemblyFileVersion("7.0.0.0")]
5959

6060

6161

RAM_oM/Results/RAMFactoredEndReactions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public class RAMFactoredEndReactions : BHoMObject
3939
/***************************************************/
4040

4141
public virtual int ObjectId { get; set; } = 0;
42-
public virtual NodeReaction StartReaction { get; set; } = null;
43-
public virtual NodeReaction EndReaction { get; set; } = null;
42+
public virtual double StartReaction { get; set; }
43+
public virtual double EndReaction { get; set; }
4444

4545
/***************************************************/
4646
}

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ Grab the [latest installer](https://bhom.xyz/) and a selection of [sample script
2323
## Getting Started for Developers 🤖
2424

2525
If you want to build the BHoM and the Toolkits from source, it's hopefully easy! 😄
26-
Do take a look at our specific wiki pages here: [Getting Started for Developers](https://github.com/BHoM/documentation/wiki/Getting-started-for-developers)
26+
Do take a look at our specific wiki pages here: [Getting Started for Developers](https://bhom.xyz/documentation/Contributing/Getting-started-for-developers/)
2727

2828

2929
## Want to Contribute? ##
3030

31-
BHoM is an open-source project and would be nothing without its community. Take a look at our contributing guidelines and tips [here](https://github.com/BHoM/BHoM/blob/master/CONTRIBUTING.md).
31+
BHoM is an open-source project and would be nothing without its community. Take a look at our contributing guidelines and tips [here](https://github.com/BHoM/BHoM/blob/main/CONTRIBUTING.md).
3232

3333

3434
## Licence ##
3535

3636
BHoM is free software licenced under GNU Lesser General Public Licence - [https://www.gnu.org/licenses/lgpl-3.0.html](https://www.gnu.org/licenses/lgpl-3.0.html)
3737
Each contributor holds copyright over their respective contributions.
3838
The project versioning (Git) records all such contribution source information.
39-
See [LICENSE](https://github.com/BHoM/BHoM/blob/master/LICENSE) and [COPYRIGHT_HEADER](https://github.com/BHoM/BHoM/blob/master/COPYRIGHT_HEADER.txt).
39+
See [LICENSE](https://github.com/BHoM/BHoM/blob/main/LICENSE) and [COPYRIGHT_HEADER](https://github.com/BHoM/BHoM/blob/main/COPYRIGHT_HEADER.txt).
4040

0 commit comments

Comments
 (0)