Merge branch 'ufs-community:develop' into feature/ursa_port

ufs-community · Oct 21, 2024 · 4b7a360 · 4b7a360
2 parents 82b8205 + db1781a
commit 4b7a360
Show file tree

Hide file tree

Showing 13 changed files with 1,911 additions and 1,877 deletions.
diff --git a/FV3 b/FV3
diff --git a/modulefiles/ufs_gaea.intel.lua b/modulefiles/ufs_gaea.intel.lua
@@ -7,10 +7,10 @@ whatis([===[Loads libraries needed for building the UFS Weather Model on Gaea ]=
 
 prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.6.0/envs/fms-2024.01/install/modulefiles/Core")
 
-stack_intel_ver=os.getenv("stack_intel_ver") or "2023.1.0"
+stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0"
 load(pathJoin("stack-intel", stack_intel_ver))
 
-stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.25"
+stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.28"
 load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))
 
 stack_python_ver=os.getenv("stack_python_ver") or "3.10.13"

diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1 +1 @@
-export BL_DATE=20241001
+export BL_DATE=20241011
diff --git a/tests/fv3_conf/fv3_slurm.IN_gaea b/tests/fv3_conf/fv3_slurm.IN_gaea
@@ -28,6 +28,7 @@ export OMP_STACKSIZE=1024M
 export NC_BLKSZ=1M
 export ESMF_RUNTIME_PROFILE=ON
 export ESMF_RUNTIME_PROFILE_OUTPUT="SUMMARY"
+export FI_VERBS_PREFER_XRC=0
 
 # Avoid job errors because of filesystem synchronization delays
 sync && sleep 1

diff --git a/tests/logs/RegressionTests_acorn.log b/tests/logs/RegressionTests_acorn.log
diff --git a/tests/logs/RegressionTests_gaea.log b/tests/logs/RegressionTests_gaea.log
diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
diff --git a/tests/logs/RegressionTests_hercules.log b/tests/logs/RegressionTests_hercules.log
diff --git a/tests/logs/RegressionTests_orion.log b/tests/logs/RegressionTests_orion.log
diff --git a/tests/logs/RegressionTests_wcoss2.log b/tests/logs/RegressionTests_wcoss2.log
diff --git a/tests/rt.sh b/tests/rt.sh
@@ -717,13 +717,12 @@ case ${MACHINE_ID} in
       ROCOTO_SCHEDULER="slurm"
     fi
 
-    export LD_PRELOAD=/opt/cray/pe/gcc/12.2.0/snos/lib64/libstdc++.so.6
-    module load PrgEnv-intel/8.3.3
-    module load intel-classic/2023.1.0
-    module load cray-mpich/8.1.25
+    export LD_PRELOAD=/usr/lib64/libstdc++.so.6
+    module load PrgEnv-intel/8.5.0
+    module load intel-classic/2023.2.0
+    module load cray-mpich/8.1.28
     module load python/3.9.12
     module use /ncrc/proj/epic/spack-stack/modulefiles
-    module load gcc/12.2.0
     if [[ "${ECFLOW:-false}" == true ]] ; then
       module load ecflow/5.8.4
       ECF_HOST=$(hostname)

diff --git a/tests/run_test.sh b/tests/run_test.sh
@@ -118,7 +118,7 @@ case ${MACHINE_ID} in
     ;;
   gaea)
     module use /ncrc/proj/epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core
-    module load stack-intel/2023.1.0 stack-cray-mpich/8.1.25
+    module load stack-intel/2023.2.0 stack-cray-mpich/8.1.28
     module load nccmp/1.9.0.1
     ;;
   derecho)

