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.

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

update ufs-s2s-model to use updated FV3 and FMS tag 2019.01 #56

Merged
merged 7 commits into from
Mar 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
branch = develop
[submodule "FMS"]
path = FMS
url = https://github.com/NOAA-EMC/FMS
branch = GFS-FMS
url = https://github.com/NOAA-GFDL/FMS
branch = master
[submodule "stochastic_physics"]
path = stochastic_physics
url = https://github.com/noaa-psd/stochastic_physics
Expand Down
2 changes: 1 addition & 1 deletion FMS
Submodule FMS updated 342 files
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 70 files
+1 −1 atmos_cubed_sphere
+66 −23 atmos_model.F90
+1 −0 ccpp/config/ccpp_prebuild_config.py
+1 −1 ccpp/physics
+0 −1 ccpp/suites/suite_FV3_CPT_v0.xml
+0 −1 ccpp/suites/suite_FV3_GFS_2017.xml
+1 −2 ccpp/suites/suite_FV3_GFS_2017_coupled.xml
+0 −1 ccpp/suites/suite_FV3_GFS_2017_csawmg.xml
+0 −1 ccpp/suites/suite_FV3_GFS_2017_csawmgshoc.xml
+0 −1 ccpp/suites/suite_FV3_GFS_2017_gfdlmp.xml
+0 −1 ccpp/suites/suite_FV3_GFS_2017_gfdlmp_noahmp.xml
+0 −1 ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional.xml
+0 −1 ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional_c768.xml
+0 −1 ccpp/suites/suite_FV3_GFS_2017_h2ophys.xml
+0 −1 ccpp/suites/suite_FV3_GFS_2017_myj.xml
+0 −1 ccpp/suites/suite_FV3_GFS_2017_ntiedtke.xml
+0 −1 ccpp/suites/suite_FV3_GFS_2017_ozphys_2015.xml
+0 −1 ccpp/suites/suite_FV3_GFS_2017_sas.xml
+0 −1 ccpp/suites/suite_FV3_GFS_2017_satmedmf.xml
+0 −1 ccpp/suites/suite_FV3_GFS_2017_satmedmfq.xml
+0 −1 ccpp/suites/suite_FV3_GFS_2017_shinhong.xml
+0 −1 ccpp/suites/suite_FV3_GFS_2017_stretched.xml
+0 −1 ccpp/suites/suite_FV3_GFS_2017_ysu.xml
+88 −0 ccpp/suites/suite_FV3_GFS_cpld_rasmgshoc.xml
+90 −0 ccpp/suites/suite_FV3_GFS_cpldnst_rasmgshoc.xml
+92 −0 ccpp/suites/suite_FV3_GFS_rasmgshoc.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v15.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v15_gf.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v15_gf_thompson.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v15_mynn.xml
+94 −0 ccpp/suites/suite_FV3_GFS_v15_ras.xml
+89 −0 ccpp/suites/suite_FV3_GFS_v15_rasmgshoc.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v15_thompson.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v15p2.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v15plus.xml
+94 −0 ccpp/suites/suite_FV3_GFS_v15plusras.xml
+0 −1 ccpp/suites/suite_FV3_GFS_v16beta.xml
+0 −1 ccpp/suites/suite_FV3_GSD_SAR.xml
+0 −1 ccpp/suites/suite_FV3_GSD_noah.xml
+0 −1 ccpp/suites/suite_FV3_GSD_v0.xml
+0 −1 ccpp/suites/suite_FV3_GSD_v0_drag_suite.xml
+0 −1 ccpp/suites/suite_FV3_HAFS_ferhires_update_moist.xml
+1 −1 cpl/module_cap_cpl.F90
+8 −5 cpl/module_cplfields.F90
+6 −6 fv3_cap.F90
+3 −3 gfsphysics/GFS_layer/GFS_driver.F90
+287 −219 gfsphysics/GFS_layer/GFS_physics_driver.F90
+8 −8 gfsphysics/GFS_layer/GFS_radiation_driver.F90
+91 −71 gfsphysics/GFS_layer/GFS_typedefs.F90
+70 −26 gfsphysics/GFS_layer/GFS_typedefs.meta
+10 −10 gfsphysics/physics/cires_ugwp_initialize.F90
+26 −26 gfsphysics/physics/cires_ugwp_triggers.F90
+1 −1 gfsphysics/physics/dcyc2.f
+106 −89 gfsphysics/physics/gcm_shoc.f90
+12 −5 gfsphysics/physics/gcycle.F90
+10 −10 gfsphysics/physics/gwdps.f
+25 −12 gfsphysics/physics/m_micro_driver.F90
+43 −51 gfsphysics/physics/micro_mg2_0.F90
+18 −7 gfsphysics/physics/micro_mg3_0.F90
+138 −109 gfsphysics/physics/micro_mg_utils.F90
+14 −2 gfsphysics/physics/moninshoc.f
+40 −21 gfsphysics/physics/rascnvv2.f
+23 −21 gfsphysics/physics/sfc_diff.f
+2 −2 gfsphysics/physics/sfc_nst.f
+1 −1 gfsphysics/physics/sfc_sice.f
+164 −164 gfsphysics/physics/ugwp_driver_v0.f
+13 −4 io/FV3GFS_io.F90
+8 −8 module_fcst_grid_comp.F90
+15 −2 namphysics/NAM_layer/NAM_typedefs.F90
4 changes: 2 additions & 2 deletions compsets/hera.input
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ platform hera.intel {
# INPUTS is the input directory, which should contain fix and parm
# files, plus any restarts or other inputs.

BASELINE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/master-20200228"
BASELINE_TEMPLATE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/master-20200228"
BASELINE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/master-20200312"
BASELINE_TEMPLATE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/master-20200312"
INPUTS="@[BASELINE]"

default_resources={
Expand Down
Loading