Skip to content

Commit e8333ac

Browse files
committed
fmk - updating RC_FIAP.py to use Fy passed in JSON input as oppoed to using 420 default value
1 parent 5e4e5c3 commit e8333ac

1 file changed

Lines changed: 11 additions & 8 deletions

File tree

modules/createSAM/RCFIAP/RC_FIAP_main.py

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -357,17 +357,19 @@ def runBuildingDesign(BIM_file, EVENT_file, SAM_file, getRV): # noqa: ARG001, N
357357

358358
# The number of stories
359359
vecHeights = rootSIM['VecStoryHeights'] # noqa: N806
360-
vecHeights = vecHeights.split(',') # noqa: N806
361-
vecHeights = np.array(vecHeights, dtype=float) # noqa: N806
362-
363-
numStories = len(vecHeights) # noqa: N806
360+
#vecHeights = vecHeights.split(',') # noqa: N806
361+
#vecHeights = np.array(vecHeights, dtype=float) # noqa: N806
362+
363+
#numStories = len(vecHeights) # noqa: N806
364+
numStories = len(vecHeights.split(',')) # noqa: N806
364365
root_SAM['numStory'] = numStories
365366

366367
# The number of spans
367368
vecSpans = rootSIM['VecSpans'] # noqa: N806
368-
vecSpans = vecSpans.split(',') # noqa: N806
369-
vecSpans = np.array(vecSpans, dtype=float) # noqa: N806
370-
numSpans = len(vecSpans) # noqa: N806
369+
#vecSpans = vecSpans.split(',') # noqa: N806
370+
#vecSpans = np.array(vecSpans, dtype=float) # noqa: N806
371+
#numSpans = len(vecSpans) # noqa: N806
372+
numSpans = len(vecSpans.split(','))
371373

372374
# Get the node mapping
373375
# Consider a structure with 3 stories and 2 spans
@@ -717,6 +719,7 @@ def AvColumn(): # noqa: N802
717719

718720
# fy = float(self.ui.fy.text()) * MPa
719721
fy = float(rootSIM['FySteel']) * MPa
722+
print(f'fy: {fy}')
720723

721724
# fcB = float(self.ui.fcB.text()) * MPa
722725
fcB = float(rootSIM['BeamFpc']) * MPa # noqa: N806
@@ -1439,7 +1442,7 @@ def con_conf_regu(b, h, nsB, nsH, sst): # noqa: N803
14391442

14401443
# Function: Regularized steel parameters
14411444
def steel_mat_regu():
1442-
FyTestN4 = 490.0 * MPa # noqa: N806
1445+
FyTestN4 = fy * MPa; #FMK 490.0 * MPa # noqa: N806
14431446
FsuTestN4 = 630.0 * MPa # noqa: N806
14441447
epsuTestN4 = 0.10 # noqa: N806
14451448
LgageTestN4 = 200.0 * mm # noqa: N806

0 commit comments

Comments
 (0)