diff --git a/modules/Workflow/WorkflowApplications.json b/modules/Workflow/WorkflowApplications.json index 07f35c7b2..758380619 100644 --- a/modules/Workflow/WorkflowApplications.json +++ b/modules/Workflow/WorkflowApplications.json @@ -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." }, diff --git a/modules/Workflow/whale/main.py b/modules/Workflow/whale/main.py index f849fca05..1255a73a0 100644 --- a/modules/Workflow/whale/main.py +++ b/modules/Workflow/whale/main.py @@ -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 #################### diff --git a/modules/performanceAssessment/ATC138/ATC138Wrapper.py b/modules/performanceAssessment/ATC138/ATC138Wrapper.py index af26f1185..c5174327a 100644 --- a/modules/performanceAssessment/ATC138/ATC138Wrapper.py +++ b/modules/performanceAssessment/ATC138/ATC138Wrapper.py @@ -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', @@ -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 ) diff --git a/modules/performanceAssessment/REDi/REDiWrapper.py b/modules/performanceAssessment/REDi/REDiWrapper.py index dcd138936..c9f20797f 100644 --- a/modules/performanceAssessment/REDi/REDiWrapper.py +++ b/modules/performanceAssessment/REDi/REDiWrapper.py @@ -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