Skip to content

fix atc138 and pyREDi wrappers and remove obsolete x86_64 check in whale #426

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

Merged
fmckenna merged 4 commits into from
Apr 28, 2026
Merged

fix atc138 and pyREDi wrappers and remove obsolete x86_64 check in whale #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74e6bd4
fix(atc138): align tenantUnitListPath key with frontend
zsarnoczay Apr 18, 2026
07e5da4
fix(REDi): use .iloc for positional Series access in REDiWrapper
zsarnoczay Apr 27, 2026
6e2739f
Merge remote-tracking branch 'refs/remotes/upstream/master'
zsarnoczay Apr 27, 2026
eec00ad
fix(workflow): remove obsolete macOS x86_64 architecture check
zsarnoczay Apr 28, 2026
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
2 changes: 1 addition & 1 deletion modules/Workflow/WorkflowApplications.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1358,7 +1358,7 @@
"description": "Path to the json file with mandatory input parameters."
},
{
"id": "tenantUnitsListPath",
"id": "tenantUnitListPath",
"type": "path",
"description": "Path to the csv file with tenant unit information."
},
Expand Down
10 changes: 0 additions & 10 deletions modules/Workflow/whale/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,6 @@
from copy import deepcopy
from datetime import datetime
from pathlib import Path, PurePath
import platform

# check python

python_path= sys.executable
a = platform.uname()

if a.system == "Darwin" and (not a.machine=='x86_64'):
raise ValueError(f"Python version mismatch. Please update the python following the installation instruction. Current python {python_path} is based on machine={a.machine}, but we need the one for x86_64")
exit(-2)

# ################# FMK - removing check on nheri-simcenter for moment ####################

Expand Down
4 changes: 2 additions & 2 deletions modules/performanceAssessment/ATC138/ATC138Wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ def main(
help='Path to the general_inputs JSON file',
)
parser.add_argument(
'--tenantUnitsListPath',
'--tenantUnitListPath',
type=Path,
default=None,
help='Path to the tenant_units CSV file',
Expand All @@ -364,6 +364,6 @@ def main(

main(
general_inputs_path = args.generalInputsPath,
tenant_unit_list_path = args.tenantUnitsListPath,
tenant_unit_list_path = args.tenantUnitListPath,
optional_inputs_path = args.optionalInputsPath
)
4 changes: 2 additions & 2 deletions modules/performanceAssessment/REDi/REDiWrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,9 @@ def main(args): # noqa: C901, D103, PLR0915
log_output: List[str] = [] # noqa: FA100

for sample in range(num_samples):
if buildingirreparableOrCollapsed[sample]:
if buildingirreparableOrCollapsed.iloc[sample]:
# Convert the replacement time coming out of Pelicun (worker-days) into days by dividing by the number of workers
replacement_time = DVReplacementDict['Time'][sample] / num_workers
replacement_time = DVReplacementDict['Time'].iloc[sample] / num_workers

final_results_dict[sample] = get_replacement_response(
replacement_time=replacement_time
Expand Down
Loading