CCPP framework update and metadata bug fixes (NOAA-EMC#367)

* Update order of variable definition files in ccpp/config/ccpp_prebuild_config.py
* Remove duplicate variables in ccpp/data/GFS_typedefs.meta

ccpp/config/ccpp_prebuild_config.py

@@ -15,26 +15,27 @@
 # dependencies of these files to the list.
 VARIABLE_DEFINITION_FILES = [
     # actual variable definition files
+    'framework/src/ccpp_types.F90',
     'physics/physics/machine.F',
     'physics/physics/radsw_param.f',
+    'physics/physics/radlw_param.f',
     'physics/physics/h2o_def.f',
     'physics/physics/ozne_def.f',
-    'physics/physics/radlw_param.f',
     'physics/physics/radiation_surface.f',
-    'data/CCPP_typedefs.F90',
-    'data/GFS_typedefs.F90',
-    'data/CCPP_data.F90',
     'physics/physics/rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90',
     'physics/physics/rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90',
     'physics/physics/rte-rrtmgp/rte/mo_optical_props.F90',
     'physics/physics/rte-rrtmgp/extensions/cloud_optics/mo_cloud_optics.F90',
     'physics/physics/rte-rrtmgp/rte/mo_source_functions.F90',
+    'data/CCPP_typedefs.F90',
+    'data/GFS_typedefs.F90',
+    'data/CCPP_data.F90',
     ]
 
 TYPEDEFS_NEW_METADATA = {
     'ccpp_types' : {
-        'ccpp_types' : '',
         'ccpp_t' : 'cdata',
+        'ccpp_types' : '',
         },
     'machine' : {
         'machine' : '',

ccpp/data/GFS_typedefs.meta

@@ -2381,13 +2381,6 @@
   units = none
   dimensions = ()
   type = integer
-[fhzero]
-  standard_name = frequency_for_diagnostic_clearing
-  long_name = frequency for clearing diagnostic fields
-  units = h
-  dimensions = ()
-  type = real
-  kind = kind_phys
 [ldiag3d]
   standard_name = flag_for_diagnostics_3D
   long_name = flag for 3d diagnostic fields
@@ -10217,20 +10210,6 @@
   units = none
   dimensions = ()
   type = integer
-[cldtausw]
-  standard_name = RRTMGP_cloud_optical_depth_layers_at_0_55mu_band
-  long_name = approx .55mu band layer cloud optical depth
-  units = none
-  dimensions = (horizontal_loop_extent,vertical_layer_dimension)
-  type = real
-  kind = kind_phys
-[cldtaulw]
-  standard_name = RRTMGP_cloud_optical_depth_layers_at_10mu_band
-  long_name = approx 10mu band layer cloud optical depth
-  units = none
-  dimensions = (horizontal_loop_extent,vertical_layer_dimension)
-  type = real
-  kind = kind_phys
 [fluxlwUP_clrsky]
   standard_name = RRTMGP_lw_flux_profile_upward_clrsky
   long_name = RRTMGP upward longwave clr-sky flux profile