Merge pull request #3 from mzhangw/pr-626

scidoc fix for PR626
climbfuji · Apr 16, 2021 · 495536d · 495536d
2 parents 1f8c2da + 046f585
commit 495536d
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/physics/docs/pdftxt/CPT_adv_suite.txt b/physics/docs/pdftxt/CPT_adv_suite.txt
@@ -23,7 +23,7 @@ The csawmg physics suite uses the parameterizations in the following order:
 \code
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="SCM_csawmg" lib="ccppphys" ver="5">
+<suite name="SCM_csawmg" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
@@ -86,9 +86,9 @@ The csawmg physics suite uses the parameterizations in the following order:
       <scheme>GFS_suite_stateout_update</scheme>
       <scheme>ozphys_2015</scheme>
       <scheme>h2ophys</scheme>
-      <scheme>GFS_DCNV_generic_pre</scheme>
       <scheme>get_phi_fv3</scheme>
       <scheme>GFS_suite_interstitial_3</scheme>
+      <scheme>GFS_DCNV_generic_pre</scheme>
       <scheme>cs_conv_pre</scheme>
       <scheme>cs_conv</scheme>
       <scheme>cs_conv_post</scheme>
@@ -105,6 +105,7 @@ The csawmg physics suite uses the parameterizations in the following order:
       <scheme>cs_conv_aw_adj</scheme>
       <scheme>GFS_MP_generic_post</scheme>
       <scheme>maximum_hourly_diagnostics</scheme>
+      <scheme>phys_tend</scheme>
     </subcycle>
   </group>
   <!-- <finalize></finalize> -->

diff --git a/physics/docs/pdftxt/GFSv15p2_suite.txt b/physics/docs/pdftxt/GFSv15p2_suite.txt
@@ -26,7 +26,7 @@ The GFS_v15p2 physics suite uses the parameterizations in the following order:
 \code
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="FV3_GFS_v15p2" lib="ccppphys" ver="5">
+<suite name="FV3_GFS_v15p2" version="1">
   <!-- <init></init> -->
   <group name="fast_physics">
     <subcycle loop="1">

diff --git a/physics/docs/pdftxt/GFSv16beta_suite.txt b/physics/docs/pdftxt/GFSv16beta_suite.txt
@@ -29,7 +29,7 @@ The GFS_v16beta physics suite uses the parameterizations in the following order:
 \code
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="FV3_GFS_v16beta" lib="ccppphys" ver="5">
+<suite name="FV3_GFS_v16beta" version="1">
   <!-- <init></init> -->
   <group name="fast_physics">
     <subcycle loop="1">

diff --git a/physics/docs/pdftxt/GSD_adv_suite.txt b/physics/docs/pdftxt/GSD_adv_suite.txt
@@ -31,7 +31,7 @@ The GSD_v1 physics suite uses the parameterizations in the following order:
 \code
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="SCM_GSD_v1" lib="ccppphys" ver="5">
+<suite name="SCM_GSD_v1" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
@@ -44,14 +44,14 @@ The GSD_v1 physics suite uses the parameterizations in the following order:
   <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>mynnrad_pre</scheme>
       <scheme>rrtmg_sw</scheme>
       <scheme>rrtmg_sw_post</scheme>
       <scheme>rrtmg_lw_pre</scheme>
       <scheme>rrtmg_lw</scheme>
-      <scheme>mynnrad_post</scheme>
+      <scheme>sgscloud_radpost</scheme>
       <scheme>rrtmg_lw_post</scheme>
       <scheme>GFS_rrtmg_post</scheme>
     </subcycle>
@@ -76,6 +76,9 @@ The GSD_v1 physics suite uses the parameterizations in the following order:
       <scheme>sfc_nst</scheme>
       <scheme>sfc_nst_post</scheme>
       <scheme>lsm_ruc</scheme>
+      <scheme>lsm_ruc_sfc_sice_pre</scheme>
+      <scheme>sfc_sice</scheme>
+      <scheme>lsm_ruc_sfc_sice_post</scheme>
       <scheme>GFS_surface_loop_control_part2</scheme>
     </subcycle>
     <!-- End of surface iteration loop -->
@@ -93,9 +96,9 @@ The GSD_v1 physics suite uses the parameterizations in the following order:
       <scheme>GFS_suite_stateout_update</scheme>
       <scheme>ozphys_2015</scheme>
       <scheme>h2ophys</scheme>
-      <scheme>GFS_DCNV_generic_pre</scheme>
       <scheme>get_phi_fv3</scheme>
       <scheme>GFS_suite_interstitial_3</scheme>
+      <scheme>GFS_DCNV_generic_pre</scheme>
       <scheme>cu_gf_driver_pre</scheme>
       <scheme>cu_gf_driver</scheme>
       <scheme>GFS_DCNV_generic_post</scheme>
@@ -110,6 +113,7 @@ The GSD_v1 physics suite uses the parameterizations in the following order:
       <scheme>GFS_MP_generic_post</scheme>
       <scheme>cu_gf_driver_post</scheme>
       <scheme>maximum_hourly_diagnostics</scheme>
+      <scheme>phys_tend</scheme>
     </subcycle>
   </group>
   <!-- <finalize></finalize> -->

diff --git a/physics/docs/pdftxt/RRFS_v1alpha_suite.txt b/physics/docs/pdftxt/RRFS_v1alpha_suite.txt
@@ -24,7 +24,7 @@ The RRFS_v1alpha physics suite uses the parameterizations in the following order
 \code
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="FV3_RRFS_v1alpha" lib="ccppphys" ver="5">
+<suite name="FV3_RRFS_v1alpha" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">

diff --git a/physics/docs/pdftxt/suite_input.nml.txt b/physics/docs/pdftxt/suite_input.nml.txt
@@ -269,14 +269,14 @@ show some variables in the namelist that must match the SDF.
                                                       </ul>
                                                       <td>0
 <tr><td>bl_mynn_edmf_part    <td>mynnedmf_wrapper     <td>flag to partitioning the MF and ED areas      <td>0  
-<tr><td>bl_mynn_edmf_tkeadvect  <td>mynnedmf_wrapper  <td>activate computation of TKE advection (not yet in use for FV3) \n 
+<tr><td>bl_mynn_tkeadvect  <td>mynnedmf_wrapper  <td>activate computation of TKE advection (not yet in use for FV3) \n 
                                                       <ul>
                                                       <li> false: deactivate TKE advection  
                                                       <li> true: activate TKE advection 
                                                       </ul>  
                                                       <td>.false. 
-<tr><td>bl_mynn_edmf_tkebudget  <td>mynnedmf_wrapper  <td>flag to activate TKE budget                  <td>0
-<tr><td>bl_mynn_edmf_cloudpdf   <td>mynnedmf_wrapper  <td>flag to determine which cloud PDF to use \n 
+<tr><td>bl_mynn_tkebudget  <td>mynnedmf_wrapper  <td>flag to activate TKE budget                  <td>0
+<tr><td>bl_mynn_cloudpdf   <td>mynnedmf_wrapper  <td>flag to determine which cloud PDF to use \n 
                                                       <ul>
                                                       <li> 0: use Sommeria-Deardorff subgrid cloud PDF 
                                                       <li> 1: use Kuwano-Yoshida subgrid cloud PDF