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.

Sign up for GitHub

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

UFS-dev PR#22 #82

Merged
merged 9 commits into from
Jan 17, 2023
Merged

UFS-dev PR#22 #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3610672
Refactor surface restart logic in FV3GFS_io.F90 to not use hard-coded…
SamuelTrahanNOAA Dec 20, 2022
edc063e
Develop ugwp improvements (#1488)
mdtoyNOAA Dec 22, 2022
ab1c55d
Merge commit 'edc063ee4b06ca8ed2eec3962b5415898e950ced' into ufs-dev-…
Jan 3, 2023
f08c957
update BL_DATE for new baselines
Jan 9, 2023
8c337b1
[AutoRT] hera.gnu Job Completed.
Jan 10, 2023
da24893
[AutoRT] hera.intel Job Completed.
Jan 10, 2023
11d1bde
[AutoRT] cheyenne.gnu Job Completed.
Jan 13, 2023
3ecce74
[AutoRT] cheyenne.intel Job Completed.
Jan 13, 2023
8c75379
update FV3 submodule pointer
grantfirl Jan 17, 2023
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
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 8 files
+4 −2 ccpp/data/CCPP_typedefs.F90
+4 −4 ccpp/data/CCPP_typedefs.meta
+77 −49 ccpp/data/GFS_typedefs.F90
+192 −34 ccpp/data/GFS_typedefs.meta
+414 −2 ccpp/driver/GFS_diagnostics.F90
+1 −1 ccpp/framework
+1 −1 ccpp/physics
+963 −837 io/FV3GFS_io.F90
422 changes: 211 additions & 211 deletions tests/RegressionTests_cheyenne.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

1,288 changes: 644 additions & 644 deletions tests/RegressionTests_cheyenne.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

424 changes: 212 additions & 212 deletions tests/RegressionTests_hera.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

1,294 changes: 647 additions & 647 deletions tests/RegressionTests_hera.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

38 changes: 38 additions & 0 deletions tests/parm/diag_table/diag_table_rap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,44 @@
"gfs_sfc", "snowfall_acc", "snowfall_acc", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "swe_snowfall_acc", "swe_snowfall_acc", "fv3_history2d", "all", .false., "none", 2

# Diagnostic variables for Unified Gravity Wave Physics (UGWP)
"gfs_phys", "dws3dt_ogw", "dws3dt_ogw", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dws3dt_obl", "dws3dt_obl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dws3dt_oss", "dws3dt_oss", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dws3dt_ofd", "dws3dt_ofd", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ldu3dt_ogw", "ldu3dt_ogw", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ldu3dt_obl", "ldu3dt_obl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ldu3dt_oss", "ldu3dt_oss", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ldu3dt_ofd", "ldu3dt_ofd", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ldu3dt_ngw", "ldu3dt_ngw", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ldv3dt_ngw", "ldv3dt_ngw", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ldt3dt_ngw", "ldt3dt_ngw", "fv3_history2d", "all", .false., "none", 2

"gfs_phys", "dudt_ogw", "dudt_ogw", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dvdt_ogw", "dvdt_ogw", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dudt_obl", "dudt_obl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dvdt_obl", "dvdt_obl", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dudt_oss", "dudt_oss", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dvdt_oss", "dvdt_oss", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dudt_ofd", "dudt_ofd", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dvdt_ofd", "dvdt_ofd", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "du_ogwcol", "du_ogwcol", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dv_ogwcol", "dv_ogwcol", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "du_oblcol", "du_oblcol", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dv_oblcol", "dv_oblcol", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "du_osscol", "du_osscol", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dv_osscol", "dv_osscol", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "du_ofdcol", "du_ofdcol", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dv_ofdcol", "dv_ofdcol", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "du3_ogwcol", "du3_ogwcol", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dv3_ogwcol", "dv3_ogwcol", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "du3_oblcol", "du3_oblcol", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dv3_oblcol", "dv3_oblcol", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "du3_osscol", "du3_osscol", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dv3_osscol", "dv3_osscol", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "du3_ofdcol", "du3_ofdcol", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dv3_ofdcol", "dv3_ofdcol", "fv3_history2d", "all", .false., "none", 2

#=============================================================================================
#
#====> This file can be used with diag_manager/v2.0a (or higher) <====
Expand Down
1 change: 0 additions & 1 deletion tests/parm/rap.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,6 @@ deflate_level=1
cplwav = @[CPLWAV]
cplwav2atm = @[CPLWAV2ATM]
effr_in = .true.
ldiag_ugwp = .false.
do_ugwp = @[DO_UGWP]
do_tofd = @[DO_TOFD]
gwd_opt = @[GWD_OPT]
Expand Down
2 changes: 1 addition & 1 deletion tests/rt.ncar.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
TEST_35D=true
fi

BL_DATE=20221230
BL_DATE=20220109

RTPWD=${RTPWD:-$DISKNM/NCAR/main-${BL_DATE}/${RT_COMPILER^^}}

Expand Down
2 changes: 1 addition & 1 deletion tests/rt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
TEST_35D=true
fi

BL_DATE=20221212
BL_DATE=20221220

RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}

Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hrrr_control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_HRRR
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export SFCLAY_COMPUTE_FLUX=.true.

Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hrrr_control_2threads
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_HRRR
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export SFCLAY_COMPUTE_FLUX=.true.

Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hrrr_control_2threads_dyn32_phy32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_HRRR
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export SFCLAY_COMPUTE_FLUX=.true.

Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hrrr_control_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_HRRR
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export SFCLAY_COMPUTE_FLUX=.true.

Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hrrr_control_debug_dyn32_phy32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_HRRR
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export SFCLAY_COMPUTE_FLUX=.true.

Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hrrr_control_decomp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_HRRR
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export SFCLAY_COMPUTE_FLUX=.true.

Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hrrr_control_decomp_dyn32_phy32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_HRRR
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export SFCLAY_COMPUTE_FLUX=.true.

Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hrrr_control_dyn32_phy32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_HRRR
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export SFCLAY_COMPUTE_FLUX=.true.
export LHEATSTRG=.false.
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hrrr_control_restart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_HRRR
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap
export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${SHOUR} + ${FHROT} )))0000"

