Skip to content

Commit 1d022f1

Browse files
author
MichalO
committed
synchronization with RSTAB repo
unit tests: 161 passed, 7 skipped in 199.78s
1 parent 4b185eb commit 1d022f1

File tree

10 files changed

+44
-45
lines changed

10 files changed

+44
-45
lines changed

‎RFEM/ConcreteDesign/ConcreteServiceabilityConfigurations.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ def __init__(self,
3737
clientObject.no = no
3838

3939
# User Defined Name
40-
clientObject.user_defined_name_enabled = True
41-
clientObject.name = name
40+
if name:
41+
clientObject.user_defined_name_enabled = True
42+
clientObject.name = name
4243

4344
# Assigned Members
4445
clientObject.assigned_to_members = ConvertToDlString(members)

‎RFEM/ConcreteDesign/ConcreteUltimateConfigurations.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ def __init__(self,
3737
clientObject.no = no
3838

3939
# User Defined Name
40-
clientObject.user_defined_name_enabled = True
41-
clientObject.name = name
40+
if name:
41+
clientObject.user_defined_name_enabled = True
42+
clientObject.name = name
4243

4344
# Assigned Members
4445
clientObject.assigned_to_members = ConvertToDlString(members)

‎RFEM/LoadCasesAndCombinations/spectralAnalysisSettings.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@ def __init__(self,
4848
clientObject.no = no
4949

5050
# Name
51-
clientObject.name = name
52-
clientObject.user_defined_name_enabled = True
51+
if name:
52+
clientObject.name = name
53+
clientObject.user_defined_name_enabled = True
5354

5455
# Periodic Combination
5556
clientObject.combination_rule_for_periodic_responses = periodic_combination.name

‎RFEM/LoadCasesAndCombinations/stabilityAnalysisSettings.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def __init__(self,
3030
clientObject.no = no
3131

3232
# Name
33-
if name is not None:
33+
if name:
3434
clientObject.user_defined_name_enabled = True
3535
clientObject.name = name
3636

@@ -84,7 +84,7 @@ def EigenvalueMethod(
8484
critical_load_factor = int
8585
minimum_initial_strain (optional): Minimum Initial Strain
8686
for minimum initial strain application:
87-
minimum_initial_strain != 0 or minimum_initial_strain is not None
87+
minimum_initial_strain != 0 or minimum_initial_strain
8888
for no minimum initial strain application:
8989
minimum_initial_strain == 0 or minimum_initial_strain is None
9090
local_torsional_rotations (optional): Local Torsional Rotations
@@ -108,7 +108,7 @@ def EigenvalueMethod(
108108
clientObject.no = no
109109

110110
# Name
111-
if name is not None:
111+
if name:
112112
clientObject.user_defined_name_enabled = True
113113
clientObject.name = name
114114

@@ -122,7 +122,7 @@ def EigenvalueMethod(
122122
clientObject.considered_favored_effect = considered_favored_effect
123123

124124
# Finding Eigenvectors Beyond Critical Load Factor
125-
if critical_load_factor is not None:
125+
if critical_load_factor:
126126
clientObject.find_eigenvectors_beyond_critical_load_factor = True
127127
clientObject.critical_load_factor = critical_load_factor
128128

@@ -134,7 +134,7 @@ def EigenvalueMethod(
134134
clientObject.minimum_initial_strain = minimum_initial_strain
135135

136136
# Local Torsional Relations
137-
if local_torsional_rotations is not None:
137+
if local_torsional_rotations:
138138
clientObject.display_local_torsional_rotations = True
139139

140140
# Eigenvalue Method
@@ -184,7 +184,7 @@ def IncrementalyMethodWithEigenvalue(
184184
critical_load_factor = int
185185
minimum_initial_strain (optional): Minimum Initial Strain
186186
for minimum initial strain application:
187-
minimum_initial_strain != 0 or minimum_initial_strain is not None
187+
minimum_initial_strain != 0 or minimum_initial_strain
188188
for no minimum initial strain application:
189189
minimum_initial_strain is None
190190
local_torsional_rotations (optional): Local Torsional Rotations
@@ -230,7 +230,7 @@ def IncrementalyMethodWithEigenvalue(
230230
clientObject.no = no
231231

232232
# Name
233-
if name is not None:
233+
if name:
234234
clientObject.user_defined_name_enabled = True
235235
clientObject.name = name
236236

@@ -244,7 +244,7 @@ def IncrementalyMethodWithEigenvalue(
244244
clientObject.considered_favored_effect = considered_favored_effect
245245

246246
# Finding Eigenvectors Beyond Critical Load Factor
247-
if critical_load_factor is not None:
247+
if critical_load_factor:
248248
clientObject.find_eigenvectors_beyond_critical_load_factor = True
249249
clientObject.critical_load_factor = critical_load_factor
250250

@@ -256,7 +256,7 @@ def IncrementalyMethodWithEigenvalue(
256256
clientObject.minimum_initial_strain = minimum_initial_strain
257257

258258
# Local Torsional Relations
259-
if local_torsional_rotations is not None:
259+
if local_torsional_rotations:
260260
clientObject.display_local_torsional_rotations = True
261261

262262
# Increase Loading
@@ -268,7 +268,7 @@ def IncrementalyMethodWithEigenvalue(
268268
clientObject.maximum_number_of_load_increments = incrementally_increasing_loading[3]
269269

270270
# Stopping of Load-Increasing
271-
if stopping_of_load_increasing is not None:
271+
if stopping_of_load_increasing:
272272
if len(stopping_of_load_increasing) != 3:
273273
raise Exception('WARNING: For active stopping of load-increasing, the stopping of load increasing parameter needs to be of length 3. Kindly check list inputs for completeness and correctness.')
274274
clientObject.activate_stopping_of_load_increasing = True
@@ -317,7 +317,7 @@ def IncrementalyMethodWithoutEigenvalue(
317317
name (str, optional): Stability Analysis Setting Name
318318
minimum_initial_strain (optional): Minimum Initial Strain
319319
for minimum initial strain application:
320-
minimum_initial_strain != 0 or minimum_initial_strain is not None
320+
minimum_initial_strain != 0 or minimum_initial_strain
321321
for no minimum initial strain application:
322322
minimum_initial_strain == 0 or minimum_initial_strain is None
323323
local_torsional_rotations (optional): Local Torsional Rotations
@@ -361,7 +361,7 @@ def IncrementalyMethodWithoutEigenvalue(
361361
clientObject.no = no
362362

363363
# Name
364-
if name is not None:
364+
if name:
365365
clientObject.user_defined_name_enabled = True
366366
clientObject.name = name
367367

@@ -376,7 +376,7 @@ def IncrementalyMethodWithoutEigenvalue(
376376
clientObject.minimum_initial_strain = minimum_initial_strain
377377

378378
# Local Torsional Relations
379-
if local_torsional_rotations is not None:
379+
if local_torsional_rotations:
380380
clientObject.display_local_torsional_rotations = True
381381

382382
# Increase Loading
@@ -388,7 +388,7 @@ def IncrementalyMethodWithoutEigenvalue(
388388
clientObject.maximum_number_of_load_increments = incrementally_increasing_loading[3]
389389

390390
# Stopping of Load-Increasing
391-
if stopping_of_load_increasing is not None:
391+
if stopping_of_load_increasing:
392392
if len(stopping_of_load_increasing) != 3:
393393
raise Exception('WARNING: For active stopping of load-increasing, the stopping of load increasing parameter needs to be of length 3. Kindly check list inputs for completeness and correctness.')
394394
clientObject.activate_stopping_of_load_increasing = True

‎RFEM/LoadCasesAndCombinations/staticAnalysisSettings.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ def __init__(self,
3131
clientObject.no = no
3232

3333
# Name
34-
clientObject.user_defined_name_enabled = True
35-
clientObject.name = name
34+
if name:
35+
clientObject.user_defined_name_enabled = True
36+
clientObject.name = name
3637

3738
# Analysis Type
3839
clientObject.analysis_type = analysis_type.name

‎RFEM/TypesForMembers/memberDefinableStiffness.py‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
class MemberDefinableStiffness():
44
def __init__(self,
55
no: int = 1,
6-
name: list = [False],
6+
name: str = '',
77
members: str = "1",
88
torsional_stiffness: float = 0.0,
99
bending_stiffness_y: float = 0.0,
@@ -23,9 +23,7 @@ def __init__(self,
2323
"""
2424
Args:
2525
no (int): Member Definable Stiffness Tag
26-
name (list): User Defined Name
27-
if name[0] == True:
28-
name[1] == Uer Defined Name
26+
name (str): User Defined Name
2927
members (str): Assigned Members
3028
torsional_stiffness (float): Torsional Stiffness
3129
bending_stiffness_y (float): Bending Stiffness in Y Direction
@@ -54,11 +52,9 @@ def __init__(self,
5452
clientObject.no = no
5553

5654
# User Defined Name
57-
if name[0]:
55+
if name:
5856
clientObject.user_defined_name_enabled = True
59-
clientObject.name = name[1]
60-
else:
61-
clientObject.user_defined_name_enabled = False
57+
clientObject.name = name
6258

6359
# Assigned Members (e.g. '5 6 7 12')
6460
clientObject.assigned_to = ConvertToDlString(members)

‎RFEM/TypesForMembers/memberEccentricity.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
class MemberEccentricity():
66
def __init__(self,
77
no: int = 1,
8-
name: list = [False],
8+
name: str = '',
99
eccentricity_type = MemberEccentricitySpecificationType.TYPE_RELATIVE,
1010
eccentricity_parameters: list = [MemberEccentricityHorizontalSectionAlignment.ALIGN_MIDDLE, MemberEccentricityVerticalSectionAlignment.ALIGN_MIDDLE],
1111
transverse_offset_type = MemberEccentricityTransverseOffsetType.TRANSVERSE_OFFSET_TYPE_NONE,
@@ -52,12 +52,9 @@ def __init__(self,
5252
clientObject.no = no
5353

5454
# User Defined Name
55-
if name[0]:
55+
if name:
5656
clientObject.user_defined_name_enabled = True
57-
clientObject.name = name[1]
58-
else:
59-
clientObject.user_defined_name_enabled = False
60-
57+
clientObject.name = name
6158

6259
# Eccentricity Specification Type
6360
clientObject.specification_type = eccentricity_type.name

‎RFEM/TypesforConcreteDesign/ConcreteDurability.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ def __init__(self,
4949
clientObject.no = no
5050

5151
# User Defined Name
52-
clientObject.user_defined_name_enabled = True
53-
clientObject.name = name
52+
if name:
53+
clientObject.user_defined_name_enabled = True
54+
clientObject.name = name
5455

5556
# Assigned Members
5657
clientObject.members = ConvertToDlString(members_no)

‎RFEM/TypesforConcreteDesign/ConcreteEffectiveLength.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,9 @@ def __init__(self,
5151
clientObject.no = no
5252

5353
# User Defined Name
54-
clientObject.user_defined_name_enabled = True
55-
clientObject.name = name
54+
if name:
55+
clientObject.user_defined_name_enabled = True
56+
clientObject.name = name
5657

5758
# Assigned Members
5859
clientObject.members = ConvertToDlString(members_no)

‎RFEM/initModel.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class Model():
4545

4646
def __init__(self,
4747
new_model: bool=True,
48-
model_name: str="TestModel",
48+
model_name: str="TestModel.rf6",
4949
delete: bool=False,
5050
delete_all: bool=False):
5151
"""
@@ -255,7 +255,7 @@ def CheckIfMethodOrTypeExists(modelClient, method_or_type, unitTestMode=False):
255255
To get list of methods invoke:
256256
list_of_methods = [method for method in Model.clientModel.wsdl.services[0].ports[0]]
257257
"""
258-
assert modelClient is not None, "WARNING: modelClient is not initialized."
258+
assert modelClient, "WARNING: modelClient is not initialized."
259259

260260
if method_or_type not in str(modelClient):
261261
if unitTestMode:
@@ -366,23 +366,23 @@ def CalculateSelectedCases(loadCases: list = None, designSituations: list = None
366366
model (RFEM Class, optional): Model to be edited
367367
'''
368368
specificObjectsToCalculate = model.clientModel.factory.create('ns0:array_of_calculate_specific_objects_elements')
369-
if loadCases is not None:
369+
if loadCases:
370370
for loadCase in loadCases:
371371
specificObjectsToCalculateLC = model.clientModel.factory.create('ns0:array_of_calculate_specific_objects_elements.element')
372372
specificObjectsToCalculateLC.no = loadCase
373373
specificObjectsToCalculateLC.parent_no = 0
374374
specificObjectsToCalculateLC.type = ObjectTypes.E_OBJECT_TYPE_LOAD_CASE.name
375375
specificObjectsToCalculate.element.append(specificObjectsToCalculateLC)
376376

377-
if designSituations is not None:
377+
if designSituations:
378378
for designSituation in designSituations:
379379
specificObjectsToCalculateDS = model.clientModel.factory.create('ns0:array_of_calculate_specific_objects_elements.element')
380380
specificObjectsToCalculateDS.no = designSituation
381381
specificObjectsToCalculateDS.parent_no = 0
382382
specificObjectsToCalculateDS.type = ObjectTypes.E_OBJECT_TYPE_DESIGN_SITUATION.name
383383
specificObjectsToCalculate.element.append(specificObjectsToCalculateDS)
384384

385-
if loadCombinations is not None:
385+
if loadCombinations:
386386
for loadCombination in loadCombinations:
387387
specificObjectsToCalculateLC = model.clientModel.factory.create('ns0:array_of_calculate_specific_objects_elements.element')
388388
specificObjectsToCalculateLC.no = loadCombination

0 commit comments

Comments
 (0)