diff --git a/tests/test_changes.list b/tests/test_changes.list
@@ -1,2 +1,108 @@
-datm_cdeps_lm4_gswp3 intel
-datm_cdeps_lm4_gswp3_rst intel
+control_p8_mynn intel
+regional_control intel
+regional_restart intel
+regional_decomp intel
+regional_2threads intel
+regional_noquilt intel
+regional_netcdf_parallel intel
+regional_2dwrtdecomp intel
+regional_wofs intel
+rap_control intel
+regional_spp_sppt_shum_skeb intel
+rap_decomp intel
+rap_2threads intel
+rap_restart intel
+rap_sfcdiff intel
+rap_sfcdiff_decomp intel
+rap_sfcdiff_restart intel
+hrrr_control intel
+hrrr_control_decomp intel
+hrrr_control_2threads intel
+hrrr_control_restart intel
+rrfs_v1beta intel
+rrfs_v1nssl intel
+rrfs_v1nssl_nohailnoccn intel
+regional_control_faster intel
+regional_debug intel
+rap_control_debug intel
+hrrr_control_debug intel
+hrrr_gf_debug intel
+hrrr_c3_debug intel
+rap_unified_drag_suite_debug intel
+rap_diag_debug intel
+rap_cires_ugwp_debug intel
+rap_unified_ugwp_debug intel
+rap_lndp_debug intel
+rap_progcld_thompson_debug intel
+rap_noah_debug intel
+rap_sfcdiff_debug intel
+rap_noah_sfcdiff_cires_ugwp_debug intel
+rrfs_v1beta_debug intel
+rap_clm_lake_debug intel
+rap_flake_debug intel
+gnv1_c96_no_nest_debug intel
+regional_spp_sppt_shum_skeb_dyn32_phy32 intel
+rap_control_dyn32_phy32 intel
+hrrr_control_dyn32_phy32 intel
+rap_2threads_dyn32_phy32 intel
+hrrr_control_2threads_dyn32_phy32 intel
+hrrr_control_decomp_dyn32_phy32 intel
+rap_restart_dyn32_phy32 intel
+hrrr_control_restart_dyn32_phy32 intel
+conus13km_control intel
+conus13km_2threads intel
+conus13km_restart_mismatch intel
+rap_control_dyn64_phy32 intel
+rap_control_debug_dyn32_phy32 intel
+hrrr_control_debug_dyn32_phy32 intel
+conus13km_debug intel
+conus13km_debug_qr intel
+conus13km_debug_2threads intel
+conus13km_radar_tten_debug intel
+rap_control_dyn64_phy32_debug intel
+gnv1_nested intel
+rap_control gnu
+rap_decomp gnu
+rap_2threads gnu
+rap_restart gnu
+rap_sfcdiff gnu
+rap_sfcdiff_decomp gnu
+rap_sfcdiff_restart gnu
+hrrr_control gnu
+hrrr_control_noqr gnu
+hrrr_control_2threads gnu
+hrrr_control_decomp gnu
+hrrr_control_restart gnu
+hrrr_control_restart_noqr gnu
+rrfs_v1beta gnu
+regional_debug gnu
+rap_control_debug gnu
+hrrr_control_debug gnu
+hrrr_gf_debug gnu
+hrrr_c3_debug gnu
+rap_diag_debug gnu
+rap_noah_sfcdiff_cires_ugwp_debug gnu
+rap_progcld_thompson_debug gnu
+rrfs_v1beta_debug gnu
+rap_flake_debug gnu
+rap_clm_lake_debug gnu
+gnv1_c96_no_nest_debug gnu
+rap_control_dyn32_phy32 gnu
+hrrr_control_dyn32_phy32 gnu
+rap_2threads_dyn32_phy32 gnu
+hrrr_control_2threads_dyn32_phy32 gnu
+hrrr_control_decomp_dyn32_phy32 gnu
+rap_restart_dyn32_phy32 gnu
+hrrr_control_restart_dyn32_phy32 gnu
+conus13km_control gnu
+conus13km_2threads gnu
+conus13km_restart_mismatch gnu
+rap_control_dyn64_phy32 gnu
+rap_control_debug_dyn32_phy32 gnu
+hrrr_control_debug_dyn32_phy32 gnu
+conus13km_debug gnu
+conus13km_debug_qr gnu
+conus13km_debug_2threads gnu
+conus13km_radar_tten_debug gnu
+rap_control_dyn64_phy32_debug gnu
+cpld_regional_atm_fbh intel