Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
b390aa4
tempo version 3
AndersJensen-NOAA Feb 4, 2026
69492cb
tempo version 3
AndersJensen-NOAA Feb 4, 2026
71ae592
update pointer to UFSATM
AndersJensen-NOAA Feb 13, 2026
2e63aed
update pointer to ufsatm (fv3atm)
AndersJensen-NOAA Feb 13, 2026
2722b67
update point to ufsatm
AndersJensen-NOAA Feb 13, 2026
0178e4a
update pointer
AndersJensen-NOAA Feb 16, 2026
adea8b4
update pointer to ufsatm
AndersJensen-NOAA Feb 18, 2026
91b4958
update pointer to fv3
AndersJensen-NOAA Feb 19, 2026
7eaceca
update pointer to ufsatm
AndersJensen-NOAA Feb 19, 2026
071c088
update pointer to ufsatm
AndersJensen-NOAA Feb 20, 2026
71d9ad2
ufsatm pointer
AndersJensen-NOAA Feb 20, 2026
1eb5ba4
update to tempo version 3.0.4
AndersJensen-NOAA Mar 4, 2026
881211d
updates to CCPP from code review
AndersJensen-NOAA Mar 17, 2026
12b5283
update tempo
AndersJensen-NOAA Mar 20, 2026
3574fc0
update pointer
AndersJensen-NOAA May 13, 2026
bd1803c
update pointer
AndersJensen-NOAA May 13, 2026
766a90f
Merge branch 'develop' into tempo_v3
AndersJensen-NOAA May 13, 2026
27b5750
Add additional memory for Tempo on ursa to prevent OOM issues
AndersJensen-NOAA May 18, 2026
eeb7d1c
RTs
AndersJensen-NOAA May 28, 2026
acf88ec
update pointer
AndersJensen-NOAA Jun 3, 2026
b94e760
update
AndersJensen-NOAA Jun 3, 2026
ac9a49a
Merge branch 'develop' into tempo_v3
grantfirl Jun 12, 2026
659b9c7
update tempo
AndersJensen-NOAA Jun 12, 2026
e84d9e0
Merge branch 'tempo_v3' of https://github.com/AndersJensen-NOAA/ufs-w…
AndersJensen-NOAA Jun 12, 2026
16bdbb1
update tempo
AndersJensen-NOAA Jun 13, 2026
a2ee37c
Merge branch 'develop' into tempo_v3
grantfirl Jun 15, 2026
90ce4db
add Ursa logs
grantfirl Jun 15, 2026
ba6fb8d
add new RT log from Anders
grantfirl Jun 16, 2026
82dcaec
add regional_wofs_tempo to rt.conf
grantfirl Jun 16, 2026
00122d5
update test_changes.list to include regional_wofs_tempo intel
grantfirl Jun 16, 2026
adfcfee
Merge branch 'develop' into tempo_v3
grantfirl Jun 16, 2026
8429960
Update INPUTDATA_ROOT to `input-data-20260617`
gspetro-NOAA Jun 16, 2026
26c4ca4
Update tests/fv3_conf/control_run.IN
AndersJensen-NOAA Jun 17, 2026
790aba6
Update tests/fv3_conf/control_run.IN
AndersJensen-NOAA Jun 17, 2026
ca13ca4
Update tests/fv3_conf/regional_run.IN
AndersJensen-NOAA Jun 17, 2026
372e88c
Update tests/fv3_conf/regional_run.IN
AndersJensen-NOAA Jun 17, 2026
1fd8a52
Replace MEM_PER_NODE with MEM_PER_NODE_OPT
NickSzapiro-NOAA Jun 17, 2026
26823c3
Merge pull request #3 from NickSzapiro-NOAA/tempo_v3
AndersJensen-NOAA Jun 17, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "UFSATM"]
path = UFSATM
url = https://github.com/NOAA-EMC/ufsatm
branch = develop
url = https://github.com/AndersJensen-NOAA/fv3atm
branch = tempo_v3
[submodule "WW3"]
path = WW3
url = https://github.com/NOAA-EMC/WW3
Expand Down
2 changes: 1 addition & 1 deletion tests/default_vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ export GFSv17opn=.false.
export SFS=.false.

export EXCLUSIVE_NODES=.false.
export MEM_PER_NODE_OPT=""

if [[ ${MACHINE_ID} = wcoss2 || ${MACHINE_ID} = acorn ]]; then

