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

Updates from v2.0.0 #280

Merged
merged 16 commits into from
Apr 26, 2021
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
branch = master
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/NCAR/ccpp-physics
branch = master
url = https://github.com/llpcarson/ccpp-physics
branch = updates_from_v2
2 changes: 1 addition & 1 deletion ccpp/physics
Submodule physics updated 61 files
+1 −1 physics/GFS_GWD_generic.F90
+14 −15 physics/GFS_MP_generic.F90
+1 −1 physics/GFS_rad_time_vary.fv3.F90
+4 −3 physics/GFS_rrtmg_post.F90
+3 −4 physics/GFS_rrtmg_setup.F90
+3 −5 physics/GFS_stochastics.F90
+2 −1 physics/GFS_suite_interstitial.F90
+13 −10 physics/GFS_surface_generic.F90
+2 −1 physics/GFS_time_vary_pre.fv3.F90
+1 −1 physics/GFS_time_vary_pre.scm.F90
+1 −3 physics/cires_ugwp.F90
+2 −3 physics/cires_ugwp_post.F90
+1 −0 physics/cnvc90.f
+218 −219 physics/cs_conv.F90
+2 −16 physics/docs/ccpp_dox_layout.xml
+476 −0 physics/docs/ccppv5_doxyfile
+ physics/docs/img/MYNN-SFCLAY_call_order.png
+ physics/docs/img/mesocam.png
+374 −308 physics/docs/library.bib
+3 −3 physics/docs/pdftxt/CPT_adv_suite.txt
+48 −0 physics/docs/pdftxt/CU_GF_deep.txt
+27 −0 physics/docs/pdftxt/GFS_NOAHMP.txt
+1 −1 physics/docs/pdftxt/GFS_UGWPv0.txt
+259 −103 physics/docs/pdftxt/GFSv15p2_suite.txt
+238 −139 physics/docs/pdftxt/GFSv16beta_suite.txt
+12 −9 physics/docs/pdftxt/GSD_adv_suite.txt
+76 −0 physics/docs/pdftxt/MYNN_EDMF.txt
+52 −0 physics/docs/pdftxt/MYNN_SFCLAYER.txt
+23 −0 physics/docs/pdftxt/RRFS_SGSCLOUD.txt
+210 −0 physics/docs/pdftxt/RRFS_v1alpha_suite.txt
+100 −0 physics/docs/pdftxt/RUCLSM.txt
+85 −0 physics/docs/pdftxt/THOMPSON.txt
+102 −89 physics/docs/pdftxt/all_shemes_list.txt
+3 −3 physics/docs/pdftxt/all_shemes_list.txt.FV3
+1 −1 physics/docs/pdftxt/code_overview.txt
+1 −1 physics/docs/pdftxt/code_overview.txt.Aug17
+20 −13 physics/docs/pdftxt/mainpage.txt
+5 −3 physics/docs/pdftxt/suite_FV3_GFS_v15p2.xml.txt
+1 −1 physics/docs/pdftxt/suite_FV3_GFS_v15p2_no_nsst.xml.txt
+1 −1 physics/docs/pdftxt/suite_FV3_GFS_v16beta.xml.txt
+1 −1 physics/docs/pdftxt/suite_FV3_GFS_v16beta_no_nsst.xml.txt
+91 −0 physics/docs/pdftxt/suite_FV3_RRFS_v1beta.xml.txt
+411 −312 physics/docs/pdftxt/suite_input.nml.txt
+0 −1 physics/drag_suite.F90
+1 −1 physics/module_MYNNSFC_wrapper.F90
+2 −3 physics/module_SGSCloud_RadPre.F90
+1 −1 physics/module_gfdl_cloud_microphys.F90
+39 −31 physics/module_sf_mynn.F90
+676 −671 physics/module_sf_noahmp_glacier.f90
+449 −375 physics/module_sf_noahmplsm.f90
+174 −174 physics/noahmp_tables.f90
+0 −5 physics/radiation_aerosols.f
+14 −0 physics/rascnv.F90
+28 −28 physics/rrtmg_lw_cloud_optics.F90
+2 −2 physics/rrtmg_lw_post.F90
+2 −2 physics/rrtmg_sw_post.F90
+2 −2 physics/samfdeepcnv.f
+12 −12 physics/scm_sfc_flux_spec.F90
+3 −3 physics/scm_sfc_flux_spec.meta
+1 −1 physics/sfcsub.F
+2 −0 physics/ugwp_driver_v0.F
83 changes: 83 additions & 0 deletions ccpp/suites/suite_FV3_RRFS_v1alpha.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_RRFS_v1alpha" lib="ccppphys" ver="5">
Copy link
Collaborator

Choose a reason for hiding this comment

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

@llpcarson when you update the submodule pointer for ccpp-physics and revert .gitmodules, please change

lib="ccppphys" ver="5"

to

version="1"

to match the new syntax in develop. This has no impact on the tests whatsoever, therefore no need to rerun the tests, but it needs to be consistent for the future (capgen).

<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
<scheme>GFS_rrtmg_setup</scheme>
<scheme>GFS_rad_time_vary</scheme>
<scheme>GFS_phys_time_vary</scheme>
</subcycle>
</group>
<group name="radiation">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>sgscloud_radpre</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw_pre</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>sgscloud_radpost</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
</subcycle>
</group>
<group name="physics">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_phys_reset</scheme>
<scheme>GFS_suite_stateout_reset</scheme>
<scheme>get_prs_fv3</scheme>
<scheme>GFS_suite_interstitial_1</scheme>
<scheme>GFS_surface_generic_pre</scheme>
<scheme>GFS_surface_composites_pre</scheme>
<scheme>dcyc2t3</scheme>
<scheme>GFS_surface_composites_inter</scheme>
<scheme>GFS_suite_interstitial_2</scheme>
</subcycle>
<!-- Surface iteration loop -->
<subcycle loop="2">
<scheme>sfc_diff</scheme>
<scheme>GFS_surface_loop_control_part1</scheme>
<scheme>sfc_nst_pre</scheme>
<scheme>sfc_nst</scheme>
<scheme>sfc_nst_post</scheme>
<scheme>noahmpdrv</scheme>
<scheme>sfc_sice</scheme>
<scheme>GFS_surface_loop_control_part2</scheme>
</subcycle>
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
<scheme>mynnedmf_wrapper</scheme>
<scheme>GFS_GWD_generic_pre</scheme>
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>get_phi_fv3</scheme>
<scheme>GFS_suite_interstitial_3</scheme>
<scheme>GFS_suite_interstitial_4</scheme>
<scheme>GFS_MP_generic_pre</scheme>
<scheme>mp_thompson_pre</scheme>
<scheme>mp_thompson</scheme>
<scheme>mp_thompson_post</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
</subcycle>
</group>
<group name="stochastics">
<subcycle loop="1">
<scheme>GFS_stochastics</scheme>
</subcycle>
</group>
<!-- <finalize></finalize> -->
</suite>