Skip to content

Commit

Permalink
Replace rasmgshoc test with GFSv15p2+ras test, add debug test, add to…
Browse files Browse the repository at this point in the history 
… rt.conf and rt_gnu.conf
  • Loading branch information
@climbfuji
climbfuji committed Mar 15, 2021
1 parent 784b4cc commit c99b83c
Show file tree
Hide file tree
Showing 8 changed files with 256 additions and 163 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 12 files
+6 −3 ccpp/data/GFS_typedefs.F90
+38 −1 ccpp/driver/GFS_diagnostics.F90
+1 −1 ccpp/physics
+83 −0 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml
+94 −0 ccpp/suites/suite_FV3_GFS_v15p2_ras.xml
+2 −2 io/CMakeLists.txt
+78 −0 io/inline_post.F90
+58 −0 io/inline_post_stub.F90
+66 −38 io/module_wrt_grid_comp.F90
+11 −4 io/post_gfs.F90
+2,930 −0 io/post_regional.F90
+110 −110 module_fcst_grid_comp.F90
1 change: 1 addition & 0 deletions tests/default_vars.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,7 @@ export IMFSHALCNV=2
export HWRF_SAMFSHAL=.F.
export IMFDEEPCNV=2
export HWRF_SAMFDEEP=.F.
export RAS=.F.

# SFC
export DO_MYJSFC=.F.
Expand Down
19 changes: 0 additions & 19 deletions tests/fv3_conf/rasmgshoc_run.IN
View file

This file was deleted.

11 changes: 6 additions & 5 deletions tests/parm/v15p2_c96.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
fhout = 3
fhmaxhf = 120
fhouthf = 1
ccpp_suite = 'FV3_GFS_v15p2'
ccpp_suite = '@[CCPP_SUITE]'
/

&diag_manager_nml
Expand Down Expand Up @@ -144,8 +144,9 @@
random_clds = .false.
trans_trac = .true.
cnvcld = .true.
imfshalcnv = 2
imfdeepcnv = 2
imfshalcnv = @[IMFSHALCNV]
imfdeepcnv = @[IMFDEEPCNV]
ras = @[RAS]
cdmbgwd = 0.14,1.8,1.0,1.0
prslrd0 = 0.
ivegsrc = 1
Expand All @@ -162,8 +163,8 @@
do_sppt = .true.
do_shum = .true.
do_skeb = .true.
lndp_type = @[LNDP_TYPE]
n_var_lndp = @[N_VAR_LNDP]
lndp_type = @[LNDP_TYPE]
n_var_lndp = @[N_VAR_LNDP]
/

&gfdl_cloud_microphysics_nml
Expand Down
240 changes: 121 additions & 119 deletions tests/rt.conf
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions tests/rt_gnu.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ COMPILE | SUITES=FV3_GFS_2017_gfdlmp
RUN | fv3_ccpp_gfdlmp | | fv3 |

COMPILE | SUITES=FV3_GFS_v15p2,FV3_GFS_v16,FV3_GFS_v16_flake,FV3_GFS_v15p2_RRTMGP,FV3_GFS_v16_RRTMGP | | fv3 |

RUN | fv3_ccpp_gfs_v15p2 | | fv3 |
RUN | fv3_ccpp_gfs_v16 | | fv3 |
RUN | fv3_ccpp_gfs_v16_restart | | | fv3_ccpp_gfs_v16
Expand All @@ -16,18 +15,18 @@ RUN | fv3_ccpp_gfs_v15p2_RRTMGP
RUN | fv3_ccpp_gfs_v16_RRTMGP | | fv3 |

COMPILE | SUITES=FV3_GSD_v0,FV3_GFS_v16_thompson,FV3_RRFS_v1beta 32BIT=Y | | fv3 |

RUN | fv3_ccpp_gsd | | fv3 |
RUN | fv3_ccpp_thompson | | fv3 |
RUN | fv3_ccpp_thompson_no_aero | | fv3 |
RUN | fv3_ccpp_rrfs_v1beta | | fv3 |

COMPILE | SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1 | | fv3 |
COMPILE | SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v15p2_ras | | fv3 |
RUN | fv3_ccpp_HAFS_v0_hwrf_thompson | | fv3 |
#RUN | fv3_ccpp_HAFS_v0_hwrf | | fv3 |
RUN | fv3_ccpp_esg_HAFS_v0_hwrf_thompson | | fv3 |
RUN | fv3_ccpp_gfsv16_ugwpv1 | | fv3 |
RUN | fv3_ccpp_gfsv16_ugwpv1_warmstart | | fv3 |
RUN | fv3_gfs_v15p2_ras | | fv3 |

