Skip to content

Commit a8266cc

Browse files
jarabrozjarabroz
authored
Merge pull request #414 from dlubal-software/US-30347_WSI_Renaming_section_to_cross-section
Us 30347 wsi renaming section to cross section
2 parents 4f4e36a + 8073986 commit a8266cc

102 files changed

Lines changed: 640 additions & 1028 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Examples/BasicExample/main.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from RFEM.dataTypes import inf
1313
from RFEM.initModel import Model, Calculate_all, insertSpaces, GetListOfOpenedModels
1414
from RFEM.BasicObjects.material import Material
15-
from RFEM.BasicObjects.section import Section
15+
from RFEM.BasicObjects.crossSection import CrossSection
1616
from RFEM.BasicObjects.thickness import Thickness
1717
from RFEM.BasicObjects.node import Node
1818
from RFEM.BasicObjects.line import Line
@@ -38,11 +38,11 @@ def main(hall_width_L, hall_height_h_o, hall_height_h_m, number_frames, frame_sp
3838
Material(3, "Concrete f'c = 20 MPa | CSA A23.3-19", "Test")
3939

4040
# -------------------------------------------------------------
41-
# Sections
42-
Section(1, "HEB 220")
43-
Section(2, "IPE 300")
44-
Section(3, "U 100")
45-
Section(4, "Cable 14.00")
41+
# Cross Sections
42+
CrossSection(1, "HEB 220")
43+
CrossSection(2, "IPE 300")
44+
CrossSection(3, "U 100")
45+
CrossSection(4, "Cable 14.00")
4646

4747
# -------------------------------------------------------------
4848
# Thicknesses

‎Examples/CalculateInCloudExample/CalculateInCloudExample.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from RFEM.initModel import saveFile
1111
from RFEM.BasicObjects.node import Node
1212
from RFEM.BasicObjects.material import Material
13-
from RFEM.BasicObjects.section import Section
13+
from RFEM.BasicObjects.crossSection import CrossSection
1414
from RFEM.BasicObjects.member import Member
1515
from RFEM.TypesForNodes.nodalSupport import NodalSupport
1616
from RFEM.enums import NodalSupportType, MemberLoadDirection, ActionCategoryType
@@ -25,7 +25,7 @@
2525
Node(2, 5, 0, 0)
2626

2727
Material(1, "S235")
28-
Section(1,"IPE 300", 1)
28+
CrossSection(1,"IPE 300", 1)
2929

3030
Member(1, 1,2, 0, 1, 1)
3131
NodalSupport(1, "1", NodalSupportType.FIXED)

‎Examples/Cantilever/Demo1.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from RFEM.enums import NodalSupportType, NodalLoadDirection, ActionCategoryType
1212
from RFEM.initModel import CalculateSelectedCases, Model
1313
from RFEM.BasicObjects.material import Material
14-
from RFEM.BasicObjects.section import Section
14+
from RFEM.BasicObjects.crossSection import CrossSection
1515
from RFEM.BasicObjects.node import Node
1616
from RFEM.BasicObjects.member import Member
1717
from RFEM.TypesForNodes.nodalSupport import NodalSupport
@@ -30,7 +30,7 @@
3030

3131
Material(1, 'S235')
3232

33-
Section(1, 'IPE 200')
33+
CrossSection(1, 'IPE 200')
3434

3535
Node(1, 0.0, 0.0, 0.0)
3636
Node(2, l, 0.0, 0.0)

‎Examples/CantileverQt/Main.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from RFEM.enums import NodalSupportType, StaticAnalysisType, NodalLoadDirection
1010
from RFEM.initModel import Model, Calculate_all
1111
from RFEM.BasicObjects.material import Material
12-
from RFEM.BasicObjects.section import Section
12+
from RFEM.BasicObjects.crossSection import CrossSection
1313
from RFEM.BasicObjects.node import Node
1414
from RFEM.BasicObjects.member import Member
1515
from RFEM.TypesForNodes.nodalSupport import NodalSupport
@@ -64,7 +64,7 @@ def onOK(self):
6464

6565
Material(1, 'S235')
6666

67-
Section(1, 'IPE 200')
67+
CrossSection(1, 'IPE 200')
6868

6969
Node(1, 0.0, 0.0, 0.0)
7070
Node(2, l, 0.0, 0.0)

‎Examples/ConcreteBridge/concrete_bridge.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010

1111
#Import all modules required to access RFEM
1212
from RFEM.enums import MemberEccentricitySpecificationType, ActionCategoryType, NodalSupportType,\
13-
MemberSectionDistributionType, MemberSectionAlignment, SurfaceEccentricityAlignment
13+
MemberCrossSectionDistributionType, MemberCrossSectionAlignment, SurfaceEccentricityAlignment
1414
from RFEM.initModel import Model, Calculate_all
1515
from RFEM.BasicObjects.material import Material
16-
from RFEM.BasicObjects.section import Section
16+
from RFEM.BasicObjects.crossSection import CrossSection
1717
from RFEM.BasicObjects.thickness import Thickness
1818
from RFEM.BasicObjects.node import Node
1919
from RFEM.BasicObjects.line import Line
@@ -63,11 +63,11 @@
6363
# materials
6464
Material(1, "C30/37")
6565
Material(2, "C50/60")
66-
# sections
67-
Section(1,"SQ_M1 " + str(pillar_dimension), 2, "pillar")
68-
Section(2,f"R_M1 {girder_width}/{girder_height}", 2, "girder")
69-
Section(3, f"R_M1 {beam_width}/{beam_height_inwards}", 2, "beam_1")
70-
Section(4, f"R_M1 {beam_width}/{beam_height_outwards}", 2, "beam_2")
66+
# cross sections
67+
CrossSection(1,"SQ_M1 " + str(pillar_dimension), 2, "pillar")
68+
CrossSection(2,f"R_M1 {girder_width}/{girder_height}", 2, "girder")
69+
CrossSection(3, f"R_M1 {beam_width}/{beam_height_inwards}", 2, "beam_1")
70+
CrossSection(4, f"R_M1 {beam_width}/{beam_height_outwards}", 2, "beam_2")
7171
# thicknesses
7272
Thickness(1, material_no= 1, uniform_thickness_d= slab_thickness)
7373

@@ -139,16 +139,16 @@
139139
for n in range(beams_per_field*num_bridge_fields):
140140
Member.Beam(
141141
m_count+1, beam_start_node, beam_start_node+1,
142-
MemberSectionDistributionType.SECTION_DISTRIBUTION_TYPE_LINEAR,
142+
MemberCrossSectionDistributionType.SECTION_DISTRIBUTION_TYPE_LINEAR,
143143
start_section_no=3, end_section_no=4,
144-
distribution_parameters= [MemberSectionAlignment.SECTION_ALIGNMENT_TOP],
144+
distribution_parameters= [MemberCrossSectionAlignment.SECTION_ALIGNMENT_TOP],
145145
params= {"member_eccentricity_start":2, "member_eccentricity_end":1}
146146
)
147147
Member.Beam(
148148
m_count+2, beam_start_node, beam_start_node+2,
149-
MemberSectionDistributionType.SECTION_DISTRIBUTION_TYPE_LINEAR,
149+
MemberCrossSectionDistributionType.SECTION_DISTRIBUTION_TYPE_LINEAR,
150150
start_section_no=3, end_section_no=4,
151-
distribution_parameters= [MemberSectionAlignment.SECTION_ALIGNMENT_TOP],
151+
distribution_parameters= [MemberCrossSectionAlignment.SECTION_ALIGNMENT_TOP],
152152
params= {"member_eccentricity_start":3, "member_eccentricity_end":1}
153153
)
154154

‎Examples/DynamicAnalysis/DynamicAnalysis.py‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from RFEM.enums import *
1010
from RFEM.initModel import Model, insertSpaces, Calculate_all, SetAddonStatus
1111
from RFEM.BasicObjects.material import Material
12-
from RFEM.BasicObjects.section import Section
12+
from RFEM.BasicObjects.crossSection import CrossSection
1313
from RFEM.BasicObjects.thickness import Thickness
1414
from RFEM.BasicObjects.node import Node
1515
from RFEM.BasicObjects.line import Line
@@ -35,7 +35,7 @@
3535
Model(True, 'DynamicAnalysis.py')
3636

3737
Material(1, 'C35/45')
38-
Section(1, 'SQ_M1 0.25')
38+
CrossSection(1, 'SQ_M1 0.25')
3939
Thickness(1, 'Ceiling', 1, uniform_thickness_d=0.4)
4040
Thickness(2, 'Walls', 1, uniform_thickness_d=0.25)
4141
length = 10.5
@@ -139,7 +139,7 @@
139139
NodalSupport(1, '4 8 12', NodalSupportType.HINGED)
140140

141141
# Load Cases and Combinations/Settings
142-
LoadCasesAndCombinations({'activate_combination_wizard':'True'})
142+
LoadCasesAndCombinations({'combination_wizard_active':'True'})
143143
CombinationWizard(1, 'Combi1', 1, 1, False, False, None, None)
144144

145145
StaticAnalysisSettings(1)
@@ -159,10 +159,7 @@
159159
'response_spectrum_is_enabled_in_direction_x':'True',
160160
'response_spectrum_is_enabled_in_direction_y':'True',
161161
'response_spectrum_in_direction_x':'1',
162-
'response_spectrum_in_direction_y':'1',
163-
'response_spectrum_consider_accidental_torsion':'True',
164-
'response_spectrum_eccentricity_for_x_direction_relative':'0.05',
165-
'response_spectrum_eccentricity_for_y_direction_relative':'0.05'})
162+
'response_spectrum_in_direction_y':'1'})
166163

