[Dart-dev] DART/branches Revision: 11720

[dart at ucar.edu]

thoar at ucar.edu
2017-06-13 16:37:51 -0600 (Tue, 13 Jun 2017)
52
replaced  KIND_   with QTY_   ... that's about it.




Modified: DART/branches/coamps/models/coamps_nest/coamps_interp_mod.f90
===================================================================
--- DART/branches/coamps/models/coamps_nest/coamps_interp_mod.f90	2017-06-13 21:40:26 UTC (rev 11719)
+++ DART/branches/coamps/models/coamps_nest/coamps_interp_mod.f90	2017-06-13 22:37:51 UTC (rev 11720)
@@ -298,10 +298,10 @@
         call calculate_interp_weights(interpolator)
 
         select case (obs_kind)
-        case (KIND_SURFACE_PRESSURE)
+        case (QTY_SURFACE_PRESSURE)
           call calculate_surface_pressure(interpolator)
 
-        case (KIND_SURFACE_ELEVATION)
+        case (QTY_SURFACE_ELEVATION)
           call calculate_surface_heights(interpolator)
 
         case default
@@ -703,10 +703,10 @@
 
         ! Not all the observed variables must come from the state vector
         select case (obs_kind)
-          case (KIND_GEOPOTENTIAL_HEIGHT)
+          case (QTY_GEOPOTENTIAL_HEIGHT)
               call calculate_heights(interpolator, AVAILABLE_INDEX_TARGET,      &
                                      interpolator%target_values)
-          case (KIND_VERTLEVEL)
+          case (QTY_VERTLEVEL)
              interpolator%target_values  =                             &
                 spread(get_domain_msigma(interpolator%model_domain),   &
                        VALUES_DIM_NEIGHBOR, NUM_NEIGHBORS)
@@ -814,16 +814,16 @@
         allocate(mean_theta_values(NUM_NEIGHBORS, num_model_levels), stat=alloc_status)
         call check_alloc_status(alloc_status, routine, source, revision, revdate, 'mean_theta_values')
 
-        call get_matching_var_values(interpolator, KIND_EXNER_FUNCTION, IS_NOT_MEAN, &
+        call get_matching_var_values(interpolator, QTY_EXNER_FUNCTION, IS_NOT_MEAN, &
                                      IS_M_LEVEL, matching_values = exner_values)
 
-        call get_matching_var_values(interpolator, KIND_POTENTIAL_TEMPERATURE, IS_NOT_MEAN, &
+        call get_matching_var_values(interpolator, QTY_POTENTIAL_TEMPERATURE, IS_NOT_MEAN, &
                                      IS_M_LEVEL, matching_values = theta_values)
 
-        call get_matching_var_values(interpolator, KIND_EXNER_FUNCTION, IS_MEAN, &
+        call get_matching_var_values(interpolator, QTY_EXNER_FUNCTION, IS_MEAN, &
                                      IS_W_LEVEL, matching_values = mean_exner_values)
 
-        call get_matching_var_values(interpolator, KIND_POTENTIAL_TEMPERATURE, IS_MEAN, &
+        call get_matching_var_values(interpolator, QTY_POTENTIAL_TEMPERATURE, IS_MEAN, &
                                      IS_M_LEVEL, matching_values = mean_theta_values)
 
         call get_terrain_height_at_points(get_nest(interpolator%interp_point),                      &
@@ -1035,7 +1035,7 @@
         logical, parameter :: IS_MEAN_VARIABLE = .true.
         logical, parameter :: IS_ON_MASS_LEVEL = .true.
 
-        call get_matching_var_values(interpolator, KIND_POTENTIAL_TEMPERATURE,       &
+        call get_matching_var_values(interpolator, QTY_POTENTIAL_TEMPERATURE,       &
                                      IS_MEAN_VARIABLE, IS_ON_MASS_LEVEL,      &
                                      availability_index, mean_exner)
     end subroutine get_mean_theta_values
@@ -1051,7 +1051,7 @@
         logical, parameter :: IS_MEAN_VARIABLE = .true.
         logical, parameter :: IS_ON_MASS_LEVEL = .true.
 
-        call get_matching_var_values(interpolator, KIND_EXNER_FUNCTION,       &
+        call get_matching_var_values(interpolator, QTY_EXNER_FUNCTION,       &
                                      IS_MEAN_VARIABLE, IS_ON_MASS_LEVEL,      &
                                      availability_index, mean_exner)
     end subroutine get_mean_exner_values
@@ -1069,7 +1069,7 @@
         logical, parameter :: IS_NOT_MEAN_VARIABLE = .false.
         logical, parameter :: IS_ON_MASS_LEVEL     = .true.
 
-        call get_matching_var_values(interpolator, KIND_EXNER_FUNCTION,       &
+        call get_matching_var_values(interpolator, QTY_EXNER_FUNCTION,       &
                                      IS_NOT_MEAN_VARIABLE, IS_ON_MASS_LEVEL,  &
                                      availability_index, pert_exner)
     end subroutine get_pert_exner_values
@@ -1227,16 +1227,16 @@
 
         nest = get_nest(interpolator%interp_point)
 
-        if ( (var_kind .eq. KIND_U_WIND_COMPONENT)  .or. &
-             (var_kind .eq. KIND_V_WIND_COMPONENT)) then
+        if ( (var_kind .eq. QTY_U_WIND_COMPONENT)  .or. &
+             (var_kind .eq. QTY_V_WIND_COMPONENT)) then
                 var_field = var_values
         end if
 
         select case (var_kind)
-        case (KIND_U_WIND_COMPONENT)
+        case (QTY_U_WIND_COMPONENT)
             call utom(var_field, get_nest_i_width(nest),     &
                       get_nest_j_width(nest), NUM_VERT_LEVELS, .true.)
-        case (KIND_V_WIND_COMPONENT)
+        case (QTY_V_WIND_COMPONENT)
             call vtom(var_field, get_nest_i_width(nest),     &
                       get_nest_j_width(nest), NUM_VERT_LEVELS, .true.)
         case default
@@ -1333,7 +1333,7 @@
             ! Take care for U and V wind components.  If the variable is on a sigma level