Skip to content

Commit

Permalink
point FV3 back to the same commit used by ufs-weather
Browse files Browse the repository at this point in the history
  • Loading branch information
@DeniseWorthen
DeniseWorthen committed Oct 29, 2020
1 parent 4fa1522 commit 41586b7
Show file tree
Hide file tree
Showing 4 changed files with 154 additions and 151 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 3 files
+4 −4 .gitmodules
+1 −1 atmos_cubed_sphere
+1 −1 ccpp/physics
101 changes: 51 additions & 50 deletions tests/tests/cpld_control_mx025
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,56 +5,57 @@ export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C96MX025"

export CNTL_DIR="cpld_control_mx025"

export LIST_FILES="phyf024.tile1.nc \
phyf024.tile2.nc \
phyf024.tile3.nc \
phyf024.tile4.nc \
phyf024.tile5.nc \
phyf024.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 \
RESTART/MOM.res.nc \
RESTART/MOM.res_1.nc \
RESTART/MOM.res_2.nc \
RESTART/MOM.res_3.nc \
RESTART/iced.2016-10-04-00000.nc"
#RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
export LIST_FILES=" "
#export LIST_FILES="phyf024.tile1.nc \
# phyf024.tile2.nc \
# phyf024.tile3.nc \
# phyf024.tile4.nc \
# phyf024.tile5.nc \
# phyf024.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 \
# RESTART/MOM.res.nc \
# RESTART/MOM.res_1.nc \
# RESTART/MOM.res_2.nc \
# RESTART/MOM.res_3.nc \
# RESTART/iced.2016-10-04-00000.nc"
# #RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"

export_fv3
export_cpl
Expand Down
101 changes: 51 additions & 50 deletions tests/tests/cpld_control_mx025_12h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,56 +5,57 @@ export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C96MX025 12h"

export CNTL_DIR="cpld_control_mx025_12h"

export LIST_FILES="phyf012.tile1.nc \
phyf012.tile2.nc \
phyf012.tile3.nc \
phyf012.tile4.nc \
phyf012.tile5.nc \
phyf012.tile6.nc \
dynf012.tile1.nc \
dynf012.tile2.nc \
dynf012.tile3.nc \
dynf012.tile4.nc \
dynf012.tile5.nc \
dynf012.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 \
RESTART/MOM.res.nc \
RESTART/MOM.res_1.nc \
RESTART/MOM.res_2.nc \
RESTART/MOM.res_3.nc \
RESTART/iced.2016-10-03-43200.nc"
#RESTART/ufs.cpld.cpl.r.2016-10-03-43200.nc"
export LIST_FILES=""
#export LIST_FILES="phyf012.tile1.nc \
# phyf012.tile2.nc \
# phyf012.tile3.nc \
# phyf012.tile4.nc \
# phyf012.tile5.nc \
# phyf012.tile6.nc \
# dynf012.tile1.nc \
# dynf012.tile2.nc \
# dynf012.tile3.nc \
# dynf012.tile4.nc \
# dynf012.tile5.nc \
# dynf012.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 \
# RESTART/MOM.res.nc \
# RESTART/MOM.res_1.nc \
# RESTART/MOM.res_2.nc \
# RESTART/MOM.res_3.nc \
# RESTART/iced.2016-10-03-43200.nc"
# #RESTART/ufs.cpld.cpl.r.2016-10-03-43200.nc"

export_fv3
export_cpl
Expand Down
101 changes: 51 additions & 50 deletions tests/tests/cpld_restart_mx025
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,56 +6,57 @@ export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C96MX025 - 12

export CNTL_DIR="cpld_control_mx025"

export LIST_FILES="phyf024.tile1.nc \
phyf024.tile2.nc \
phyf024.tile3.nc \
phyf024.tile4.nc \
phyf024.tile5.nc \
phyf024.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 \
RESTART/MOM.res.nc \
RESTART/MOM.res_1.nc \
RESTART/MOM.res_2.nc \
RESTART/MOM.res_3.nc \
RESTART/iced.2016-10-04-00000.nc "
#RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"
export LIST_FILES=" "
#export LIST_FILES="phyf024.tile1.nc \
# phyf024.tile2.nc \
# phyf024.tile3.nc \
# phyf024.tile4.nc \
# phyf024.tile5.nc \
# phyf024.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 \
# RESTART/MOM.res.nc \
# RESTART/MOM.res_1.nc \
# RESTART/MOM.res_2.nc \
# RESTART/MOM.res_3.nc \
# RESTART/iced.2016-10-04-00000.nc "
# #RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"

export_fv3
export_cpl
Expand Down

0 comments on commit 41586b7

Please sign in to comment.