diff --git a/modulefiles/ufs_wcoss2.intel.lua b/modulefiles/ufs_wcoss2.intel.lua index a6123009eb..22a340bfec 100644 --- a/modulefiles/ufs_wcoss2.intel.lua +++ b/modulefiles/ufs_wcoss2.intel.lua @@ -39,9 +39,6 @@ load(pathJoin("netcdf", netcdf_ver)) pio_ver=os.getenv("pio_ver") or "2.5.7" load(pathJoin("pio", pio_ver)) -esmf_ver=os.getenv("esmf_ver") or "8.3.0b09" -load(pathJoin("esmf", esmf_ver)) - fms_ver=os.getenv("fms_ver") or "2022.01" load(pathJoin("fms", fms_ver)) @@ -66,6 +63,19 @@ load(pathJoin("sp", sp_ver)) w3emc_ver=os.getenv("w3emc_ver") or "2.9.2" load(pathJoin("w3emc", w3emc_ver)) +prepend_path("MODULEPATH", "/apps/dev/lmodules/intel/19.1.3.304") + +gftl_shared_ver=os.getenv("gftl_shared_ver") or "1.5.0" +load(pathJoin("gftl_shared", gftl_shared_ver)) + +prepend_path("MODULEPATH", "/apps/dev/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.9") + +esmf_ver=os.getenv("esmf_ver") or "8.3.0b09" +load(pathJoin("esmf", esmf_ver)) + +mapl_ver=os.getenv("mapl_ver") or "2.23.1-esmf-8.3.0b09" +load(pathJoin("mapl", mapl_ver)) + setenv("CC", "cc") setenv("CXX", "CC") setenv("FC", "ftn") diff --git a/modulefiles/ufs_wcoss2.intel_debug.lua b/modulefiles/ufs_wcoss2.intel_debug.lua index a6123009eb..ad577a40a3 100644 --- a/modulefiles/ufs_wcoss2.intel_debug.lua +++ b/modulefiles/ufs_wcoss2.intel_debug.lua @@ -39,9 +39,6 @@ load(pathJoin("netcdf", netcdf_ver)) pio_ver=os.getenv("pio_ver") or "2.5.7" load(pathJoin("pio", pio_ver)) -esmf_ver=os.getenv("esmf_ver") or "8.3.0b09" -load(pathJoin("esmf", esmf_ver)) - fms_ver=os.getenv("fms_ver") or "2022.01" load(pathJoin("fms", fms_ver)) @@ -66,6 +63,19 @@ load(pathJoin("sp", sp_ver)) w3emc_ver=os.getenv("w3emc_ver") or "2.9.2" load(pathJoin("w3emc", w3emc_ver)) +prepend_path("MODULEPATH", "/apps/dev/lmodules/intel/19.1.3.304") + +gftl_shared_ver=os.getenv("gftl_shared_ver") or "1.5.0" +load(pathJoin("gftl_shared", gftl_shared_ver)) + +prepend_path("MODULEPATH", "/apps/dev/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.9") + +esmf_ver=os.getenv("esmf_ver") or "8.3.0b09-debug" +load(pathJoin("esmf", esmf_ver)) + +mapl_ver=os.getenv("mapl_ver") or "2.23.1-esmf-8.3.0b09" +load(pathJoin("mapl", mapl_ver)) + setenv("CC", "cc") setenv("CXX", "CC") setenv("FC", "ftn") diff --git a/tests/rt.conf b/tests/rt.conf index 935b5cc390..b92d68b530 100644 --- a/tests/rt.conf +++ b/tests/rt.conf @@ -2,21 +2,21 @@ # S2S tests # ################################################################################################################################################################################### -COMPILE | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8,FV3_GFS_cpld_rasmgshocnsstnoahmp_ugwp | - wcoss2.intel | fv3 | -RUN | cpld_control_p8 | - wcoss2.intel | fv3 | -RUN | cpld_restart_p8 | - wcoss2.intel | | cpld_control_p8 -RUN | cpld_2threads_p8 | - wcoss2.intel | | -RUN | cpld_esmfthreads_p8 | - wcoss2.intel | | -RUN | cpld_decomp_p8 | - wcoss2.intel | | -RUN | cpld_mpi_p8 | - wcoss2.intel | | -#RUN | cpld_multigrid_p8 | - wcoss2.intel | | -RUN | cpld_control_ciceC_p8 | - wcoss2.intel | fv3 | - -RUN | cpld_control_c192_p8 | - wcoss2.intel jet.intel acorn.intel | fv3 | -RUN | cpld_restart_c192_p8 | - wcoss2.intel jet.intel acorn.intel | | cpld_control_c192_p8 - -RUN | cpld_bmark_p8 | - wcoss2.intel jet.intel cheyenne.intel acorn.intel | fv3 | -RUN | cpld_restart_bmark_p8 | - wcoss2.intel jet.intel cheyenne.intel acorn.intel | | cpld_bmark_p8 +COMPILE | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8,FV3_GFS_cpld_rasmgshocnsstnoahmp_ugwp | | fv3 | +RUN | cpld_control_p8 | | fv3 | +RUN | cpld_restart_p8 | | | cpld_control_p8 +RUN | cpld_2threads_p8 | | | +RUN | cpld_esmfthreads_p8 | | | +RUN | cpld_decomp_p8 | | | +RUN | cpld_mpi_p8 | | | +#RUN | cpld_multigrid_p8 | | | +RUN | cpld_control_ciceC_p8 | | fv3 | + +RUN | cpld_control_c192_p8 | - wcoss2.intel jet.intel acorn.intel | fv3 | +RUN | cpld_restart_c192_p8 | - wcoss2.intel jet.intel acorn.intel | | cpld_control_c192_p8 + +RUN | cpld_bmark_p8 | - jet.intel cheyenne.intel acorn.intel | fv3 | +RUN | cpld_restart_bmark_p8 | - jet.intel cheyenne.intel acorn.intel | | cpld_bmark_p8 COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | | fv3 | RUN | cpld_control_noaero_p8 | | fv3 | @@ -33,9 +33,9 @@ COMPILE | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_sfcocn -DCMEPS_AOFLUX=O RUN | cpld_control_noaero_p8_agrid | | fv3 | COMPILE | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | | fv3 | -RUN | cpld_control_c48 | - wcoss2.intel | fv3 | -RUN | cpld_warmstart_c48 | - wcoss2.intel | fv3 | -RUN | cpld_restart_c48 | - wcoss2.intel | | cpld_warmstart_c48 +RUN | cpld_control_c48 | | fv3 | +RUN | cpld_warmstart_c48 | | fv3 | +RUN | cpld_restart_c48 | | | cpld_warmstart_c48 ################################################################################################################################################################################### # ATM tests # @@ -175,8 +175,8 @@ COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON RUN | regional_spp_sppt_shum_skeb_dyn32_phy32 | | fv3 | RUN | rap_control_dyn32_phy32 | | fv3 | RUN | hrrr_control_dyn32_phy32 | | fv3 | -RUN | rap_2threads_dyn32_phy32 | - wcoss_cray | | -RUN | hrrr_control_2threads_dyn32_phy32 | - wcoss_cray | | +RUN | rap_2threads_dyn32_phy32 | | | +RUN | hrrr_control_2threads_dyn32_phy32 | | | RUN | hrrr_control_decomp_dyn32_phy32 | | | RUN | rap_restart_dyn32_phy32 | | | rap_control_dyn32_phy32 RUN | hrrr_control_restart_dyn32_phy32 | | | hrrr_control_dyn32_phy32 @@ -268,10 +268,10 @@ RUN | control_atmwav # ATM-GOCART tests # ################################################################################################################################################################################### -COMPILE | -DAPP=ATMAERO -DCCPP_SUITES=FV3_GFS_v17_p8 -D32BIT=ON | - wcoss2.intel | fv3 | -RUN | atmaero_control_p8 | - wcoss2.intel | fv3 | -RUN | atmaero_control_p8_rad | - wcoss2.intel | fv3 | -RUN | atmaero_control_p8_rad_micro | - wcoss2.intel | fv3 | +COMPILE | -DAPP=ATMAERO -DCCPP_SUITES=FV3_GFS_v17_p8 -D32BIT=ON | | fv3 | +RUN | atmaero_control_p8 | | fv3 | +RUN | atmaero_control_p8_rad | | fv3 | +RUN | atmaero_control_p8_rad_micro | | fv3 | ################################################################################################################################################################################### # ATM-CMAQ tests ###################################################################################################################################################################################