From aa03af1b3af0ef8cea2e3738261ad53258e2e737 Mon Sep 17 00:00:00 2001
From: Helen Kershaw <hkershaw@ucar.edu>
Date: Mon, 2 Oct 2023 12:59:41 -0400
Subject: [PATCH] replace kind with qty

kind is outdated terminolgy for quantity
https://github.com/NCAR/DART/pull/545#issuecomment-1743365998
---
 .../assimilation/algorithm_info_mod.f90       | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/assimilation_code/modules/assimilation/algorithm_info_mod.f90 b/assimilation_code/modules/assimilation/algorithm_info_mod.f90
index d235c289b4..766ec4d6f8 100644
--- a/assimilation_code/modules/assimilation/algorithm_info_mod.f90
+++ b/assimilation_code/modules/assimilation/algorithm_info_mod.f90
@@ -199,21 +199,21 @@ subroutine obs_error_info(obs_def, error_variance, &
 logical,            intent(out) :: bounded_below, bounded_above
 real(r8),           intent(out) :: lower_bound, upper_bound
 
-integer     :: obs_type, obs_kind
+integer     :: obs_type, obs_qty
 integer(i8) :: state_var_index
 type(location_type) :: temp_loc
 
 integer :: QTY_loc(1)
-character(len=129) :: kind_name
+character(len=129) :: qty_name
 
 ! Get the kind of the observation
 obs_type = get_obs_def_type_of_obs(obs_def)
 ! If it is negative, it is an identity obs
 if(obs_type < 0) then
    state_var_index = -1 * obs_type
-   call get_state_meta_data(state_var_index, temp_loc, obs_kind)
+   call get_state_meta_data(state_var_index, temp_loc, obs_qty)
 else
-   obs_kind = get_quantity_for_type_of_obs(obs_type)
+   obs_qty = get_quantity_for_type_of_obs(obs_type)
 endif
 
 ! Get the default error variance
@@ -227,10 +227,10 @@ subroutine obs_error_info(obs_def, error_variance, &
 endif
 
 !get actual name of QTY from integer index
-kind_name = get_name_for_quantity(obs_kind)
+qty_name = get_name_for_quantity(obs_qty)
 
 !find location of QTY in qcf_table_data structure
-QTY_loc = findloc(qcf_table_row_headers, kind_name)
+QTY_loc = findloc(qcf_table_row_headers, qty_name)
 
 if (QTY_loc(1) == 0) then
    !use default values if QTY is not in table
@@ -264,7 +264,7 @@ subroutine probit_dist_info(kind, is_state, is_inflation, dist_type, &
 real(r8), intent(out) :: lower_bound,   upper_bound
 
 integer :: QTY_loc(1)
-character(len=129) :: kind_name
+character(len=129) :: qty_name
 
 integer :: dist_type_loc(1)
 character(len=129), dimension(7) :: possible_dist_types
@@ -316,10 +316,10 @@ subroutine probit_dist_info(kind, is_state, is_inflation, dist_type, &
 endif
 
 !get actual name of QTY from integer index
-kind_name = get_name_for_quantity(kind)
+qty_name = get_name_for_quantity(kind)
 
 !find location of QTY in qcf_table_data structure
-QTY_loc = findloc(qcf_table_row_headers, kind_name)
+QTY_loc = findloc(qcf_table_row_headers, qty_name)
 
 if (QTY_loc(1) == 0) then
    !use default values if QTY is not in table
@@ -397,10 +397,10 @@ end subroutine probit_dist_info
 !------------------------------------------------------------------------
 
 
-subroutine obs_inc_info(obs_kind, filter_kind, rectangular_quadrature, gaussian_likelihood_tails, &
+subroutine obs_inc_info(obs_qty, filter_kind, rectangular_quadrature, gaussian_likelihood_tails, &
    sort_obs_inc, spread_restoration, bounded_below, bounded_above, lower_bound, upper_bound)
 
-integer,  intent(in)  :: obs_kind
+integer,  intent(in)  :: obs_qty
 integer,  intent(inout) :: filter_kind
 logical,  intent(inout) :: rectangular_quadrature, gaussian_likelihood_tails
 logical,  intent(inout) :: sort_obs_inc
@@ -409,7 +409,7 @@ subroutine obs_inc_info(obs_kind, filter_kind, rectangular_quadrature, gaussian_
 real(r8), intent(inout) :: lower_bound,  upper_bound
 
 integer :: QTY_loc(1)
-character(len=129) :: kind_name
+character(len=129) :: qty_name
 
 integer :: filter_kind_loc(1)
 character(len=129), dimension(5) :: possible_filter_kinds
@@ -446,10 +446,10 @@ subroutine obs_inc_info(obs_kind, filter_kind, rectangular_quadrature, gaussian_
 endif
 
 !get actual name of QTY from integer index
-kind_name = get_name_for_quantity(obs_kind)
+qty_name = get_name_for_quantity(obs_qty)
 
 !find location of QTY in qcf_table_data structure
-QTY_loc = findloc(qcf_table_row_headers, kind_name)
+QTY_loc = findloc(qcf_table_row_headers, qty_name)
 
 if (QTY_loc(1) == 0) then
    !use default values if QTY is not in table