Skip to content

Unified ugwp #43

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

Closed
mdtoy wants to merge 9 commits into from
Closed

Unified ugwp #43

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
079b83d
Added updated rt.sh
mdtoyNOAA Oct 7, 2020
33ca775
Oct. 7 updates
mdtoyNOAA Oct 7, 2020
fc201b8
Updated submodules
mdtoyNOAA Oct 8, 2020
8d4be02
Updated unified_ugwp documentation.
mdtoyNOAA Oct 13, 2020
3577756
Modified code per PR recommendations
mdtoyNOAA Oct 22, 2020
029fea6
Modified code per G. Firl's PR recommendations
mdtoyNOAA Oct 26, 2020
fc7b271
cires_vert_orodis_v1.F90 bug fix
mdtoyNOAA Oct 27, 2020
4f9a62b
Added regression testing scripts rt_ccpp_gsd_unified_ugwp.conf and rt…
mdtoyNOAA Oct 29, 2020
c8fb023
Updated FV3 submodule
mdtoyNOAA Nov 5, 2020
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-GSD/fv3atm
branch = gsd/develop
url = https://github.com/mdtoy/fv3atm
branch = unified_ugwp
[submodule "NEMS"]
path = NEMS
url = https://github.com/NOAA-EMC/NEMS
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated from 4a64b7 to da639d
2 changes: 1 addition & 1 deletion NEMS
Open in desktop
Submodule NEMS updated 5 files
+1 −1 src/MAIN_NEMS.F90
+1 −1 src/incmake/component_CICE6.mk
+0 −2 src/incmake/component_MOM6.mk
+1 −1 src/incmake/component_WW3.mk
+0 −2 src/module_EARTH_GRID_COMP.F90
2 changes: 1 addition & 1 deletion WW3
Open in desktop
Submodule WW3 updated 422 files
2 changes: 1 addition & 1 deletion stochastic_physics
Open in desktop
Submodule stochastic_physics updated from ffdd19 to 6eac84
2,890 changes: 129 additions & 2,761 deletions tests/RegressionTests_hera.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/fv3_conf/ccpp_gsd_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@ if [ $IMP_PHYSICS = 8 ]; then
cp @[RTPWD]/FV3_input_data_gsd/CCN_ACTIVATE.BIN .
fi

