Skip to content

Commit

Permalink
Fifth reconciliation PR from production/RRFS.v1 (#2485)
Browse files Browse the repository at this point in the history
* UFSWM - Fix improperly assigned fire emissions for ebb_dcycle==1 for retrospectives (NOT operational!)
  * FV3 - Fix improperly assigned fire emissions for ebb_dcycle==1 for retrospectives (NOT operational!)
    * ccpp-physics - Fix improperly assigned fire emissions for ebb_dcycle==1 for retrospectives (NOT operational!)
  • Loading branch information
grantfirl authored Dec 30, 2024
1 parent 2950089 commit 241dd8e
Show file tree
Hide file tree
Showing 14 changed files with 2,735 additions and 2,599 deletions.
2 changes: 1 addition & 1 deletion FV3
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=20241212
export BL_DATE=20241223
2 changes: 2 additions & 0 deletions tests/fv3_conf/fv3_slurm.IN_hercules
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ if [[ @[RT_COMPILER] == intel ]]; then
elif [[ @[RT_COMPILER] == gnu ]]; then
# For mvapich2
export MV2_SHMEM_COLL_NUM_COMM=128
export MV2_HOMOGENEOUS_CLUSTER=1
export MV2_USE_ALIGNED_ALLOC=1
fi

# Avoid job errors because of filesystem synchronization delays
Expand Down
628 changes: 279 additions & 349 deletions tests/logs/RegressionTests_derecho.log

Large diffs are not rendered by default.

755 changes: 458 additions & 297 deletions tests/logs/RegressionTests_gaeac5.log

Large diffs are not rendered by default.

552 changes: 276 additions & 276 deletions tests/logs/RegressionTests_gaeac6.log

Large diffs are not rendered by default.

812 changes: 434 additions & 378 deletions tests/logs/RegressionTests_hera.log

Large diffs are not rendered by default.

813 changes: 373 additions & 440 deletions tests/logs/RegressionTests_hercules.log

Large diffs are not rendered by default.

589 changes: 340 additions & 249 deletions tests/logs/RegressionTests_jet.log

Large diffs are not rendered by default.

628 changes: 322 additions & 306 deletions tests/logs/RegressionTests_orion.log

Large diffs are not rendered by default.

533 changes: 232 additions & 301 deletions tests/logs/RegressionTests_wcoss2.log

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions tests/test_changes.list
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
conus13km_control intel
conus13km_2threads intel
conus13km_restart_mismatch intel
conus13km_debug intel
conus13km_debug_qr intel
conus13km_debug_2threads intel
conus13km_radar_tten_debug intel
conus13km_control gnu
conus13km_2threads gnu
conus13km_restart_mismatch gnu
conus13km_debug gnu
conus13km_debug_qr gnu
conus13km_debug_2threads gnu
conus13km_radar_tten_debug gnu
2 changes: 1 addition & 1 deletion tests/tests/cpld_debug_pdlib_p8
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ fi
if [[ $MACHINE_ID = orion ]]; then
WLCLK=50
fi
if [[ $MACHINE_ID = gaeac5 ]] && [[ $RT_COMPILER = intelllvm ]]; then
if [[ $MACHINE_ID = gaeac5 ]]; then
WLCLK=50
fi
if [[ $MACHINE_ID = gaeac6 ]] && [[ $RT_COMPILER = intelllvm ]]; then
Expand Down
2 changes: 2 additions & 0 deletions tests/tests/rap_2threads
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,6 @@ ESMF_THREADING=false
THRD=$atm_omp_num_threads
if [[ $MACHINE_ID = hercules ]] && [[ $RT_COMPILER = gnu ]]; then
ESMF_THREADING=true
WLCLK=50
TPN=28
fi

0 comments on commit 241dd8e

Please sign in to comment.