Skip to content

Commit 499f7c6

Browse files
author
MichalO
committed
update
1 parent c40e7f5 commit 499f7c6

54 files changed

Lines changed: 375 additions & 732 deletions

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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ 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
41+
# Cross Sections
4242
CrossSection(1, "HEB 220")
4343
CrossSection(2, "IPE 300")
4444
CrossSection(3, "U 100")

Examples/ConcreteBridge/concrete_bridge.py

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

1111
#Import all modules required to access RFEM
1212
from RFEM.enums import MemberEccentricitySpecificationType, ActionCategoryType, NodalSupportType,\
13-
MemberSectionDistributionType, MemberCrossSectionAlignment, SurfaceEccentricityAlignment
13+
MemberCrossSectionDistributionType, MemberCrossSectionAlignment, SurfaceEccentricityAlignment
1414
from RFEM.initModel import Model, Calculate_all
1515
from RFEM.BasicObjects.material import Material
1616
from RFEM.BasicObjects.crossSection import CrossSection
@@ -63,7 +63,7 @@
6363
# materials
6464
Material(1, "C30/37")
6565
Material(2, "C50/60")
66-
# sections
66+
# cross sections
6767
CrossSection(1,"SQ_M1 " + str(pillar_dimension), 2, "pillar")
6868
CrossSection(2,f"R_M1 {girder_width}/{girder_height}", 2, "girder")
6969
CrossSection(3, f"R_M1 {beam_width}/{beam_height_inwards}", 2, "beam_1")
@@ -139,14 +139,14 @@
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,
144144
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,
151151
distribution_parameters= [MemberCrossSectionAlignment.SECTION_ALIGNMENT_TOP],
152152
params= {"member_eccentricity_start":3, "member_eccentricity_end":1}

Examples/DynamicAnalysis/DynamicAnalysis.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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/Hall/hall.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
# members
4545
Material(1, 'S235')
4646

47-
# sections
47+
# cross sections
4848
CrossSection(1, 'HEM 700', 1)
4949
CrossSection(2, 'IPE 500', 1)
5050

Examples/SteelDesign/SteelDesignExcel.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def main():
103103
verticalBracing = inputSheet["K6:K8"].value[0] # Vertical Bracing
104104
horizontalBracing = inputSheet["K9:K11"].value[0] # Horizontal Bracing
105105

106-
# Member Materials and Sections
106+
# Member Materials and Cross Sections
107107
column_mat = str(inputSheet["H15:I15"].value[0]) # Column Material
108108
beam_mat = str(inputSheet["H16:I16"].value[0]) # Beam Material
109109
bracing_mat = str(inputSheet["H17:I17"].value[0]) # Bracing Material
@@ -167,7 +167,7 @@ def main():
167167
Material(2, beam_mat)
168168
Material(3, bracing_mat)
169169

170-
# Creating Sections
170+
# Creating Cross Sections
171171
CrossSection(1, column, 1)
172172
CrossSection(2, beam, 2)
173173
CrossSection(3, bracing, 3)

Examples/Timber_Design/timber_hall.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
# starting modification of the model
5151
Model.clientModel.service.begin_modification()
5252

53-
# deleting all available objects/materials/sections
53+
# deleting all available objects/materials/cross-sections
5454
Model.clientModel.service.delete_all()
5555

5656
# activate required add-ons

Examples/TrussGenerator_2D/TrussGenerator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ def click(self):
750750
Material(2, lower_chord_material)
751751
Material(3, diagonal_material)
752752
Material(4, vertical_material)
753-
# Create Sections
753+
# Create Cross Sections
754754
try:
755755
CrossSection(1, upper_chord_section, 1)
756756
CrossSection(2, lower_chord_section, 2)

RFEM/BasicObjects/bracing.py

Lines changed: 0 additions & 215 deletions
This file was deleted.

RFEM/BasicObjects/crossSection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,5 @@ def GetCrossSection(object_index: int = 1, model = Model):
7171
model (RFEM Class, optional): Model to be edited
7272
'''
7373

74-
# Get Section from client model
74+
# Get Cross Section from client model
7575
return model.clientModel.service.get_cross_section(object_index)

0 commit comments

Comments
 (0)