167164
LoadCombination(1, AnalysisType.ANALYSIS_TYPE_STATIC, 1, '', 1, False, False, False, True, combination_items=[[1.35, 1, 0, False], [1.5, 2, 0, True]])
168165
DesignSituation(1, DesignSituationType.DESIGN_SITUATION_TYPE_EQU_PERMANENT_AND_TRANSIENT, True, params={'combination_wizard' :'1'})

‎Examples/GPT_Tank/RFEM_prompts.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def read_file(file_path):
3131
def process_prompt(prompt):
3232
if ':' not in prompt:
3333
return prompt
34-
key, value = prompt.split(':', 1)
34+
key, value = prompt.split(':', 1)
3535
if key not in _keywords:
3636
return prompt
37-
return _keywords[key].format(placeholder =value)
37+
return _keywords[key].format(placeholder=value)

‎Examples/GPT_Tank/templates/crosssection.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Let’s start with the Cross Section section. {placeholder}
22

33
This is the syntax:
44

5-
Section(no: int = 1, name: str = 'IPE 300', material_no: int = 1, comment: str = '', params: dict = None, model = Model)
5+
CrossSection(no: int = 1, name: str = 'IPE 300', material_no: int = 1, comment: str = '', params: dict = None, model = Model)
66

77
Thickness(no: int = 1, name: str = None, material_no: int = 1, uniform_thickness_d: float = 0.20, comment: str = '', params: dict = None, model = Model)
88

