Merge pull request #247 from peverwhee/framework-update

Update to latest framework tag

Externals_CAM.cfg

@@ -2,7 +2,7 @@
 local_path = ccpp_framework
 protocol = git
 repo_url = https://github.com/peverwhee/ccpp-framework
-tag = CPF_0.2.050
+tag = CPF_0.2.056
 required = True
 
 [mpas]
@@ -17,7 +17,7 @@ required = True
 local_path = src/physics/ncar_ccpp
 protocol = git
 repo_url = https://github.com/ESCOMP/atmospheric_physics
-tag = atmos_phys0_01_000
+tag = atmos_phys0_02_003
 required = True
 
 [externals_description]

src/control/cam_comp.F90

@@ -512,6 +512,7 @@ subroutine cam_register_constituents(cam_runtime_opts)
       integer                                        :: errflg
       character(len=512)                             :: errmsg
       type(ccpp_constituent_prop_ptr_t), pointer     :: const_props(:)
+      type(ccpp_constituent_properties_t), allocatable, target :: dynamic_constituents(:)
       character(len=*), parameter :: subname = 'cam_register_constituents: '
 
       ! Initalize error flag and message:
@@ -563,7 +564,7 @@ subroutine cam_register_constituents(cam_runtime_opts)
       !Combine host and physics constituents into a single
       !constituents object:
       call cam_ccpp_register_constituents(cam_runtime_opts%suite_as_list(),             &
-           host_constituents, errcode=errflg, errmsg=errmsg)
+           host_constituents, dynamic_constituents, errcode=errflg, errmsg=errmsg)
 
       if (errflg /= 0) then
          call endrun(subname//trim(errmsg), file=__FILE__, line=__LINE__)

src/data/physconst.meta

@@ -68,7 +68,7 @@
   dimensions = ()
   protected = True
 [ pref ]
-  standard_name = reference_pressure
+  standard_name = surface_reference_pressure
   units = Pa
   type = real | kind = kind_phys
   dimensions = ()

src/data/ref_pres.F90

@@ -173,7 +173,7 @@ subroutine ref_pres_init(pref_edge_in, pref_mid_in, num_pr_lev_in)
       ! pref_mid_in
       call mark_as_initialized("reference_pressure_in_atmosphere_layer")
       ! pref_mid_norm
-      call mark_as_initialized("reference_pressure_in_atmosphere_layer_normalized_by_reference_pressure")
+      call mark_as_initialized("reference_pressure_in_atmosphere_layer_normalized_by_surface_reference_pressure")
       ! ptop_ref
       call mark_as_initialized("air_pressure_at_top_of_atmosphere_model")
       ! num_pr_lev

src/data/ref_pres.meta

@@ -17,7 +17,7 @@
   dimensions = (vertical_layer_dimension)
   protected = True
 [ pref_mid_norm ]
-  standard_name = reference_pressure_in_atmosphere_layer_normalized_by_reference_pressure
+  standard_name = reference_pressure_in_atmosphere_layer_normalized_by_surface_reference_pressure
   units = 1
   type = real | kind = kind_phys
   dimensions = (vertical_layer_dimension)

src/data/registry.xml

@@ -106,7 +106,7 @@
     </variable>
     <variable local_name="rpdel"
               standard_name="reciprocal_of_air_pressure_thickness"
-              units="Pa" type="real" kind="kind_phys"
+              units="Pa-1" type="real" kind="kind_phys"
               allocatable="pointer">
       <dimensions>horizontal_dimension vertical_layer_dimension</dimensions>
       <ic_file_input_names>rpdel state_rpdel</ic_file_input_names>
@@ -260,7 +260,7 @@
       <ic_file_input_names>dvdt tend_dvdt</ic_file_input_names>
     </variable>
     <variable local_name="lagrangian_vertical"
-              standard_name="lagrangian_vertical_coordinate"
+              standard_name="do_lagrangian_vertical_coordinate"
               units="flag" type="logical" access="protected">
       <long_name>flag indicating if vertical coordinate is lagrangian</long_name>
       <initial_value>.false.</initial_value>
@@ -349,7 +349,7 @@
     </variable>
     <variable local_name="zvirv"
               standard_name="ratio_of_water_vapor_gas_constant_to_composition_dependent_dry_air_gas_constant_minus_one"
-              units="J kg-1 K-1" type="real" kind="kind_phys"
+              units="1" type="real" kind="kind_phys"
               allocatable="allocatable">
       <long_name>Composition-dependent ratio of water vapor to dry air gas constants minus one</long_name>
       <dimensions>horizontal_dimension vertical_layer_dimension</dimensions>

src/physics/utils/cam_constituents.F90

@@ -272,7 +272,7 @@ function const_molec_weight(const_ind)
       character(len=*), parameter :: subname = 'const_molec_weight: '
 
       if (check_index_bounds(const_ind, subname)) then
-         call const_props(const_ind)%molec_weight(const_molec_weight,         &
+         call const_props(const_ind)%molar_mass(const_molec_weight,         &
               err_code, err_msg)
          if (err_code /= 0) then
             call endrun(subname//"Error "//to_str(err_code)//": "//           &

src/physics/utils/phys_comp.meta

@@ -25,13 +25,13 @@
 [ errmsg ]
   standard_name = ccpp_error_message
   long_name = Error message for error handling in CCPP
-  units = 1
+  units = none
   dimensions = ()
   type = character
   kind = len=512
 [ errcode ]
   standard_name = ccpp_error_code
   long_name = Error flag for error handling in CCPP
-  units = flag
+  units = 1
   dimensions = ()
   type = integer