Draft//WIP Complete CCPPization of gravity wave drag (CAM4/5, CAM7?)

cime_config/namelist_definition_cam.xml

@@ -377,6 +377,19 @@
     </values>
   </entry>
 
+<!-- Gravity wave ridge parameterization inputs -->
+  <entry id="bnd_rdggm">
+    <type>char*256</type>
+    <category>gravity_wave_drag</category>
+    <group>gw_drag_input_nl</group>
+    <desc>
+      Full pathname of boundary dataset for meso-gamma ridges.
+    </desc>
+    <values>
+      <value>UNSET_PATH</value>
+    </values>
+  </entry>
+
 <!-- Vertical Coordinate -->
 
   <entry id="pver">

src/control/cam_comp.F90

@@ -103,6 +103,7 @@ subroutine cam_init(caseid, ctitle, model_doi_url,                         &
       use vert_coord,                only: pver
       use phys_vars_init_check,      only: mark_as_initialized
       use tropopause_climo_read,     only: tropopause_climo_read_file
+      use gravity_wave_drag_ridge_read, only: gravity_wave_drag_ridge_read_file
       use orbital_data,              only: orbital_data_init
       use ccpp_kinds,                only: kind_phys
       use ccpp_constituent_prop_mod, only: ccpp_constituent_prop_ptr_t
@@ -248,6 +249,9 @@ subroutine cam_init(caseid, ctitle, model_doi_url,                         &
       ! Read tropopause climatology
       call tropopause_climo_read_file()
 
+      ! Read gravity wave drag data for ridge parameterization
+      call gravity_wave_drag_ridge_read_file()
+
       ! TEMPORARY:  Prescribe realistic but inaccurate physical quantities
       ! necessary for MUSICA that are currently unavailable in CAM-SIMA.
       !

src/control/runtime_opts.F90

@@ -45,6 +45,7 @@ subroutine read_namelist(nlfilename, single_column, scmlat, scmlon)
       use inic_analytic_utils, only: analytic_ic_readnl
 
       use tropopause_climo_read, only: tropopause_climo_readnl
+      use gravity_wave_drag_ridge_read, only: gravity_wave_drag_ridge_read_readnl
 
 !      use tracers,             only: tracers_readnl
 !      use nudging,             only: nudging_readnl
@@ -104,7 +105,7 @@ subroutine read_namelist(nlfilename, single_column, scmlat, scmlon)
       call tropopause_climo_readnl(nlfilename)
 !      call scam_readnl(nlfilename, single_column, scmlat, scmlon)
 !      call nudging_readnl(nlfilename)
-
+      call gravity_wave_drag_ridge_read_readnl(nlfilename)
       call dyn_readnl(nlfilename)
 
       ! Read the namelists for active physics schemes

src/data/registry.xml

@@ -13,12 +13,15 @@
   <metadata_file>$SRCROOT/src/physics/utils/physics_grid.meta</metadata_file>
   <metadata_file>$SRCROOT/src/physics/utils/cam_constituents.meta</metadata_file>
   <metadata_file>$SRCROOT/src/physics/utils/tropopause_climo_read.meta</metadata_file>
+  <metadata_file>$SRCROOT/src/physics/utils/gravity_wave_drag_ridge_read.meta</metadata_file>
   <metadata_file>$SRCROOT/src/data/air_composition.meta</metadata_file>
   <metadata_file>$SRCROOT/src/data/cam_thermo.meta</metadata_file>
   <metadata_file>$SRCROOT/src/data/cam_thermo_formula.meta</metadata_file>
   <metadata_file>$SRCROOT/src/data/ref_pres.meta</metadata_file>
   <metadata_file>$SRCROOT/src/dynamics/utils/vert_coord.meta</metadata_file>
   <metadata_file>$SRCROOT/src/dynamics/utils/hycoef.meta</metadata_file>
+  <!-- temporary for Coords1D -->
+  <metadata_file>$SRCROOT/src/physics/ncar_ccpp/to_be_ccppized/coords_1d.meta</metadata_file>
   <!-- Variables registered to physics_types -->
   <file name="physics_types" type="module">
     <use module="ccpp_kinds" reference="kind_phys"/>
@@ -1313,6 +1316,7 @@
               units="None" type="cam_out_t">
       <long_name> </long_name>
     </variable>
+
     <!-- Temporary initializations from snapshot -->
     <!-- Note that no_deep_pbl defaults to false, but needs to be set to true for diag_TKE or UW schemes -->
     <variable local_name="pblh"
@@ -1388,6 +1392,24 @@
       <ic_file_input_names>pbuf_LCWAT</ic_file_input_names>
     </variable>
 
+    <!-- Gravity wave drag variables - need to be kept in CAM registry -->
+    <variable local_name="kvt"
+              standard_name="molecular_kinematic_temperature_conductivity_at_interfaces"
+              units="m2 s-1" type="real" kind="kind_phys"
+              allocatable="allocatable">
+      <dimensions>horizontal_dimension vertical_interface_dimension</dimensions>
+      <initial_value>0.0_kind_phys</initial_value>
+      <ic_file_input_names>pbuf_kvt</ic_file_input_names>
+    </variable>
+    <variable local_name="sgh"
+              standard_name="standard_deviation_of_subgrid_orography_for_orographic_gravity_wave_drag"
+              units="m" type="real" kind="kind_phys"
+              allocatable="allocatable">
+      <dimensions>horizontal_dimension</dimensions>
+      <initial_value>0.0_kind_phys</initial_value>
+      <ic_file_input_names>pbuf_SGH</ic_file_input_names>
+    </variable>
+
     <!-- Zhang McFarlane (ZM) Variables -->
     <variable local_name="ql"
               standard_name="in_cloud_water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water_due_to_deep_convection"

src/dynamics/se/dyn_comp.F90

@@ -2320,7 +2320,7 @@ subroutine read_dyn_field_2d(fieldname, fh, dimname, buffer)
    end if
 
    ! This code allows use of compiler option to set uninitialized values
-   ! to NaN.  In that case cam_read_feild can return NaNs where the element
+   ! to NaN.  In that case cam_read_field can return NaNs where the element
    ! GLL points are not "unique columns".
    ! Set NaNs or fillvalue points to zero:
    where (shr_infnan_isnan(buffer) .or. (buffer==fillvalue)) buffer = 0.0_r8
@@ -2350,7 +2350,7 @@ subroutine read_dyn_field_3d(fieldname, fh, dimname, buffer)
    end if
 
    ! This code allows use of compiler option to set uninitialized values
-   ! to NaN.  In that case infld can return NaNs where the element GLL
+   ! to NaN.  In that case cam_read_field can return NaNs where the element GLL
    ! points are not "unique columns".
    ! Set NaNs or fillvalue points to zero:
    where (shr_infnan_isnan(buffer) .or. (buffer==fillvalue)) buffer = 0.0_r8