Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Bug when Creating Bars in ETABS21 #483

Closed
wants to merge 79 commits into from
Closed

Fix Bug when Creating Bars in ETABS21 #483

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
2f9ec1a
Add SpandrelForce class and update corresponding PierSpandrelResultTy…
GCRA101 Aug 12, 2024
799b0ab
Add code to extract spandrel forces via ETABS API
GCRA101 Aug 12, 2024
fcb0e2b
Add SetLoad Method for Area Differential Load
GCRA101 Aug 13, 2024
800c273
Fix bug with DiffLoad Type Number
GCRA101 Aug 13, 2024
edd6b48
Add Set Diff Temp Load for Bars
GCRA101 Aug 13, 2024
7ee7b8f
Simplified If branching statements for Tmed and TDelta cases
GCRA101 Aug 13, 2024
1511ecd
Change inheritance of SpandrelForce from BarForce to BarResult
GCRA101 Sep 2, 2024
f3b1de7
Update Constructor of SpandrelForce
GCRA101 Sep 3, 2024
5ef3bbd
Update Inheritance header for SpandrelForce Class
GCRA101 Sep 4, 2024
f9d3cab
Add attributes to SpandrelForce Class
GCRA101 Sep 4, 2024
15c6898
Update attributes assignment within Constructor
GCRA101 Sep 4, 2024
9537538
Merge branch 'develop' of https://github.com/BHoM/ETABS_Toolkit into …
GCRA101 Sep 4, 2024
b09f44e
Add missing namespace references to SpandrelForce class
GCRA101 Sep 4, 2024
b07d46c
Add call to VonMises Function in the ReadResults method.
GCRA101 Sep 4, 2024
0759b64
Add method to extract Von Mises Membrane Stress and Membrane Force
GCRA101 Sep 4, 2024
8a420a8
Add Utility Method to compute the Von Mises Moment
GCRA101 Sep 4, 2024
8a47098
Add method to extract panel thickness for computation of VM Moment.
GCRA101 Sep 4, 2024
1768a73
Fixed syntax error
GCRA101 Sep 4, 2024
bdeac8c
Update SpandrelForce.cs
Chrisshort92 Sep 5, 2024
a2a6ff6
Add function to get thickness of panels
GCRA101 Sep 9, 2024
7026cdd
Improve Nodes Move Algorithm using Hash Tables
GCRA101 Sep 23, 2024
4fe70a5
Simplify ForceRefresh() method
GCRA101 Sep 23, 2024
a1e0f7d
Fix name variable for bhom nodes
GCRA101 Sep 23, 2024
de5e565
Add comments
GCRA101 Sep 23, 2024
3f6f48a
Add further comments
GCRA101 Sep 23, 2024
d0f7764
Add comments regarding computational cost of the algorithm in Big O N…
GCRA101 Sep 24, 2024
7e99a88
Add Warning Messages regarding temperature profile linearity.
GCRA101 Sep 25, 2024
6c90113
Add method GetStoryDrifts
GCRA101 Sep 30, 2024
28f3017
Add main call to GetStoryDrifts method
GCRA101 Sep 30, 2024
4d43c51
Add filepath property to ETABSAdapter class
GCRA101 Sep 30, 2024
5bb3e00
Delete BarDesign Class
GCRA101 Sep 30, 2024
49d4a01
Add getter to FilePath property and fix full path name
GCRA101 Sep 30, 2024
6a3b705
Fix filepath
GCRA101 Sep 30, 2024
bb77077
Update initialized PierAndSpandrelResultType to PierForce value
GCRA101 Oct 1, 2024
1306560
Merge branch 'ETABS_Toolkit-#430-AddSpandrelForceResult' of https://g…
GCRA101 Oct 1, 2024
c01050f
Align FX attribute assignment line
GCRA101 Oct 1, 2024
a2e34db
Add SetUp method for PriorityTypes within the Adapter
GCRA101 Oct 1, 2024
883dd73
Merge branch 'develop' of https://github.com/BHoM/ETABS_Toolkit into …
GCRA101 Oct 2, 2024
c2366f3
Re-add PriorityTypes.cs class
GCRA101 Oct 2, 2024
cb43e20
Add HandlePriorities assignment in ETABSAdapter Constructor
GCRA101 Oct 2, 2024
e34cb20
Turn the PriorityTypes data structure from Queue to Dictionary
GCRA101 Oct 2, 2024
54f069f
Remove modifications to variables declaration
GCRA101 Oct 14, 2024
4903342
Remove BuildEvent Lines
GCRA101 Oct 14, 2024
ca83023
Turn PriorityTypes from Dictionary to List
GCRA101 Oct 16, 2024
7129d28
Change name from Story to Storey where possible
GCRA101 Oct 24, 2024
4fbc139
Add Warning Error for Non Linear Temp Profiles Only
GCRA101 Oct 24, 2024
aad2348
Use RecordError instead of RecordWarning for NonLinear Temp Profile E…
GCRA101 Oct 24, 2024
daed2f9
Add NonLinear Profile Error Message also for Area Objects
GCRA101 Oct 28, 2024
bacbaf6
Remove blank empty lines
GCRA101 Oct 28, 2024
96184c7
Turn drift's attribute Direction from string to vector
GCRA101 Oct 28, 2024
9a63a6a
Add Configuration Debug21 and Release21 to skip not working function …
GCRA101 Oct 28, 2024
47948bf
Adjusted settings of Debug21 and Release21 configurations
GCRA101 Oct 28, 2024
edc11e0
Add Spandrel Force Result (#457)
peterjamesnugent Oct 31, 2024
b73f10c
Remove reference to unused System.Xml.Linq in MeshResults class
GCRA101 Nov 4, 2024
8fcfdb1
Add punctuation to RecordWarning
GCRA101 Nov 4, 2024
cb1a873
Remove white spaces from code
GCRA101 Nov 4, 2024
3a864f6
Add punctuation to RecordWarnings
GCRA101 Nov 4, 2024
b0e2604
Remove white spaces from ETABS Adapter Class
GCRA101 Nov 4, 2024
a20ded0
Incorporate PR comments
GCRA101 Nov 4, 2024
4cae50e
Revert unwanted changes to ETABS_oM.csproj file
GCRA101 Nov 4, 2024
84a7a17
Recover missing lines from .csproj file
GCRA101 Nov 4, 2024
de259f9
Further adjustments to .csproj file
GCRA101 Nov 4, 2024
59e7d55
Allow ETABS FilePath to be assigned when saving new unnamed file
GCRA101 Nov 4, 2024
232d419
Adjust indentation calls of ETABS API functions
GCRA101 Nov 5, 2024
29218af
Adjust code line indentations
GCRA101 Nov 5, 2024
79b1c33
Remove calculation of Von Mises Moment as it is not output by ETABS
GCRA101 Nov 5, 2024
5db1afc
Restore Solution File .sln to develop branch
GCRA101 Nov 5, 2024
01e709c
Improve Move Objects Update Feature (#476)
peterjamesnugent Nov 7, 2024
696130b
Remove unused GetPanelThickness method
GCRA101 Nov 11, 2024
5ad3b80
Fix Issue with Pushing Levels by using PriorityTypes (#480)
peterjamesnugent Nov 13, 2024
1ec4bc2
Get ETABS File Path (#478)
peterjamesnugent Nov 13, 2024
6b454f1
Extract Story Drifts (#477)
peterjamesnugent Nov 14, 2024
efd36e5
Extract Mesh VonMises Stresses (#471)
peterjamesnugent Nov 14, 2024
0b799dc
Add Set Get Differential Temp Load (#466)
IsakNaslundBh Dec 10, 2024
12649c4
Update assembly file version to 8.1.0.0
BHoMBot Dec 19, 2024
299e476
Update copyright headers to new year 2025
BHoMBot Dec 19, 2024
306a48b
Start of milestone changes for 8.1 (#485)
IsakNaslundBh Dec 20, 2024
cf8a82f
Merge branch 'ETABS_Toolkit-#482-FixBugCreatingBarsETABS21' of https:…
GCRA101 Jan 15, 2025
112e8b5
Add switch to ETABS21
GCRA101 Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 30 additions & 2 deletions ETABS_Toolkit.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ Global
Debug17|x64 = Debug17|x64
Debug18|Any CPU = Debug18|Any CPU
Debug18|x64 = Debug18|x64
Debug21|Any CPU = Debug21|Any CPU
Debug21|x64 = Debug21|x64
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release16|Any CPU = Release16|Any CPU
Expand All @@ -27,10 +29,12 @@ Global
Release17|x64 = Release17|x64
Release18|Any CPU = Release18|Any CPU
Release18|x64 = Release18|x64
Release21|Any CPU = Release21|Any CPU
Release21|x64 = Release21|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{895E2AB0-E349-4C1A-9098-51A46CD3A955}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{895E2AB0-E349-4C1A-9098-51A46CD3A955}.Debug|Any CPU.Build.0 = Debug|Any CPU
{895E2AB0-E349-4C1A-9098-51A46CD3A955}.Debug|Any CPU.ActiveCfg = Debug18|Any CPU
{895E2AB0-E349-4C1A-9098-51A46CD3A955}.Debug|Any CPU.Build.0 = Debug18|Any CPU
GCRA101 marked this conversation as resolved.
Show resolved Hide resolved
{895E2AB0-E349-4C1A-9098-51A46CD3A955}.Debug|x64.ActiveCfg = Debug|x64
{895E2AB0-E349-4C1A-9098-51A46CD3A955}.Debug|x64.Build.0 = Debug|x64
{895E2AB0-E349-4C1A-9098-51A46CD3A955}.Debug16|Any CPU.ActiveCfg = Debug16|Any CPU
Expand All @@ -45,6 +49,10 @@ Global
{895E2AB0-E349-4C1A-9098-51A46CD3A955}.Debug18|Any CPU.Build.0 = Debug|Any CPU
{895E2AB0-E349-4C1A-9098-51A46CD3A955}.Debug18|x64.ActiveCfg = Debug18|x64
{895E2AB0-E349-4C1A-9098-51A46CD3A955}.Debug18|x64.Build.0 = Debug18|x64
{895E2AB0-E349-4C1A-9098-51A46CD3A955}.Debug21|Any CPU.ActiveCfg = Debug21|Any CPU
{895E2AB0-E349-4C1A-9098-51A46CD3A955}.Debug21|Any CPU.Build.0 = Debug21|Any CPU
{895E2AB0-E349-4C1A-9098-51A46CD3A955}.Debug21|x64.ActiveCfg = Debug21|x64
{895E2AB0-E349-4C1A-9098-51A46CD3A955}.Debug21|x64.Build.0 = Debug21|x64
{895E2AB0-E349-4C1A-9098-51A46CD3A955}.Release|Any CPU.ActiveCfg = Release|Any CPU
{895E2AB0-E349-4C1A-9098-51A46CD3A955}.Release|Any CPU.Build.0 = Release|Any CPU
{895E2AB0-E349-4C1A-9098-51A46CD3A955}.Release|x64.ActiveCfg = Release|x64
Expand All @@ -61,6 +69,10 @@ Global
{895E2AB0-E349-4C1A-9098-51A46CD3A955}.Release18|Any CPU.Build.0 = Release18|Any CPU
{895E2AB0-E349-4C1A-9098-51A46CD3A955}.Release18|x64.ActiveCfg = Release18|x64
{895E2AB0-E349-4C1A-9098-51A46CD3A955}.Release18|x64.Build.0 = Release18|x64
{895E2AB0-E349-4C1A-9098-51A46CD3A955}.Release21|Any CPU.ActiveCfg = Release21|Any CPU
{895E2AB0-E349-4C1A-9098-51A46CD3A955}.Release21|Any CPU.Build.0 = Release21|Any CPU
{895E2AB0-E349-4C1A-9098-51A46CD3A955}.Release21|x64.ActiveCfg = Release21|x64
{895E2AB0-E349-4C1A-9098-51A46CD3A955}.Release21|x64.Build.0 = Release21|x64
{9552D636-D903-4492-944E-0CD392D7BFE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9552D636-D903-4492-944E-0CD392D7BFE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9552D636-D903-4492-944E-0CD392D7BFE3}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand All @@ -77,6 +89,10 @@ Global
{9552D636-D903-4492-944E-0CD392D7BFE3}.Debug18|Any CPU.Build.0 = Debug|Any CPU
{9552D636-D903-4492-944E-0CD392D7BFE3}.Debug18|x64.ActiveCfg = Debug|Any CPU
{9552D636-D903-4492-944E-0CD392D7BFE3}.Debug18|x64.Build.0 = Debug|Any CPU
{9552D636-D903-4492-944E-0CD392D7BFE3}.Debug21|Any CPU.ActiveCfg = Debug|Any CPU
{9552D636-D903-4492-944E-0CD392D7BFE3}.Debug21|Any CPU.Build.0 = Debug|Any CPU
{9552D636-D903-4492-944E-0CD392D7BFE3}.Debug21|x64.ActiveCfg = Debug|Any CPU
{9552D636-D903-4492-944E-0CD392D7BFE3}.Debug21|x64.Build.0 = Debug|Any CPU
{9552D636-D903-4492-944E-0CD392D7BFE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9552D636-D903-4492-944E-0CD392D7BFE3}.Release|Any CPU.Build.0 = Release|Any CPU
{9552D636-D903-4492-944E-0CD392D7BFE3}.Release|x64.ActiveCfg = Release|Any CPU
Expand All @@ -93,6 +109,10 @@ Global
{9552D636-D903-4492-944E-0CD392D7BFE3}.Release18|Any CPU.Build.0 = Release|Any CPU
{9552D636-D903-4492-944E-0CD392D7BFE3}.Release18|x64.ActiveCfg = Release|Any CPU
{9552D636-D903-4492-944E-0CD392D7BFE3}.Release18|x64.Build.0 = Release|Any CPU
{9552D636-D903-4492-944E-0CD392D7BFE3}.Release21|Any CPU.ActiveCfg = Release|Any CPU
{9552D636-D903-4492-944E-0CD392D7BFE3}.Release21|Any CPU.Build.0 = Release|Any CPU
{9552D636-D903-4492-944E-0CD392D7BFE3}.Release21|x64.ActiveCfg = Release|Any CPU
{9552D636-D903-4492-944E-0CD392D7BFE3}.Release21|x64.Build.0 = Release|Any CPU
{0F1B6828-633E-420D-BB61-00C16056BA8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0F1B6828-633E-420D-BB61-00C16056BA8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0F1B6828-633E-420D-BB61-00C16056BA8D}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand All @@ -109,6 +129,10 @@ Global
{0F1B6828-633E-420D-BB61-00C16056BA8D}.Debug18|Any CPU.Build.0 = Debug|Any CPU
{0F1B6828-633E-420D-BB61-00C16056BA8D}.Debug18|x64.ActiveCfg = Debug|Any CPU
{0F1B6828-633E-420D-BB61-00C16056BA8D}.Debug18|x64.Build.0 = Debug|Any CPU
{0F1B6828-633E-420D-BB61-00C16056BA8D}.Debug21|Any CPU.ActiveCfg = Debug|Any CPU
{0F1B6828-633E-420D-BB61-00C16056BA8D}.Debug21|Any CPU.Build.0 = Debug|Any CPU
{0F1B6828-633E-420D-BB61-00C16056BA8D}.Debug21|x64.ActiveCfg = Debug|Any CPU
{0F1B6828-633E-420D-BB61-00C16056BA8D}.Debug21|x64.Build.0 = Debug|Any CPU
{0F1B6828-633E-420D-BB61-00C16056BA8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0F1B6828-633E-420D-BB61-00C16056BA8D}.Release|Any CPU.Build.0 = Release|Any CPU
{0F1B6828-633E-420D-BB61-00C16056BA8D}.Release|x64.ActiveCfg = Release|Any CPU
Expand All @@ -125,6 +149,10 @@ Global
{0F1B6828-633E-420D-BB61-00C16056BA8D}.Release18|Any CPU.Build.0 = Release|Any CPU
{0F1B6828-633E-420D-BB61-00C16056BA8D}.Release18|x64.ActiveCfg = Release|Any CPU
{0F1B6828-633E-420D-BB61-00C16056BA8D}.Release18|x64.Build.0 = Release|Any CPU
{0F1B6828-633E-420D-BB61-00C16056BA8D}.Release21|Any CPU.ActiveCfg = Release|Any CPU
{0F1B6828-633E-420D-BB61-00C16056BA8D}.Release21|Any CPU.Build.0 = Release|Any CPU
{0F1B6828-633E-420D-BB61-00C16056BA8D}.Release21|x64.ActiveCfg = Release|Any CPU
{0F1B6828-633E-420D-BB61-00C16056BA8D}.Release21|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
5 changes: 5 additions & 0 deletions Etabs_Adapter/CRUD/Create/Bar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ private bool SetObject(Bar bhBar)
ret++;
}


Offset offset = bhBar.Offset;

double[] offset1 = new double[3];
Expand All @@ -153,11 +154,15 @@ private bool SetObject(Bar bhBar)
offset2[2] = offset.End.Y;
}


#if Debug21 == false && Release21 == false

if (m_model.FrameObj.SetInsertionPoint(name, (int)bhBar.InsertionPoint(), false, bhBar.ModifyStiffnessInsertionPoint(), ref offset1, ref offset2) != 0)
{
CreatePropertyWarning("Insertion point and perpendicular offset", "Bar", name);
ret++;
}
#endif
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this actually work in practice? You can simplify the if statement, but just checking `#if Debug21' - VS has quite a good UI feature that highlights the code that is active dependent on the build configuration.


if (bhBar.Release != null && bhBar.Release.StartRelease != null && bhBar.Release.EndRelease != null)
{
Expand Down
42 changes: 41 additions & 1 deletion Etabs_Adapter/Etabs_Adapter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<OutputPath>..\Build\</OutputPath>
<DefineConstants>TRACE;DEBUG;Debug17</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<AssemblyName>ETABS17_Adapter</AssemblyName>
Expand Down Expand Up @@ -228,6 +228,46 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<AssemblyName>ETABS18_Adapter</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug21|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\Build\</OutputPath>
<DefineConstants>TRACE;DEBUG;Debug21</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug21|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug21\</OutputPath>
<DefineConstants>TRACE;DEBUG;Debug18</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release21|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\Build\</OutputPath>
<DefineConstants>TRACE;Release21</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release21|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Release21\</OutputPath>
<DefineConstants>TRACE;Release18</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
GCRA101 marked this conversation as resolved.
Show resolved Hide resolved
<ItemGroup>
<Reference Include="Adapter_Engine">
<HintPath>$(ProgramData)\BHoM\Assemblies\Adapter_Engine.dll</HintPath>
Expand Down