if [ $GWD_OPT = 3 ] || [ $GWD_OPT = 33 ]; then
if [ $GWD_OPT = 3 ] || [ $GWD_OPT = 33 ] || [ $GWD_OPT = 2 ] || [ $GWD_OPT = 22 ]; then
cp @[RTPWD]/FV3_input_data_gsd/drag_suite/* INPUT/
fi
7 changes: 7 additions & 0 deletions tests/parm/ccpp_gsd.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,13 @@
bl_mynn_edmf = 1
bl_mynn_edmf_mom = 1
gwd_opt = @[GWD_OPT]
do_ugwp_v0 = @[DO_UGWP_V0]
do_ugwp_v0_orog_only = @[DO_UGWP_V0_OROG_ONLY]
do_gsl_drag_ls_bl = @[DO_GSL_DRAG_LS_BL]
do_gsl_drag_ss = @[DO_GSL_DRAG_SS]
do_gsl_drag_tofd = @[DO_GSL_DRAG_TOFD]
do_ugwp_v1 = @[DO_UGWP_V1]
do_ugwp_v1_orog_only = @[DO_UGWP_V1_OROG_ONLY]
/

&gfdl_cloud_microphysics_nml
Expand Down
5 changes: 3 additions & 2 deletions tests/rt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,10 +323,11 @@ else
die "Unknown machine ID, please edit detect_machine.sh file"
fi

mkdir -p ${STMP}/${USER}
# mkdir -p ${STMP}/${USER}
Copy link
Copy Markdown

@DomHeinzeller DomHeinzeller Nov 5, 2020

Choose a reason for hiding this comment

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

Please revert the changes to rt.sh


# Different own baseline directories for different compilers on Theia/Cheyenne
NEW_BASELINE=${STMP}/${USER}/FV3_RT/REGRESSION_TEST
#NEW_BASELINE=${STMP}/${USER}/FV3_RT/REGRESSION_TEST
NEW_BASELINE=${RUNDIR_ROOT:-${STMP}/${USER}/FV3_RT}/REGRESSION_TEST
if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]]; then
NEW_BASELINE=${NEW_BASELINE}_${RT_COMPILER^^}
fi
Expand Down
32 changes: 32 additions & 0 deletions tests/rt_ccpp_gsd_short.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#################################################################################################################################################################################
Copy link
Copy Markdown

@DomHeinzeller DomHeinzeller Nov 5, 2020

Choose a reason for hiding this comment

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

Please remove this file tests/rt_ccpp_gsd_short.conf.

# CCPP REPRO tests #
#################################################################################################################################################################################

COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GSD_v0 | standard | hera.intel | fv3 |

RUN | fv3_ccpp_gsd | standard | | fv3 |
# RUN | fv3_ccpp_gsd_coldstart | standard | | |
# RUN | fv3_ccpp_gsd_warmstart | standard | | | fv3_ccpp_gsd_coldstart

COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GSD_v0_drag_suite | standard | hera.intel | fv3 |

# Orographic data for drag suite (used by all three tests) staged only on hera for the moment
RUN | fv3_ccpp_gsd_drag_suite | standard | hera.intel | fv3 |

COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GSD_v0_no_drag | standard | hera.intel | fv3 |

RUN | fv3_ccpp_gsd_no_drag | standard | | fv3 |
# RUN | fv3_ccpp_gsd_coldstart | standard | | |
# # RUN | fv3_ccpp_gsd_warmstart | standard | | | fv3_ccpp_gsd_coldstart
#
#


#################################################################################################################################################################################
# CCPP DEBUG tests #
#################################################################################################################################################################################

# COMPILE | CCPP=Y DEBUG=Y SUITES=FV3_GSD_v0 | standard | hera.intel | fv3 |

# RUN | fv3_ccpp_gsd_debug | standard | | fv3 |

38 changes: 38 additions & 0 deletions tests/rt_ccpp_gsd_unified_ugwp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#################################################################################################################################################################################
Copy link
Copy Markdown

@DomHeinzeller DomHeinzeller Nov 5, 2020

Choose a reason for hiding this comment

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

Please merge only the required tests into rt_ccpp_gsd.conf and delete tests/rt_ccpp_gsd_unified_ugwp.conf.

# CCPP REPRO tests #
#################################################################################################################################################################################

COMPILE | CCPP=Y REPRO=Y SUITES=FV3_GSD_v0_unified_ugwp_suite,FV3_GSD_v0,FV3_GSD_v0_drag_suite,FV3_GSD_v0_no_drag | standard | hera.intel | fv3 |


RUN | fv3_ccpp_gsd | standard | | fv3 |

RUN | fv3_ccpp_gsd_drag_suite | standard | | fv3 |

RUN | fv3_ccpp_gsd_no_drag | standard | | fv3 |


RUN | fv3_ccpp_gsd_unified_ugwp | standard | | fv3 |
# RUN | fv3_ccpp_gsd_coldstart | standard | | |
# RUN | fv3_ccpp_gsd_warmstart | standard | | | fv3_ccpp_gsd_coldstart


# Orographic data for drag suite (used by all three tests) staged only on hera for the moment
RUN | fv3_ccpp_gsd_drag_suite_unified_ugwp | standard | | fv3 |


RUN | fv3_ccpp_gsd_no_drag_unified_ugwp | standard | | fv3 |
# RUN | fv3_ccpp_gsd_coldstart | standard | | |
# # RUN | fv3_ccpp_gsd_warmstart | standard | | | fv3_ccpp_gsd_coldstart
#
#


#################################################################################################################################################################################
# CCPP DEBUG tests #
#################################################################################################################################################################################

# COMPILE | CCPP=Y DEBUG=Y SUITES=FV3_GSD_v0 | standard | hera.intel | fv3 |

# RUN | fv3_ccpp_gsd_debug | standard | | fv3 |

7 changes: 7 additions & 0 deletions tests/tests/fv3_ccpp_gsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,13 @@ export IMFSHALCNV=3
export IMFDEEPCNV=3
export LSM=3
export LSOIL_LSM=9
export DO_UGWP_V0=.F.
Copy link
Copy Markdown

@DomHeinzeller DomHeinzeller Nov 5, 2020

Choose a reason for hiding this comment

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

Lines 121-127 should also be added to tests/default_vars.sh in the appropriate place (look for the gravity wave drag options). Then they shouldn't be required here; only in the drag suite tests that change the default values.

export DO_UGWP_V0_OROG_ONLY=.F.
export DO_GSL_DRAG_LS_BL=.F.
export DO_GSL_DRAG_SS=.F.
export DO_GSL_DRAG_TOFD=.F.
export DO_UGWP_V1=.F.
export DO_UGWP_V1_OROG_ONLY=.F.


export WLCLK=30
Expand Down
8 changes: 7 additions & 1 deletion tests/tests/fv3_ccpp_gsd_drag_suite
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,13 @@ export IMFDEEPCNV=3
export LSM=3
export LSOIL_LSM=9
export GWD_OPT=3

export DO_UGWP_V0=.F.
export DO_UGWP_V0_OROG_ONLY=.F.
export DO_GSL_DRAG_LS_BL=.T.
export DO_GSL_DRAG_SS=.T.
export DO_GSL_DRAG_TOFD=.T.
export DO_UGWP_V1=.F.
export DO_UGWP_V1_OROG_ONLY=.F.

export WLCLK=30

107 changes: 107 additions & 0 deletions tests/tests/fv3_ccpp_gsd_drag_suite_unified_ugwp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
###############################################################################
#
# FV3 CCPP GSD (GF CU + Thompson MP + MYNN PBL + RUC LSM + GSD DRAG) test
#
###############################################################################

export TEST_DESCR="Compare unified_ugwp FV3 CCPP GSD + DRAG results with previous trunk version"

export CNTL_DIR=fv3_gsd_drag_suite_unified_ugwp

export LIST_FILES="atmos_4xdaily.tile1.nc \
atmos_4xdaily.tile2.nc \
atmos_4xdaily.tile3.nc \
atmos_4xdaily.tile4.nc \
atmos_4xdaily.tile5.nc \
atmos_4xdaily.tile6.nc \
phyf000.tile1.nc \
phyf000.tile2.nc \
phyf000.tile3.nc \
phyf000.tile4.nc \
phyf000.tile5.nc \
phyf000.tile6.nc \
phyf024.tile1.nc \
phyf024.tile2.nc \
phyf024.tile3.nc \
phyf024.tile4.nc \
phyf024.tile5.nc \
phyf024.tile6.nc \
dynf000.tile1.nc \
dynf000.tile2.nc \
dynf000.tile3.nc \
dynf000.tile4.nc \
dynf000.tile5.nc \
dynf000.tile6.nc \
dynf024.tile1.nc \
dynf024.tile2.nc \
dynf024.tile3.nc \
dynf024.tile4.nc \
dynf024.tile5.nc \
dynf024.tile6.nc \
RESTART/coupler.res \
RESTART/fv_core.res.nc \
RESTART/fv_core.res.tile1.nc \
RESTART/fv_core.res.tile2.nc \
RESTART/fv_core.res.tile3.nc \
RESTART/fv_core.res.tile4.nc \
RESTART/fv_core.res.tile5.nc \
RESTART/fv_core.res.tile6.nc \
RESTART/fv_srf_wnd.res.tile1.nc \
RESTART/fv_srf_wnd.res.tile2.nc \
RESTART/fv_srf_wnd.res.tile3.nc \
RESTART/fv_srf_wnd.res.tile4.nc \
RESTART/fv_srf_wnd.res.tile5.nc \
RESTART/fv_srf_wnd.res.tile6.nc \
RESTART/fv_tracer.res.tile1.nc \
RESTART/fv_tracer.res.tile2.nc \
RESTART/fv_tracer.res.tile3.nc \
RESTART/fv_tracer.res.tile4.nc \
RESTART/fv_tracer.res.tile5.nc \
RESTART/fv_tracer.res.tile6.nc \
RESTART/phy_data.tile1.nc \
RESTART/phy_data.tile2.nc \
RESTART/phy_data.tile3.nc \
RESTART/phy_data.tile4.nc \
RESTART/phy_data.tile5.nc \
RESTART/phy_data.tile6.nc \
RESTART/sfc_data.tile1.nc \
RESTART/sfc_data.tile2.nc \
RESTART/sfc_data.tile3.nc \
RESTART/sfc_data.tile4.nc \
RESTART/sfc_data.tile5.nc \
RESTART/sfc_data.tile6.nc"

export_fv3

export FHMAX=24
export FDIAG=3

export DT_ATMOS="600"
export IMP_PHYSICS=8
export DNATS=0
export DO_SAT_ADJ=.F.
export LRADAR=.T.
export LTAEROSOL=.T.

export FV3_RUN=ccpp_gsd_run.IN
export CCPP_SUITE=FV3_GSD_v0_unified_ugwp_suite
export CCPP_LIB_DIR=ccpp/lib
export INPUT_NML=ccpp_gsd.nml.IN

export HYBEDMF=.F.
export DO_MYNNEDMF=.T.
export IMFSHALCNV=3
export IMFDEEPCNV=3
export LSM=3
export LSOIL_LSM=9
export GWD_OPT=2
export DO_UGWP_V0=.F.
export DO_UGWP_V0_OROG_ONLY=.F.
export DO_GSL_DRAG_LS_BL=.T.
export DO_GSL_DRAG_SS=.T.
export DO_GSL_DRAG_TOFD=.T.
export DO_UGWP_V1=.F.
export DO_UGWP_V1_OROG_ONLY=.F.

export WLCLK=30

131 changes: 131 additions & 0 deletions tests/tests/fv3_ccpp_gsd_no_drag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
###############################################################################
#
# FV3 CCPP GSD (GF CU + Thompson MP + MYNN PBL + RUC LSM) full (0-48h) test
#
###############################################################################

export TEST_DESCR="Compare FV3 CCPP GSD (no drag) results with previous trunk version"

export CNTL_DIR=fv3_gsd_no_drag

export LIST_FILES="atmos_4xdaily.tile1.nc \
atmos_4xdaily.tile2.nc \
atmos_4xdaily.tile3.nc \
atmos_4xdaily.tile4.nc \
atmos_4xdaily.tile5.nc \
atmos_4xdaily.tile6.nc \
phyf000.tile1.nc \
phyf000.tile2.nc \
phyf000.tile3.nc \
phyf000.tile4.nc \
phyf000.tile5.nc \
phyf000.tile6.nc \
phyf024.tile1.nc \
phyf024.tile2.nc \
phyf024.tile3.nc \
phyf024.tile4.nc \
phyf024.tile5.nc \
phyf024.tile6.nc \
phyf027.tile1.nc \
phyf027.tile2.nc \
phyf027.tile3.nc \
phyf027.tile4.nc \
phyf027.tile5.nc \
phyf027.tile6.nc \
phyf048.tile1.nc \
phyf048.tile2.nc \
phyf048.tile3.nc \
phyf048.tile4.nc \
phyf048.tile5.nc \
phyf048.tile6.nc \
dynf000.tile1.nc \
dynf000.tile2.nc \
dynf000.tile3.nc \
dynf000.tile4.nc \
dynf000.tile5.nc \
dynf000.tile6.nc \
dynf024.tile1.nc \
dynf024.tile2.nc \
dynf024.tile3.nc \
dynf024.tile4.nc \
dynf024.tile5.nc \
dynf024.tile6.nc \
dynf027.tile1.nc \
dynf027.tile2.nc \
dynf027.tile3.nc \
dynf027.tile4.nc \
dynf027.tile5.nc \
dynf027.tile6.nc \
dynf048.tile1.nc \
dynf048.tile2.nc \
dynf048.tile3.nc \
dynf048.tile4.nc \
dynf048.tile5.nc \
dynf048.tile6.nc \
RESTART/coupler.res \
RESTART/fv_core.res.nc \
RESTART/fv_core.res.tile1.nc \
RESTART/fv_core.res.tile2.nc \
RESTART/fv_core.res.tile3.nc \
RESTART/fv_core.res.tile4.nc \
RESTART/fv_core.res.tile5.nc \
RESTART/fv_core.res.tile6.nc \
RESTART/fv_srf_wnd.res.tile1.nc \
RESTART/fv_srf_wnd.res.tile2.nc \
RESTART/fv_srf_wnd.res.tile3.nc \
RESTART/fv_srf_wnd.res.tile4.nc \
RESTART/fv_srf_wnd.res.tile5.nc \
RESTART/fv_srf_wnd.res.tile6.nc \
RESTART/fv_tracer.res.tile1.nc \
RESTART/fv_tracer.res.tile2.nc \
RESTART/fv_tracer.res.tile3.nc \
RESTART/fv_tracer.res.tile4.nc \
RESTART/fv_tracer.res.tile5.nc \
RESTART/fv_tracer.res.tile6.nc \
RESTART/phy_data.tile1.nc \
RESTART/phy_data.tile2.nc \
RESTART/phy_data.tile3.nc \
RESTART/phy_data.tile4.nc \
RESTART/phy_data.tile5.nc \
RESTART/phy_data.tile6.nc \
RESTART/sfc_data.tile1.nc \
RESTART/sfc_data.tile2.nc \
RESTART/sfc_data.tile3.nc \
RESTART/sfc_data.tile4.nc \
RESTART/sfc_data.tile5.nc \
RESTART/sfc_data.tile6.nc"

export_fv3
export NODES=$(expr $TASKS / $TPN + 1)

export FHMAX=48
export FDIAG=3

export DT_ATMOS="600"
export IMP_PHYSICS=8
export DNATS=0
export DO_SAT_ADJ=.F.
export LRADAR=.T.
export LTAEROSOL=.T.

export FV3_RUN=ccpp_gsd_run.IN
export CCPP_SUITE=FV3_GSD_v0_no_drag
export CCPP_LIB_DIR=ccpp/lib
export INPUT_NML=ccpp_gsd.nml.IN

export HYBEDMF=.F.
export DO_MYNNEDMF=.T.
export IMFSHALCNV=3
export IMFDEEPCNV=3
export LSM=3
export LSOIL_LSM=9
export DO_UGWP_V0=.F.
export DO_UGWP_V0_OROG_ONLY=.F.
export DO_GSL_DRAG_LS_BL=.F.
export DO_GSL_DRAG_SS=.F.
export DO_GSL_DRAG_TOFD=.F.
export DO_UGWP_V1=.F.
export DO_UGWP_V1_OROG_ONLY=.F.

export WLCLK=30

Loading