Expand Down Expand Up @@ -224,7 +225,6 @@ elif [[ ${MACHINE_ID} = hera ]]; then
elif [[ ${MACHINE_ID} = ursa ]]; then

export TPN=192

export INPES_dflt=3
export JNPES_dflt=8
export INPES_thrd=3
Expand Down
10 changes: 2 additions & 8 deletions tests/fv3_conf/control_run.IN
Original file line number Diff line number Diff line change
Expand Up @@ -174,14 +174,8 @@ fi

#TEMPO
if [ $IMP_PHYSICS = 88 ]; then
cp @[INPUTDATA_ROOT]/FV3_fix/CCN_ACTIVATE.BIN .
rm qr_acr_qsV2.dat
rm qr_acr_qgV2.dat
rm freezeH2O.dat
cp @[INPUTDATA_ROOT]/FV3_input_data_TEMPO/MP_TEMPO_freezeH2O.dat .
cp @[INPUTDATA_ROOT]/FV3_input_data_TEMPO/MP_TEMPO_QRacrQG.dat .
cp @[INPUTDATA_ROOT]/FV3_input_data_TEMPO/MP_TEMPO_HAILAWARE_QRacrQG.dat .
cp @[INPUTDATA_ROOT]/FV3_input_data_TEMPO/MP_TEMPO_QRacrQS.dat .
cp @[INPUTDATA_ROOT]/FV3_input_data_TEMPO/* .
cp @[INPUTDATA_ROOT]/FV3_fix/CCN_ACTIVATE.BIN .
fi

#prognostic aerosols
Expand Down
1 change: 1 addition & 0 deletions tests/fv3_conf/fv3_slurm.IN_ursa
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#SBATCH --time=@[WLCLK]
#SBATCH --job-name="@[JBNME]"
@[EXCLUSIVE_NODES_OPT]
@[MEM_PER_NODE_OPT]

set -eux
date_s_start=$(date +%s)
Expand Down
6 changes: 6 additions & 0 deletions tests/fv3_conf/regional_run.IN
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,9 @@ if [[ $POSTAPP = 'lam' ]]; then
cp ${PATHRT}/parm/postxconfig-NT-fv3lam.txt postxconfig-NT_FH00.txt
cp ${PATHRT}/../UFSATM/upp/parm/params_grib2_tbl_new params_grib2_tbl_new
fi

#TEMPO
if [ $IMP_PHYSICS = 88 ]; then
cp @[INPUTDATA_ROOT]/FV3_input_data_TEMPO/* .
cp @[INPUTDATA_ROOT]/FV3_fix/CCN_ACTIVATE.BIN .
fi
770 changes: 388 additions & 382 deletions tests/logs/RegressionTests_ursa.log

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions tests/parm/regional_wofs.nml.IN
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@
lsoil = 4
lsoil_lsm = @[LSOIL_LSM]
ltaerosol = @[LTAEROSOL]
lthailaware = @[LTHAILAWARE]
lwhtr = .true.
n_var_lndp = 0
n_var_spp = 0
Expand Down
3 changes: 2 additions & 1 deletion tests/rt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ RUN | cpld_warmstart_c12_9deg | - noaacloud
RUN | cpld_restart_c12_9deg | - noaacloud | | cpld_warmstart_c12_9deg

### ATM tests ###
COMPILE | atm_dyn32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0,FV3_GFS_v17_p8_mynn,FV3_GFS_v17_p8_ugwpv1,FV3_GFS_v16_gfdlmpv3,FV3_GFS_v17_p8_ugwpv1_tempo -D32BIT=ON | | fv3 |
COMPILE | atm_dyn32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0,FV3_GFS_v17_p8_mynn,FV3_GFS_v17_p8_ugwpv1,FV3_GFS_v16_gfdlmpv3,FV3_GFS_v17_p8_ugwpv1_tempo,FV3_WoFS_v0_tempo -D32BIT=ON | | fv3 |
RUN | control_CubedSphereGrid | | baseline |
RUN | control_CubedSphereGrid_parallel | - noaacloud | baseline |
RUN | control_latlon | | baseline |
Expand Down Expand Up @@ -122,6 +122,7 @@ RUN | regional_noquilt |
RUN | regional_netcdf_parallel | - acorn | baseline |
RUN | regional_2dwrtdecomp | | |
RUN | regional_wofs | | baseline |
RUN | regional_wofs_tempo | | baseline |

### RTE-RRTMGP 32BIT
COMPILE | atm_dyn32_rad32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0,FV3_GFS_v17_p8_mynn,FV3_GFS_v17_p8_ugwpv1 -D32BIT=ON -DRRTMGP_32BIT=ON | | fv3 |
Expand Down
2 changes: 1 addition & 1 deletion tests/rt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -984,7 +984,7 @@ if [[ "${CREATE_BASELINE}" == false ]] ; then
fi
fi

INPUTDATA_ROOT=${INPUTDATA_ROOT:-${DISKNM}/NEMSfv3gfs/input-data-20251015}
INPUTDATA_ROOT=${INPUTDATA_ROOT:-${DISKNM}/NEMSfv3gfs/input-data-20260617}
INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20250807
INPUTDATA_LM4=${INPUTDATA_LM4:-${INPUTDATA_ROOT}/LM4_input_data}
INPUTDATA_GFSv17opn=${INPUTDATA_GFSv17opn:-${DISKNM}/NEMSfv3gfs/GFSv17opn_20251014}
Expand Down
143 changes: 1 addition & 142 deletions tests/test_changes.list
Original file line number Diff line number Diff line change
@@ -1,144 +1,3 @@
cpld_control_gfsv17 intel
cpld_control_gfsv17_iau intel
cpld_restart_gfsv17 intel
cpld_restart_gfsv17_iau intel
cpld_mpi_gfsv17 intel
cpld_control_p8 intel
cpld_control_p8.v2.sfc intel
cpld_restart_p8 intel
cpld_2threads_p8 intel
cpld_decomp_p8 intel
cpld_mpi_p8 intel
cpld_control_ciceC_p8 intel
cpld_control_noaero_p8_agrid intel
cpld_control_c48_5deg intel
cpld_warmstart_c48_5deg intel
cpld_restart_c48_5deg intel
cpld_control_c24_5deg intel
cpld_warmstart_c24_5deg intel
cpld_restart_c24_5deg intel
cpld_control_c24_9deg intel
cpld_warmstart_c24_9deg intel
cpld_restart_c24_9deg intel
cpld_control_c12_9deg intel
cpld_warmstart_c12_9deg intel
cpld_restart_c12_9deg intel
control_CubedSphereGrid_parallel intel
control_latlon intel
control_wrtGauss_netcdf_parallel intel
control_c192 intel
control_c384 intel
control_c384gdas intel
control_stochy intel
control_stochy_restart intel
control_lndp intel
control_iovr4_gfdlmpv3 intel
control_p8 intel
control_p8.v2.sfc intel
control_p8_ugwpv1 intel
control_p8_ugwpv1_tempo intel
control_p8_ugwpv1_tempo_aerosol intel
control_p8_ugwpv1_tempo_aerosol_hail intel
control_restart_p8 intel
control_noqr_p8 intel
control_restart_noqr_p8 intel
control_decomp_p8 intel
control_2threads_p8 intel
control_p8_lndp intel
control_p8_rrtmgp intel
control_p8_mynn intel
merra2_thompson intel
merra2_hf_thompson intel
regional_control intel
regional_restart intel
regional_decomp intel
regional_2dwrtdecomp intel
regional_wofs intel
control_p8_rrtmgp_rad32 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
control_csawmg intel
rap_unified_drag_suite_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
rap_control_dyn64_phy32 intel
conus13km_debug_2threads intel
hafs_regional_atm intel
hafs_regional_atm_gfdlmpv3 intel
hafs_global_multiple_4nests_atm intel
hafs_regional_specified_moving_1nest_atm intel
hafs_regional_storm_following_1nest_atm_ocn_wav_mom6 intel
hafs_regional_docn intel
hafs_regional_docn_oisst intel
datm_cdeps_control_cfsr intel
datm_cdeps_restart_cfsr intel
datm_cdeps_control_gefs intel
datm_cdeps_iau_gefs intel
datm_cdeps_stochy_gefs intel
datm_cdeps_ciceC_cfsr intel
datm_cdeps_mx025_cfsr intel
datm_cdeps_mx025_gefs intel
datm_cdeps_multiple_files_cfsr intel
datm_cdeps_3072x1536_cfsr intel
datm_cdeps_gfs intel
datm_cdeps_lnd_gswp3 intel
atm_ds2s_docn_pcice intel
atmaero_control_p8 intel
atmaero_control_p8_rad intel
atmaero_control_p8_rad_micro intel
cpld_regional_atm_fbh intel
control_c48 gnu
control_stochy gnu
control_p8 gnu
control_p8_ugwpv1 gnu
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
control_csawmg gnu
rap_noah_sfcdiff_cires_ugwp_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_decomp gnu
conus13km_restart gnu
rap_control_dyn64_phy32 gnu
cpld_control_gfsv17 gnu
cpld_control_sfs gnu
datm_cdeps_control_cfsr gnu
control_gfs_mpas gnu
regional_wofs_tempo intel
4 changes: 4 additions & 0 deletions tests/tests/control_p8_ugwpv1_tempo
Original file line number Diff line number Diff line change
Expand Up @@ -141,3 +141,7 @@ export K_SPLIT=2
export N_SPLIT=4

export SATMEDMF=.true.

if [[ $MACHINE_ID = ursa ]]; then
export MEM_PER_NODE_OPT="#SBATCH --mem=300G"
fi
4 changes: 4 additions & 0 deletions tests/tests/control_p8_ugwpv1_tempo_aerosol
Original file line number Diff line number Diff line change
Expand Up @@ -140,3 +140,7 @@ export K_SPLIT=2
export N_SPLIT=4

export SATMEDMF=.true.

if [[ $MACHINE_ID = ursa ]]; then
export MEM_PER_NODE_OPT="#SBATCH --mem=300G"
fi
2 changes: 1 addition & 1 deletion tests/tests/control_p8_ugwpv1_tempo_aerosol_hail
Original file line number Diff line number Diff line change
Expand Up @@ -149,5 +149,5 @@ if [[ $MACHINE_ID = gaeac6 ]]; then
fi
if [[ $MACHINE_ID = ursa ]]; then
export EXCLUSIVE_NODES=.true.
export MEM_PER_NODE_OPT="#SBATCH --mem=300G"
fi

71 changes: 71 additions & 0 deletions tests/tests/regional_wofs_tempo
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
###############################################################################
#
# FV3_WoFS_v0 test atmosphere only with hi-res 3km
#
###############################################################################

export TEST_DESCR="Compare FV3_WoFS_v0 hi-res 3km results with previous trunk version"

export CNTL_DIR=fv3_regional_wofs_tempo

export LIST_FILES="dynf000.nc \
dynf006.nc \
phyf000.nc \
phyf006.nc \
PRSLEV.GrbF00 \
PRSLEV.GrbF06 \
NATLEV.GrbF00 \
NATLEV.GrbF06"

export_fv3_v16

export FV3_RUN=regional_run.IN

export OZ_PHYS_OLD=.false.
export OZ_PHYS_NEW=.true.
export H2O_PHYS=.true.
export RESTART_INTERVAL="0"
export WRITE_DOPOST=.true.
export POSTAPP='lam'


export CCPP_SUITE=FV3_WoFS_v0_tempo
export FIELD_TABLE=field_table_thompson_aero_hail_tke
export IMP_PHYSICS=88
export LTAEROSOL=.true.
export LTHAILAWARE=.true.
export DO_SAT_ADJ=.false.
export DIAG_TABLE=diag_table_aerosol.IN
export DIAG_TABLE_ADDITIONAL=diag_additional_hail

export INPUT_NML=regional_wofs.nml.IN
export MODEL_CONFIGURE=model_configure_regional.IN

export WLCLK=15
export FHMAX=6
export INPES=10
export JNPES=11
export OUTPUT_FH="3 -1"
WRITE_GROUP=1
WRTTASK_PER_GROUP=10
NTILES=1

export IMP_PHYSICS=88
export DNATS=0
export DO_SAT_ADJ=.false.
export IALB=1
export IEMS=1
export HYBEDMF=.false.
export DO_MYNNEDMF=.true.
export DO_MYNNSFCLAY=.true.
export DO_DEEP=.false.
export SHAL_CNV=.false.
export IMFSHALCNV=-1
export IMFDEEPCNV=-1
export LSOIL_LSM=4
export NSTF_NAME="2, 1, 0, 0, 0"

if [[ ${MACHINE_ID} = ursa ]]; then
export EXCLUSIVE_NODES=.true.
export MEM_PER_NODE_OPT="#SBATCH --mem=300G"
fi
Loading