Skip to content

Commit

Permalink
[production/RRFS.v1] physics updates for RRFS.v1 code freeze (#2147)
Browse files Browse the repository at this point in the history 
* Bugfix for the RRFS.v1 code freeze
* MYNN updates
* RUC LSM updates (ufs-community/ccpp-physics#163)
* GF updates for humidity DA; restore scale-awareness in the 1st hour; suppress weak radar reflectivity over water
smoke plume rise updates for stability on WCOSS2
---------

Co-authored-by: JONG KIM <[email protected]>
Co-authored-by: matthew pyle <[email protected]>
  • Loading branch information
@haiqinli @jkbk2004 @MatthewPyle-NOAA
3 people authored Mar 1, 2024
1 parent aeea708 commit 7c52456
Show file tree
Hide file tree
Showing 8 changed files with 4,130 additions and 7,841 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 1 files
+1 −1 ccpp/physics
2 changes: 1 addition & 1 deletion tests/bl_date.conf
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20240126
export BL_DATE=20240227
2,080 changes: 1,040 additions & 1,040 deletions tests/logs/RegressionTests_hera.log
View file

Large diffs are not rendered by default.

2,183 changes: 1,052 additions & 1,131 deletions tests/logs/RegressionTests_hercules.log
View file

Large diffs are not rendered by default.

1,562 changes: 781 additions & 781 deletions tests/logs/RegressionTests_orion.log
View file

Large diffs are not rendered by default.

6,041 changes: 1,161 additions & 4,880 deletions tests/logs/RegressionTests_wcoss2.log
View file

Large diffs are not rendered by default.

87 changes: 87 additions & 0 deletions tests/rt.conf_rrfs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,95 @@
# Item 4: Controls whether the run creates its own baseline or it uses the baseline from a different (control) test.
# Item 5: Test name to compare baselines with if not itself.

### Intel Tests ###


COMPILE | rrfs | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON | | fv3 |
RUN | rap_control | | baseline |
RUN | regional_spp_sppt_shum_skeb | | baseline |
RUN | rap_decomp | - noaacloud | |
RUN | rap_2threads | - derecho noaacloud | |
RUN | rap_restart | - noaacloud | | rap_control
RUN | rap_sfcdiff | - noaacloud | baseline |
RUN | rap_sfcdiff_decomp | - noaacloud | |
RUN | rap_sfcdiff_restart | - noaacloud | | rap_sfcdiff
RUN | hrrr_control | - noaacloud | baseline |
RUN | hrrr_control_decomp | - noaacloud | |
RUN | hrrr_control_2threads | - noaacloud | |
RUN | hrrr_control_restart | - noaacloud | | hrrr_control
RUN | rrfs_v1beta | | baseline |
RUN | rrfs_v1nssl | | baseline |
RUN | rrfs_v1nssl_nohailnoccn | | baseline |

COMPILE | atm_faster_dyn32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON -DFASTER=ON | | fv3 |
RUN | control_p8_faster | - noaacloud | baseline |
RUN | regional_control_faster | | baseline |

### DEBUG ATM tests ###
COMPILE | atm_debug_dyn32 | intel | -DAPP=ATM -DDEBUG=ON -D32BIT=ON -DCCPP_SUITES=FV3_HRRR,FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_ras,FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km,FV3_RAP,FV3_RAP_unified_ugwp,FV3_RAP_cires_ugwp,FV3_RAP_flake,FV3_RAP_clm_lake,FV3_RAP_noah,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta,FV3_HRRR_c3,FV3_HRRR_gf,FV3_global_nest_v1 | - noaacloud | fv3 |
RUN | control_CubedSphereGrid_debug | - noaacloud | baseline |
RUN | control_wrtGauss_netcdf_parallel_debug | - noaacloud | baseline |
RUN | control_stochy_debug | - noaacloud | baseline |
RUN | control_lndp_debug | - noaacloud | baseline |
RUN | control_csawmg_debug | - noaacloud | baseline |
RUN | control_csawmgt_debug | - noaacloud | baseline |
RUN | control_ras_debug | - noaacloud | baseline |
RUN | control_diag_debug | - noaacloud | baseline |
RUN | control_debug_p8 | - noaacloud | baseline |
RUN | regional_debug | - noaacloud | baseline |
RUN | rap_control_debug | - noaacloud | baseline |
RUN | hrrr_control_debug | - noaacloud | baseline |
RUN | hrrr_gf_debug | - noaacloud | baseline |
RUN | hrrr_c3_debug | - noaacloud | baseline |
RUN | rap_unified_drag_suite_debug | - noaacloud | |
RUN | rap_diag_debug | - noaacloud | baseline |
RUN | rap_cires_ugwp_debug | - noaacloud | baseline |
RUN | rap_unified_ugwp_debug | - noaacloud | |
RUN | rap_lndp_debug | - noaacloud | baseline |
RUN | rap_progcld_thompson_debug | - noaacloud | baseline |
RUN | rap_noah_debug | - noaacloud | baseline |
RUN | rap_sfcdiff_debug | - noaacloud | baseline |
RUN | rap_noah_sfcdiff_cires_ugwp_debug | - noaacloud | baseline |
RUN | rrfs_v1beta_debug | - noaacloud | baseline |
RUN | rap_clm_lake_debug | - noaacloud | baseline |
RUN | rap_flake_debug | - noaacloud | baseline |
RUN | gnv1_c96_no_nest_debug | - noaacloud | baseline |

### 32-bit physics tests ###
COMPILE | rrfs_dyn32_phy32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON | - noaacloud | fv3 |
RUN | regional_spp_sppt_shum_skeb_dyn32_phy32 | - noaacloud | baseline |
RUN | rap_control_dyn32_phy32 | - noaacloud | baseline |
RUN | hrrr_control_dyn32_phy32 | - noaacloud | baseline |
RUN | rap_2threads_dyn32_phy32 | - derecho noaacloud | |
RUN | hrrr_control_2threads_dyn32_phy32 | - derecho noaacloud | |
RUN | hrrr_control_decomp_dyn32_phy32 | - noaacloud | |
RUN | rap_restart_dyn32_phy32 | - noaacloud | | rap_control_dyn32_phy32
RUN | hrrr_control_restart_dyn32_phy32 | - noaacloud | | hrrr_control_dyn32_phy32

COMPILE | rrfs_dyn32_phy32_faster | intel | -DAPP=ATM -DFASTER=ON -DCCPP_SUITES=FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON | - noaacloud | fv3 |
RUN | conus13km_control | - noaacloud | baseline |
RUN | conus13km_2threads | - noaacloud | | conus13km_control
RUN | conus13km_restart_mismatch | - noaacloud | baseline | conus13km_control

# Expected to fail:
# RUN | conus13km_restart | - noaacloud | | conus13km_control
# RUN | conus13km_decomp | - noaacloud | | conus13km_control

COMPILE | rrfs_dyn64_phy32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -DCCPP_32BIT=ON | - noaacloud | fv3 |
RUN | rap_control_dyn64_phy32 | - noaacloud | baseline |

COMPILE | rrfs_dyn32_phy32_debug | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR,FV3_HRRR_gf -D32BIT=ON -DCCPP_32BIT=ON -DDEBUG=ON | - noaacloud | fv3 |
RUN | rap_control_debug_dyn32_phy32 | - noaacloud | baseline |
RUN | hrrr_control_debug_dyn32_phy32 | - noaacloud | baseline |
RUN | conus13km_debug | - noaacloud | baseline |
RUN | conus13km_debug_qr | - derecho noaacloud | |
RUN | conus13km_debug_2threads | - derecho noaacloud | |
RUN | conus13km_radar_tten_debug | - noaacloud | baseline |

# Expected to fail:
# RUN | conus13km_debug_decomp | - noaacloud | |

COMPILE | rrfs_dyn64_phy32_debug | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -DCCPP_32BIT=ON -DDEBUG=ON | - noaacloud | fv3 |
RUN | rap_control_dyn64_phy32_debug | - noaacloud | baseline |


14 changes: 7 additions & 7 deletions tests/rt.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ if [[ $MACHINE_ID = wcoss2 ]]; then
mkdir -p ${ECF_COMDIR}
export colonifnco=":output" # hack

DISKNM=/lfs/h2/emc/nems/noscrub/emc.nems/RT
DISKNM=/lfs/h2/emc/lam/noscrub/emc.lam/RRFS.v1_RT
QUEUE=dev
COMPILE_QUEUE=dev
PARTITION=
Expand Down Expand Up @@ -322,7 +322,7 @@ elif [[ $MACHINE_ID = gaea-c5 ]]; then
ECFLOW_START=/lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/ecflow-5.8.4/bin/ecflow_start.sh
ECF_PORT=$(( $(id -u) + 1500 ))

DISKNM=/lustre/f2/pdata/ncep/role.epic/C5/RT
DISKNM=/lustre/f2/pdata/ncep/role.epic/C5/RT/RRFS.v1
QUEUE=normal
COMPILE_QUEUE=normal
PARTITION=c5
Expand All @@ -347,7 +347,7 @@ elif [[ $MACHINE_ID = hera ]]; then

PARTITION=
dprefix=/scratch1/NCEPDEV
DISKNM=/scratch2/NAGAPE/epic/UFS-WM_RT
DISKNM=/scratch2/NAGAPE/epic/UFS-WM_RT/RRFS.v1
STMP=$dprefix/stmp4
PTMP=$dprefix/stmp2

Expand All @@ -373,7 +373,7 @@ elif [[ $MACHINE_ID = orion ]]; then
COMPILE_QUEUE=batch
PARTITION=orion
dprefix=/work/noaa/stmp/${USER}
DISKNM=/work/noaa/epic/UFS-WM_RT
DISKNM=/work/noaa/epic/UFS-WM_RT/RRFS.v1
STMP=$dprefix/stmp
PTMP=$dprefix/stmp

Expand All @@ -395,7 +395,7 @@ elif [[ $MACHINE_ID = hercules ]]; then
COMPILE_QUEUE=windfall
PARTITION=hercules
dprefix=/work2/noaa/stmp/${USER}
DISKNM=/work/noaa/epic/hercules/UFS-WM_RT
DISKNM=/work/noaa/epic/hercules/UFS-WM_RT/RRFS.v1
STMP=$dprefix/stmp
PTMP=$dprefix/stmp

Expand All @@ -417,7 +417,7 @@ elif [[ $MACHINE_ID = jet ]]; then
QUEUE=batch
COMPILE_QUEUE=batch
PARTITION=xjet
DISKNM=/mnt/lfs4/HFIP/hfv3gfs/role.epic/RT
DISKNM=/mnt/lfs4/HFIP/hfv3gfs/role.epic/RT/RRFS.v1
dprefix=${dprefix:-/lfs4/HFIP/$ACCNR/$USER}
STMP=${STMP:-$dprefix/RT_BASELINE}
PTMP=${PTMP:-$dprefix/RT_RUNDIRS}
Expand Down Expand Up @@ -462,7 +462,7 @@ elif [[ $MACHINE_ID = derecho ]]; then
COMPILE_QUEUE=main
PARTITION=
dprefix=/glade/derecho/scratch
DISKNM=/glade/derecho/scratch/epicufsrt/ufs-weather-model/RT/
DISKNM=/glade/derecho/scratch/epicufsrt/ufs-weather-model/RT/RRFS.v1
STMP=$dprefix
PTMP=$dprefix
SCHEDULER=pbs
Expand Down

0 comments on commit 7c52456

Please sign in to comment.