Merge branch 'master' into traditional-cmake

Author: fmckenna

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."
           },

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 ####################
 

modules/performUQ/common/CMakeLists.txt

@@ -1,19 +1,21 @@
 add_executable(extractEDP extractEDP.cpp)
 target_include_directories(extractEDP PRIVATE ${CMAKE_SOURCE_DIR}/modules)
 target_link_libraries(extractEDP PRIVATE jansson::jansson)
-file(RELATIVE_PATH _rel ${CMAKE_SOURCE_DIR}/modules ${CMAKE_CURRENT_SOURCE_DIR})
-install(TARGETS extractEDP DESTINATION ${_rel})
 
 add_executable(createStandardUQ_Input createStandardUQ_Input.cpp)
 target_include_directories(createStandardUQ_Input PRIVATE ${CMAKE_SOURCE_DIR}/modules)
 target_link_libraries(createStandardUQ_Input PRIVATE jansson::jansson)
-install(TARGETS createStandardUQ_Input DESTINATION ${_rel})
 
 add_library(commonUQ STATIC parseWorkflowInput.cpp)
 target_include_directories(commonUQ PUBLIC
     ${CMAKE_SOURCE_DIR}/modules
     $<TARGET_PROPERTY:jansson::jansson,INTERFACE_INCLUDE_DIRECTORIES>)
 
+
+file(RELATIVE_PATH _rel ${CMAKE_SOURCE_DIR}/modules ${CMAKE_CURRENT_SOURCE_DIR})
+install(TARGETS createStandardUQ_Input DESTINATION ${_rel})
+install(TARGETS extractEDP DESTINATION ${_rel})
+
 install(FILES
     uq_utilities.py quoFEM_RV_models.py parallel_runner_mpi4py.py
     adaptive_doe.py common_datamodels.py convergence_metrics.py
@@ -24,3 +26,4 @@ install(FILES
     DESTINATION ${_rel})
 
 add_subdirectory(ERAClasses)
+

modules/performUQ/common/dummy_driver.c

@@ -0,0 +1,12 @@
+
+// dummy_driver.c
+//    - simple c application to create a results.out file with a singular 0.0 entry
+// written: fmk 04/26
+
+#include <stdio.h>
+int main() {
+    FILE *f = fopen("results.out", "w");
+    fprintf(f, "0.0");
+    fclose(f);
+    return 0;
+}

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
     )

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