Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

First reconciliation PR from production/RRFS.v1 #2449

Merged
merged 13 commits into from
Oct 18, 2024
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 1 files
+1 −1 ccpp/physics
4 changes: 2 additions & 2 deletions modulefiles/ufs_gaea.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tests/bl_date.conf
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20241001
export BL_DATE=20241011
1 change: 1 addition & 0 deletions tests/fv3_conf/fv3_slurm.IN_gaea
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
516 changes: 258 additions & 258 deletions tests/logs/RegressionTests_acorn.log

Large diffs are not rendered by default.

565 changes: 282 additions & 283 deletions tests/logs/RegressionTests_gaea.log

Large diffs are not rendered by default.

743 changes: 371 additions & 372 deletions tests/logs/RegressionTests_hera.log

Large diffs are not rendered by default.

743 changes: 371 additions & 372 deletions tests/logs/RegressionTests_hercules.log

Large diffs are not rendered by default.

635 changes: 283 additions & 352 deletions tests/logs/RegressionTests_orion.log

Large diffs are not rendered by default.

456 changes: 228 additions & 228 deletions tests/logs/RegressionTests_wcoss2.log

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions tests/rt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tests/run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
110 changes: 108 additions & 2 deletions tests/test_changes.list
Original file line number Diff line number Diff line change
@@ -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