##################################################################################################################################################################
# CCPP DEBUG tests #
Expand All @@ -53,11 +52,12 @@ RUN | fv3_ccpp_gsd_debug
RUN | fv3_ccpp_thompson_debug | | fv3 |
RUN | fv3_ccpp_thompson_no_aero_debug | | fv3 |

COMPILE | SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1 DEBUG=Y | | fv3 |
COMPILE | SUITES=HAFS_v0_hwrf_thompson,HAFS_v0_hwrf,FV3_GFS_v16b_ugwpv1,FV3_GFS_v15p2_ras DEBUG=Y | | fv3 |
RUN | fv3_ccpp_HAFS_v0_hwrf_thompson_debug | | fv3 |
#RUN | fv3_ccpp_HAFS_v0_hwrf_debug | | fv3 |
RUN | fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug | | fv3 |
RUN | fv3_ccpp_gfsv16_ugwpv1_debug | | fv3 |
RUN | fv3_gfs_v15p2_ras_debug | | fv3 |

##################################################################################################################################################################
# S2S tests #
Expand Down
49 changes: 34 additions & 15 deletions tests/tests/fv3_rasmgshoc → tests/tests/fv3_gfs_v15p2_ras
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,43 @@
###############################################################################
#
# FV3 RASMGSHOC test
# FV3 GFS v15p2 + RAS test
#
###############################################################################

export TEST_DESCR="Compare FV3 rasmgshoc results with previous trunk version"
export TEST_DESCR="Compare FV3 GFS v15p2 + RAS results with previous trunk version"

export CNTL_DIR=fv3_rasmgshoc
export CNTL_DIR=fv3_gfs_v15p2_ras

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.nemsio \
phyf024.nemsio \
dynf000.nemsio \
dynf024.nemsio \
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 \
Expand Down Expand Up @@ -54,13 +74,12 @@ export LIST_FILES="atmos_4xdaily.tile1.nc \

export_fv3

DT_ATMOS="600"

export INPUT_NML=rasmgshoc.nml.IN
export FV3_RUN=rasmgshoc_run.IN
export OUTPUT_GRID="'gaussian_grid'"
export OUTPUT_FILE="'nemsio'"
export WRITE_NEMSIOFLIP=.true.
export WRITE_FSYNCFLAG=.true.
export DT_ATMOS="600"

export INPUT_NML=v15p2_c96.nml.IN
export CCPP_SUITE=FV3_GFS_v15p2_ras
export FV3_RUN=gfs_v15_run.IN

export OZ_PHYS_OLD=.F.
export OZ_PHYS_NEW=.T.
export H2O_PHYS=.T.
89 changes: 89 additions & 0 deletions tests/tests/fv3_gfs_v15p2_ras_debug
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
###############################################################################
#
# FV3 GFS v15p2 + RAS test in DEBUG mode
#
###############################################################################

export TEST_DESCR="Compare FV3 GFS v15p2 + RAS DEBUG results with previous trunk version"

export CNTL_DIR=fv3_gfs_v15p2_ras_debug

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 \
phyf006.tile1.nc \
phyf006.tile2.nc \
phyf006.tile3.nc \
phyf006.tile4.nc \
phyf006.tile5.nc \
phyf006.tile6.nc \
dynf000.tile1.nc \
dynf000.tile2.nc \
dynf000.tile3.nc \
dynf000.tile4.nc \
dynf000.tile5.nc \
dynf000.tile6.nc \
dynf006.tile1.nc \
dynf006.tile2.nc \
dynf006.tile3.nc \
dynf006.tile4.nc \
dynf006.tile5.nc \
dynf006.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=6
export FDIAG=3
export DT_ATMOS="600"

export INPUT_NML=v15p2_c96.nml.IN
export CCPP_SUITE=FV3_GFS_v15p2_ras
export FV3_RUN=gfs_v15_run.IN

export RAS=.T.
export IMFDEEPCNV=-1
export OZ_PHYS_OLD=.F.
export OZ_PHYS_NEW=.T.
export H2O_PHYS=.T.

0 comments on commit c99b83c

Please sign in to comment.