export SFCLAY_COMPUTE_FLUX=.true.
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hrrr_control_restart_dyn32_phy32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_HRRR
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap
export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${SHOUR} + ${FHROT} )))0000"

export SFCLAY_COMPUTE_FLUX=.true.
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/rap_2threads
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_RAP
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export LHEATSTRG=.false.
export IMP_PHYSICS=8
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/rap_2threads_dyn32_phy32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_RAP
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export IMP_PHYSICS=8
export DNATS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/rap_cires_ugwp_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_RAP_cires_ugwp
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export IMP_PHYSICS=8
export DNATS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/rap_control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_RAP
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export LHEATSTRG=.false.
export IMP_PHYSICS=8
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/rap_control_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_RAP
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export LHEATSTRG=.false.
export IMP_PHYSICS=8
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/rap_control_debug_dyn32_phy32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_RAP
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export IMP_PHYSICS=8
export DNATS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/rap_control_dyn32_phy32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_RAP
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export IMP_PHYSICS=8
export DNATS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/rap_control_dyn64_phy32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_RAP
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export IMP_PHYSICS=8
export DNATS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/rap_control_dyn64_phy32_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_RAP
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export IMP_PHYSICS=8
export DNATS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/rap_decomp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_RAP
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export LHEATSTRG=.false.
export IMP_PHYSICS=8
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/rap_diag_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_RAP
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export IMP_PHYSICS=8
export DNATS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/rap_flake_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_RAP_flake
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export IMP_PHYSICS=8
export DNATS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/rap_lndp_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_RAP
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export IMP_PHYSICS=8
export DNATS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/rap_noah_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_RAP_noah
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap_noah
export DIAG_TABLE=diag_table_rap_noah

export IMP_PHYSICS=8
export DNATS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/rap_noah_sfcdiff_cires_ugwp_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_RAP_noah_sfcdiff_cires_ugwp
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap_noah
export DIAG_TABLE=diag_table_rap_noah

export IMP_PHYSICS=8
export DNATS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/rap_progcld_thompson_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_RAP
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export IMP_PHYSICS=8
export DNATS=0
Expand Down
4 changes: 2 additions & 2 deletions tests/tests/rap_progcld_thompson_rrtmgp_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export OUTPUT_FH="0 1"
export FV3_RUN=control_run.IN
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export IMP_PHYSICS=8
export DNATS=0
Expand Down Expand Up @@ -64,4 +64,4 @@ export DO_UGWP_V1_OROG_ONLY=.false.
export CCPP_SUITE=FV3_RAP_RRTMGP
export DO_RRTMGP=.true.
export DOGP_CLDOPTICS_LUT=.true.
export DOGP_LWSCAT=.true.
export DOGP_LWSCAT=.true.
2 changes: 1 addition & 1 deletion tests/tests/rap_restart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_RAP
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap
export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${SHOUR} + ${FHROT} )))0000"

export LHEATSTRG=.false.
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/rap_restart_dyn32_phy32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_RAP
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap
export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${SHOUR} + ${FHROT} )))0000"

export IMP_PHYSICS=8
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/rap_rrtmgp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export OUTPUT_FH='0 09 12'
export FV3_RUN=control_run.IN
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export LHEATSTRG=.false.
export IMP_PHYSICS=8
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/rap_rrtmgp_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export OUTPUT_FH="0 1"
export FV3_RUN=control_run.IN
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export IMP_PHYSICS=8
export DNATS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/rap_sfcdiff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_RAP_sfcdiff
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export LHEATSTRG=.false.
export IMP_PHYSICS=8
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/rap_sfcdiff_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_RAP_sfcdiff
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export IMP_PHYSICS=8
export DNATS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/rap_sfcdiff_decomp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_RAP_sfcdiff
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap

export LHEATSTRG=.false.
export IMP_PHYSICS=8
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/rap_sfcdiff_restart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_RAP_sfcdiff
export INPUT_NML=rap.nml.IN
export FIELD_TABLE=field_table_thompson_aero_tke
export NEW_DIAGTABLE=diag_table_rap
export DIAG_TABLE=diag_table_rap
export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${SHOUR} + ${FHROT} )))0000"

export LHEATSTRG=.false.
Expand Down
Loading