From de5e993eb7aa915c8626bc96984d5915aa0f8512 Mon Sep 17 00:00:00 2001 From: Peter Nugent Date: Wed, 3 Jul 2024 17:43:40 +0100 Subject: [PATCH 1/3] Change inheritance for PierForce --- ETABS_oM/ETABS_oM.csproj | 13 +++++++----- ETABS_oM/Results/PierForce.cs | 33 +++++++++++++++++++++++++++--- Etabs_Adapter/Etabs_Adapter.csproj | 4 ++-- 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/ETABS_oM/ETABS_oM.csproj b/ETABS_oM/ETABS_oM.csproj index 1743d8b5..ff304cdb 100644 --- a/ETABS_oM/ETABS_oM.csproj +++ b/ETABS_oM/ETABS_oM.csproj @@ -1,4 +1,4 @@ - + @@ -33,7 +33,7 @@ - C:\ProgramData\BHoM\Assemblies\BHoM.dll + $(ProgramData)\BHoM\Assemblies\BHoM.dll False False @@ -43,12 +43,15 @@ False - C:\ProgramData\BHoM\Assemblies\Geometry_oM.dll + $(ProgramData)\BHoM\Assemblies\Geometry_oM.dll False False + + $(ProgramData)\BHoM\Assemblies\Quantities_oM.dll + - C:\ProgramData\BHoM\Assemblies\Structure_oM.dll + $(ProgramData)\BHoM\Assemblies\Structure_oM.dll False False @@ -99,4 +102,4 @@ xcopy "$(TargetDir)$(TargetFileName)" "C:\ProgramData\BHoM\Assemblies" /Y --> - + \ No newline at end of file diff --git a/ETABS_oM/Results/PierForce.cs b/ETABS_oM/Results/PierForce.cs index 9b6abd73..94f4686c 100644 --- a/ETABS_oM/Results/PierForce.cs +++ b/ETABS_oM/Results/PierForce.cs @@ -26,11 +26,14 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using BH.oM.Structure.Results; using BH.oM.Base; +using BH.oM.Quantities.Attributes; +using System.ComponentModel; namespace BH.oM.Adapters.ETABS.Results { - public class PierForce : Structure.Results.BarForce, IImmutable + public class PierForce : BarResult, IImmutable { /***************************************************/ /**** Public Properties ****/ @@ -39,12 +42,36 @@ public class PierForce : Structure.Results.BarForce, IImmutable //Just using this for the name public virtual string Location { get; } = ""; + [Force] + [Description("Axial force along the local x-axis. Positive for tension, negative for compression.")] + public virtual double FX { get; } + + [Force] + [Description("Shear force along the local y-axis. Generally minor axis shear force.")] + public virtual double FY { get; } + + [Force] + [Description("Shear force along the local z-axis. Generally major axis shear force.")] + public virtual double FZ { get; } + + [Moment] + [Description("Torsional moment.")] + public virtual double MX { get; } + + [Moment] + [Description("Bending moment about the local y-axis. Generally major axis bending moment.")] + public virtual double MY { get; } + + [Moment] + [Description("Bending moment about the local z-axis. Generally minor axis bending moment.")] + public virtual double MZ { get; } + /***************************************************/ /**** Constructors ****/ /***************************************************/ - public PierForce(IComparable objectId, IComparable resultCase, string location, int modeNumber, double timeStep, double position, int divisions, double fx, double fy, double fz, double mx, double my, double mz) - : base(objectId, resultCase, modeNumber, timeStep, position, divisions, fx, fy, fz, mx, my, mz) + public PierForce(IComparable objectId, IComparable resultCase, string location, int modeNumber, double timeStep, double position, int divisions, double FX, double FY, double FZ, double MX, double MY, double MZ) + : base(objectId, resultCase, modeNumber, timeStep, position, divisions) { Location = location; } diff --git a/Etabs_Adapter/Etabs_Adapter.csproj b/Etabs_Adapter/Etabs_Adapter.csproj index 40eb9db1..5c16caea 100644 --- a/Etabs_Adapter/Etabs_Adapter.csproj +++ b/Etabs_Adapter/Etabs_Adapter.csproj @@ -1,4 +1,4 @@ - + @@ -427,4 +427,4 @@ xcopy "$(TargetDir)CSiAPIv1.dll" "C:\ProgramData\BHoM\Assemblies" /Y --> - + \ No newline at end of file From 4f78628be5e6152fbf3aa58f786b4365edf512b7 Mon Sep 17 00:00:00 2001 From: Peter Nugent Date: Thu, 25 Jul 2024 16:12:05 +0100 Subject: [PATCH 2/3] Fixed project-compliance failures --- ETABS_oM/ETABS_oM.csproj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ETABS_oM/ETABS_oM.csproj b/ETABS_oM/ETABS_oM.csproj index ff304cdb..336eaf73 100644 --- a/ETABS_oM/ETABS_oM.csproj +++ b/ETABS_oM/ETABS_oM.csproj @@ -38,7 +38,7 @@ False - C:\ProgramData\BHoM\Assemblies\Data_oM.dll + $(ProgramData)\BHoM\Assemblies\Data_oM.dll False False @@ -49,6 +49,8 @@ $(ProgramData)\BHoM\Assemblies\Quantities_oM.dll + False + False $(ProgramData)\BHoM\Assemblies\Structure_oM.dll From a15f155e07440e6076d90c73e103cdc5d75eab4e Mon Sep 17 00:00:00 2001 From: Peter Nugent Date: Thu, 8 Aug 2024 10:57:59 +0100 Subject: [PATCH 3/3] Update constructor and lowercase inputs --- ETABS_oM/Results/PierForce.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ETABS_oM/Results/PierForce.cs b/ETABS_oM/Results/PierForce.cs index 94f4686c..cfa8e5de 100644 --- a/ETABS_oM/Results/PierForce.cs +++ b/ETABS_oM/Results/PierForce.cs @@ -70,10 +70,16 @@ public class PierForce : BarResult, IImmutable /**** Constructors ****/ /***************************************************/ - public PierForce(IComparable objectId, IComparable resultCase, string location, int modeNumber, double timeStep, double position, int divisions, double FX, double FY, double FZ, double MX, double MY, double MZ) + public PierForce(IComparable objectId, IComparable resultCase, string location, int modeNumber, double timeStep, double position, int divisions, double fx, double fy, double fz, double mx, double my, double mz) : base(objectId, resultCase, modeNumber, timeStep, position, divisions) { Location = location; + FX = fx; + FY = fy; + FZ = fz; + MX = mx; + MY = my; + MZ = mz; } /***************************************************/