‎Examples/Hall/hall.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from RFEM.enums import NodalSupportType, MemberRotationSpecificationType
1111
from RFEM.initModel import Model, insertSpaces
1212
from RFEM.BasicObjects.material import Material
13-
from RFEM.BasicObjects.section import Section
13+
from RFEM.BasicObjects.crossSection import CrossSection
1414
from RFEM.BasicObjects.node import Node
1515
from RFEM.BasicObjects.member import Member
1616
from RFEM.TypesForNodes.nodalSupport import NodalSupport
@@ -44,9 +44,9 @@
4444
# members
4545
Material(1, 'S235')
4646

47-
# sections
48-
Section(1, 'HEM 700', 1)
49-
Section(2, 'IPE 500', 1)
47+
# cross sections
48+
CrossSection(1, 'HEM 700', 1)
49+
CrossSection(2, 'IPE 500', 1)
5050

5151
# members x direction
5252
for i in range(n):
@@ -70,7 +70,7 @@
7070
if BracingV.lower() == 'yes' or BracingV.lower() == 'y':
7171

7272
Material(3, 'EN AW-3004 H14')
73-
Section(3, 'IPE 80', 3)
73+
CrossSection(3, 'IPE 80', 3)
7474

7575
BracingV_C1 = input(
7676
'Would you like to repeat a vertical bracing in every block? (Y/N)')
@@ -129,7 +129,7 @@
129129
if BracingH.lower() == 'yes' or BracingH.lower() == 'y':
130130

131131
Material(3, 'EN AW-3004 H14')
132-
Section(3, 'IPE 80', 3)
132+
CrossSection(3, 'IPE 80', 3)
133133

134134
member_count += (n-1)*4
135135
for i in range(n-1):

‎Examples/RSectionExample/Demo_import_from_rsection.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from RFEM.initModel import Model, Calculate_all
1313
from RFEM.BasicObjects.material import Material
1414
from RFEM.Tools.sectionDialogue import CreateSectionFromRsectionFile
15-
from RFEM.BasicObjects.section import Section
15+
from RFEM.BasicObjects.crossSection import CrossSection
1616
from RFEM.BasicObjects.node import Node
1717
from RFEM.BasicObjects.member import Member
1818
from RFEM.TypesForNodes.nodalSupport import NodalSupport
@@ -32,7 +32,7 @@
3232

3333
Material(1, 'S275')
3434
CreateSectionFromRsectionFile(1, filepath)
35-
Section(1, None, 1)
35+
CrossSection(1, None, 1)
3636

3737
Node(1, 0.0, 0.0, 0.0)
3838
Node(2, l, 0.0, 0.0)

0 commit comments

Comments
 (0)