Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
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
6 changes: 4 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = develop
#url = https://github.com/NOAA-EMC/fv3atm
#branch = develop
url = https://github.com/AndersJensen-NOAA/fv3atm
branch = tempo_dev
[submodule "WW3"]
path = WW3
url = https://github.com/NOAA-EMC/WW3
Expand Down
1 change: 1 addition & 0 deletions tests/default_vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,7 @@ export EFFR_IN=.false.
# Thompson MP
export LRADAR=.false.
export LTAEROSOL=.false.
export LTHAILAWARE=.false.
export EXT_DIAG_THOMPSON=.false.
export SEDI_SEMI=.true.
export DECFL=10
Expand Down
12 changes: 12 additions & 0 deletions tests/fv3_conf/control_run.IN
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,18 @@ if [ $IMP_PHYSICS = 8 ]; then
cp @[INPUTDATA_ROOT]/FV3_fix/CCN_ACTIVATE.BIN .
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 /scratch2/BMC/wrfruc/jensen/ufs_tables/MP_TEMPO_freezeH2O.dat .
cp /scratch2/BMC/wrfruc/jensen/ufs_tables/MP_TEMPO_QRacrQG.dat .
cp /scratch2/BMC/wrfruc/jensen/ufs_tables/MP_TEMPO_HAILAWARE_QRacrQG.dat .
cp /scratch2/BMC/wrfruc/jensen/ufs_tables/MP_TEMPO_QRacrQS.dat .
fi

