diff --git a/.gitignore b/.gitignore index 81336938..fc1c342b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,7 @@ parm/*.out parm/*.err parm/*.log parm/land_analysis.yaml -parm/log.rocoto_launch +parm/log.* __pycache__ *.swp diff --git a/modulefiles/build_orion_intel.lua b/modulefiles/build_orion_intel.lua index ed0cc202..54e5b2e7 100644 --- a/modulefiles/build_orion_intel.lua +++ b/modulefiles/build_orion_intel.lua @@ -34,6 +34,9 @@ load(pathJoin("mapl", mapl_ver)) load(pathJoin("prod_util", prod_util_ver)) load(pathJoin("ufs-pyenv", ufs_pyenv_ver)) +setenv("CFLAGS","-diag-disable=10441") +setenv("FFLAGS","-diag-disable=10441") + setenv("CC", "mpiicc") setenv("CXX", "mpiicpc") setenv("FC", "mpiifort") diff --git a/modulefiles/wflow_orion.lua b/modulefiles/wflow_orion.lua index 0942ae36..2acb44b1 100644 --- a/modulefiles/wflow_orion.lua +++ b/modulefiles/wflow_orion.lua @@ -6,8 +6,8 @@ the MSU machine Orion whatis([===[Loads libraries needed for running the land-DA workflow on Orion ]===]) load("contrib") -load("rocoto") -load("wget") +load("ruby/3.2.3") +load("rocoto/1.3.7") unload("python") load("conda") diff --git a/parm/land_analysis_hera.yaml b/parm/land_analysis_hera.yaml index 2ff5ff9f..0ff505f6 100644 --- a/parm/land_analysis_hera.yaml +++ b/parm/land_analysis_hera.yaml @@ -21,7 +21,7 @@ workflow: RES: "96" FCSTHR: "24" NPROCS_ANALYSIS: "6" - NPROCS_FORECAST: "6" + NPROCS_FORECAST: "7" OBSDIR: "" OBSDIR_SUBDIR: "" OBS_TYPES: "GHCN" diff --git a/parm/land_analysis_orion.yaml b/parm/land_analysis_orion.yaml index f7ff616c..3be2ffe4 100644 --- a/parm/land_analysis_orion.yaml +++ b/parm/land_analysis_orion.yaml @@ -21,7 +21,7 @@ workflow: RES: "96" FCSTHR: "24" NPROCS_ANALYSIS: "6" - NPROCS_FORECAST: "6" + NPROCS_FORECAST: "7" OBSDIR: "" OBSDIR_SUBDIR: "" OBS_TYPES: "GHCN" diff --git a/parm/launch_rocoto_wflow.sh b/parm/launch_rocoto_wflow.sh index e55324ab..968ee88c 100755 --- a/parm/launch_rocoto_wflow.sh +++ b/parm/launch_rocoto_wflow.sh @@ -8,6 +8,7 @@ PARMdir=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}" )" )" && pwd -P) source ${PARMdir}/detect_platform.sh # Load rocoto +module purge if [ "${MACHINE}" == "hera" ]; then module load rocoto elif [ "${MACHINE}" == "orion" ]; then @@ -16,7 +17,8 @@ elif [ "${MACHINE}" == "orion" ]; then module load stack-intel/$stack_intel_ver module load stack-python/$stack_python_ver module load contrib - module load rocoto + module load ruby/3.2.3 + module load rocoto/1.3.7 else echo "FATAL ERROR: modules are not loaded" fi @@ -26,6 +28,7 @@ WFLOW_XML_FN="land_analysis.xml" rocoto_xml_bn=$( basename "${WFLOW_XML_FN}" ".xml" ) rocoto_database_fn="${rocoto_xml_bn}.db" WFLOW_LOG_FN="log.rocoto_launch" +LOG_FN_ROCOTO_RUN="log.rocoto_run" # Initialize the default status of the workflow to "IN PROGRESS". wflow_status="IN PROGRESS" @@ -43,8 +46,8 @@ if [ "$#" -eq 1 ] && [ "$1" == "add" ]; then fi cd "${PARMdir}" -rocotorun_cmd="rocotorun -w \"${WFLOW_XML_FN}\" -d \"${rocoto_database_fn}\"" -eval ${rocotorun_cmd} +rocotorun_cmd="rocotorun -w \"${WFLOW_XML_FN}\" -d \"${rocoto_database_fn}\" -v 10" +eval ${rocotorun_cmd} > ${LOG_FN_ROCOTO_RUN} 2>&1 rocotostat_output=$( rocotostat -w ${WFLOW_XML_FN} -d ${rocoto_database_fn} ) diff --git a/versions/build.ver_orion b/versions/build.ver_orion index 835976d2..f3dae589 100644 --- a/versions/build.ver_orion +++ b/versions/build.ver_orion @@ -1,6 +1,6 @@ #!/bin/bash -export modulepath_spack_stack="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core" +export modulepath_spack_stack="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env-rocky9/install/modulefiles/Core" export bacio_ver="2.4.1" export cmake_ver="3.23.1" @@ -21,8 +21,8 @@ export netcdf_fortran_ver="4.6.1" export parallelio_ver="2.5.10" export prod_util_ver="2.1.1" export sp_ver="2.5.0" -export stack_intel_oneapi_mpi_ver="2021.5.1" -export stack_intel_ver="2022.0.2" +export stack_intel_oneapi_mpi_ver="2021.9.0" +export stack_intel_ver="2021.9.0" export stack_python_ver="3.10.13" export ufs_pyenv_ver="1.0.0" export w3emc_ver="2.10.0" diff --git a/versions/run.ver_orion b/versions/run.ver_orion index 145d630c..81bbc060 100644 --- a/versions/run.ver_orion +++ b/versions/run.ver_orion @@ -1,6 +1,6 @@ #!/bin/bash -export modulepath_spack_stack="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core" +export modulepath_spack_stack="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env-rocky9/install/modulefiles/Core" export bacio_ver="2.4.1" export cmake_ver="3.23.1" @@ -28,8 +28,8 @@ export py_pyyaml_ver="6.0" export py_scipy_ver="1.11.3" export py_xarray_ver="2023.7.0" export sp_ver="2.5.0" -export stack_intel_oneapi_mpi_ver="2021.5.1" -export stack_intel_ver="2022.0.2" +export stack_intel_oneapi_mpi_ver="2021.9.0" +export stack_intel_ver="2021.9.0" export stack_python_ver="3.10.13" export ufs_pyenv_ver="1.0.0" export w3emc_ver="2.10.0"