#prognostic aerosols
if [ $CPLCHM = .true. ]; then
cp ${PATHRT}/parm/gocart/*.rc .
Expand Down
322 changes: 322 additions & 0 deletions tests/parm/diag_table/diag_table_cpld_aerosol.IN

Large diffs are not rendered by default.

324 changes: 324 additions & 0 deletions tests/parm/diag_table/diag_table_cpld_aerosol_hail.IN

Large diffs are not rendered by default.

75 changes: 75 additions & 0 deletions tests/parm/field_table/field_table_thompson_aero_hail_tke
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
# added by FRE: sphum must be present in atmos
# specific humidity for moist runs
"TRACER", "atmos_mod", "sphum"
"longname", "specific humidity"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=3.e-6" /
# prognostic cloud water mixing ratio
"TRACER", "atmos_mod", "liq_wat"
"longname", "cloud water mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e30" /
# prognostic ice water mixing ratio
"TRACER", "atmos_mod", "ice_wat"
"longname", "cloud ice mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e30" /
# prognostic rain water mixing ratio
"TRACER", "atmos_mod", "rainwat"
"longname", "rain water mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e30" /
# prognostic snow water mixing ratio
"TRACER", "atmos_mod", "snowwat"
"longname", "snow water mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e30" /
# prognostic Grau water mixing ratio
"TRACER", "atmos_mod", "graupel"
"longname", "graupel mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e30" /
# prognostic cloud water number concentration
"TRACER", "atmos_mod", "water_nc"
"longname", "cloud liquid water number concentration"
"units", "/kg"
"profile_type", "fixed", "surface_value=0.0" /
# prognostic cloud ice number concentration
"TRACER", "atmos_mod", "ice_nc"
"longname", "cloud ice water number concentration"
"units", "/kg"
"profile_type", "fixed", "surface_value=0.0" /
# prognostic rain number concentration
"TRACER", "atmos_mod", "rain_nc"
"longname", "rain number concentration"
"units", "/kg"
"profile_type", "fixed", "surface_value=0.0" /
# prognostic ozone mixing ratio tracer
"TRACER", "atmos_mod", "o3mr"
"longname", "ozone mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e30" /
# water- and ice-friendly aerosols (Thompson)
"TRACER", "atmos_mod", "liq_aero"
"longname", "water-friendly aerosol number concentration"
"units", "/kg"
"profile_type", "fixed", "surface_value=0.0" /
"TRACER", "atmos_mod", "ice_aero"
"longname", "ice-friendly aerosol number concentration"
"units", "/kg"
"profile_type", "fixed", "surface_value=0.0" /
# prognostic subgrid scale turbulent kinetic energy
"TRACER", "atmos_mod", "sgs_tke"
"longname", "subgrid scale turbulent kinetic energy"
"units", "m2/s2"
"profile_type", "fixed", "surface_value=0.0" /
# prognostic graupel number concentration
"TRACER", "atmos_mod", "graupel_nc"
"longname", "graupel number concentration"
"units", "/kg"
"profile_type", "fixed", "surface_value=0.0" /
# prognostic graupel volume
"TRACER", "atmos_mod", "graupel_vol"
"longname", "graupel volume"
"units", "m3/kg"
"profile_type", "fixed", "surface_value=0.0" /
1 change: 1 addition & 0 deletions tests/parm/global_control.nml.IN
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
imp_physics = @[IMP_PHYSICS]
iovr = @[IOVR]
ltaerosol = @[LTAEROSOL]
lthailaware = @[LTHAILAWARE]
lradar = @[LRADAR]
ttendlim = @[TTENDLIM]
dt_inner = @[DT_INNER]
Expand Down
5 changes: 4 additions & 1 deletion tests/rt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ COMPILE | s2sw_pdlib_debug | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_couple
RUN | cpld_debug_pdlib_p8 | - noaacloud | baseline |

### ATM tests ###
COMPILE | atm_dyn32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,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 | | fv3 |
COMPILE | atm_dyn32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_flake,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_v17_p8_ugwpv1_tempo -D32BIT=ON | | fv3 |
RUN | control_flake | | baseline |
RUN | control_CubedSphereGrid | | baseline |
RUN | control_CubedSphereGrid_parallel | - noaacloud | baseline |
Expand All @@ -133,6 +133,9 @@ RUN | control_iovr5 |
RUN | control_p8 | - noaacloud | baseline |
RUN | control_p8.v2.sfc | - noaacloud | baseline |
RUN | control_p8_ugwpv1 | - noaacloud | baseline |
RUN | control_p8_ugwpv1_tempo | - noaacloud | baseline |

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AndersJensen-NOAA These new RTs are failing because the new suite "FV3_GFS_v17_p8_ugwpv1_tempo" is not being compiled above in this file. I'll fix this.

RUN | control_p8_ugwpv1_tempo_aerosol | - noaacloud | baseline |
RUN | control_p8_ugwpv1_tempo_aerosol_hail | - noaacloud | baseline |
RUN | control_restart_p8 | - noaacloud | | control_p8
RUN | control_noqr_p8 | - noaacloud | |
RUN | control_restart_noqr_p8 | - noaacloud | | control_noqr_p8
Expand Down
145 changes: 145 additions & 0 deletions tests/tests/control_p8_ugwpv1_tempo
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
###############################################################################
#
# Global control test GFSv16 atmosphere only at C96L127, P8 configuration
# with UGWPv1, i.e., GSL orographic drag + version 1 non-stationary GWD
#
###############################################################################

export TEST_DESCR="Compare global control results with previous trunk version"

export CNTL_DIR=control_p8_ugwpv1

export LIST_FILES="sfcf000.nc \
sfcf021.nc \
sfcf024.nc \
atmf000.nc \
atmf021.nc \
atmf024.nc \
GFSFLX.GrbF00 \
GFSFLX.GrbF21 \
GFSFLX.GrbF24 \
GFSPRS.GrbF00 \
GFSPRS.GrbF21 \
GFSPRS.GrbF24 \
RESTART/20210323.060000.coupler.res \
RESTART/20210323.060000.fv_core.res.nc \
RESTART/20210323.060000.fv_core.res.tile1.nc \
RESTART/20210323.060000.fv_core.res.tile2.nc \
RESTART/20210323.060000.fv_core.res.tile3.nc \
RESTART/20210323.060000.fv_core.res.tile4.nc \
RESTART/20210323.060000.fv_core.res.tile5.nc \
RESTART/20210323.060000.fv_core.res.tile6.nc \
RESTART/20210323.060000.fv_srf_wnd.res.tile1.nc \
RESTART/20210323.060000.fv_srf_wnd.res.tile2.nc \
RESTART/20210323.060000.fv_srf_wnd.res.tile3.nc \
RESTART/20210323.060000.fv_srf_wnd.res.tile4.nc \
RESTART/20210323.060000.fv_srf_wnd.res.tile5.nc \
RESTART/20210323.060000.fv_srf_wnd.res.tile6.nc \
RESTART/20210323.060000.fv_tracer.res.tile1.nc \
RESTART/20210323.060000.fv_tracer.res.tile2.nc \
RESTART/20210323.060000.fv_tracer.res.tile3.nc \
RESTART/20210323.060000.fv_tracer.res.tile4.nc \
RESTART/20210323.060000.fv_tracer.res.tile5.nc \
RESTART/20210323.060000.fv_tracer.res.tile6.nc \
RESTART/20210323.060000.phy_data.tile1.nc \
RESTART/20210323.060000.phy_data.tile2.nc \
RESTART/20210323.060000.phy_data.tile3.nc \
RESTART/20210323.060000.phy_data.tile4.nc \
RESTART/20210323.060000.phy_data.tile5.nc \
RESTART/20210323.060000.phy_data.tile6.nc \
RESTART/20210323.060000.sfc_data.tile1.nc \
RESTART/20210323.060000.sfc_data.tile2.nc \
RESTART/20210323.060000.sfc_data.tile3.nc \
RESTART/20210323.060000.sfc_data.tile4.nc \
RESTART/20210323.060000.sfc_data.tile5.nc \
RESTART/20210323.060000.sfc_data.tile6.nc"

export_fv3
export_tiled
export_ugwpv1

export NPZ=127
export NPZP=128
export SYEAR=2021
export SMONTH=03
export SDAY=22
export SHOUR=06
export RESTART_INTERVAL="12 -1"
export OUTPUT_GRID='gaussian_grid'
export WRITE_DOPOST=.true.
export OUTPUT_FH='0 21 24'

export IALB=2
export IEMS=2
export LSM=2
export IOPT_DVEG=4
export IOPT_CRS=2
export IOPT_RAD=3
export IOPT_ALB=1
export IOPT_STC=3
export IOPT_SFC=3
export IOPT_TRS=2
export IOPT_DIAG=2

export D2_BG_K1=0.20
export D2_BG_K2=0.04
export PSM_BC=1
export DDDMP=0.1

# Merra2 Aerosols & NSST
export USE_MERRA2=.true.
export IAER=1011
export NSTF_NAME=2,1,0,0,0

export LHEATSTRG=.false.
export LSEASPRAY=.true.

# CA
export DO_CA=.true.
export CA_SGS=.true.
export CA_GLOBAL=.false.
export NCA=1
export NCELLS=5
export NLIVES=12
export NTHRESH=18
export NSEED=1
export NFRACSEED=0.5
export CA_TRIGGER=.true.
export NSPINUP=1
export ISEED_CA=12345

export IMP_PHYSICS=88
export LTAEROSOL=.false.
export LTHAILAWARE=.false.
export LGFDLMPRAD=.false.
export DO_SAT_ADJ=.false.
export DNATS=0
export DZ_MIN=6

#required for NML.IN sharing
export MIN_SEAICE=0.15
export FRAC_GRID=.true.
export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
export MOM6_RESTART_DIR=./RESTART/
export MOM6_RESTART_SETTING=n
# Follwoing not used for standalone
export USE_CICE_ALB=.false.

export WRITE_NSFLIP=.true.

export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_GFS_v17_p8_ugwpv1_tempo
export FIELD_TABLE=field_table_thompson_noaero_tke
export DIAG_TABLE=diag_table_cpld.IN
export INPUT_NML=global_control.nml.IN

# RRTMGP
export DO_RRTMGP=.false.
export DOGP_CLDOPTICS_LUT=.true.
export DOGP_LWSCAT=.true.
export DOGP_SGS_CNV=.true.

export K_SPLIT=2
export N_SPLIT=4

export SATMEDMF=.true.
Loading