[Dart-dev] DART/branches Revision: 11517

[dart at ucar.edu]

nancy at ucar.edu
2017-04-25 14:19:32 -0600 (Tue, 25 Apr 2017)
246
change the source code to use quantity (QTY) everywhere
it used to use KIND.  this means the keywords in the
input to this tool now use QTY and not KIND.

make the .nml file match the code - in particular make
the debug option default to false.




Modified: DART/branches/rma_trunk/assimilation_code/modules/utilities/obs_impact_mod.f90
===================================================================
--- DART/branches/rma_trunk/assimilation_code/modules/utilities/obs_impact_mod.f90	2017-04-25 20:17:13 UTC (rev 11516)
+++ DART/branches/rma_trunk/assimilation_code/modules/utilities/obs_impact_mod.f90	2017-04-25 20:19:32 UTC (rev 11517)
@@ -8,7 +8,7 @@
 !> table at runtime for use during the assimilation phase, to
 !> alter the impact of observations on the state vector.
 !>
-!> these routines build a table(ntypes, nkinds) which can be
+!> these routines build a table(ntypes, nqtys) which can be
 !> indexed quickly at runtime.  this happens in the assimilation
 !> loop so performance matters.
 
@@ -19,7 +19,7 @@
                            open_file, close_file, nc_check, get_next_filename, &
                            find_namelist_in_file, check_namelist_read,         &
                            do_nml_file, do_nml_term, nmlfileunit, to_upper
-use  obs_kind_mod        ! all kinds/types, so impossible to enumerate them here
+use  obs_kind_mod        ! all qtys/types, so impossible to enumerate them here
 use parse_args_mod, only : get_args_from_string
 
 implicit none
@@ -56,12 +56,12 @@
 
 ! table of contents entry types
 integer, parameter :: ENTRY_UNKNOWN  = 0
-integer, parameter :: ENTRY_DARTKIND = 1
+integer, parameter :: ENTRY_DARTQTY  = 1
 integer, parameter :: ENTRY_DARTTYPE = 2
 integer, parameter :: ENTRY_GROUP    = 3
 integer, parameter :: ENTRY_KEYWORD  = 4
 
-! predefined keywords, group names, and dart type/kind names
+! predefined keywords, group names, and dart type/qty names
 type type_entry
   character(len=string_length) :: ename
   integer :: etype
@@ -71,7 +71,7 @@
 type type_toc
    integer :: toc_count
    integer :: type_count
-   integer :: kind_count
+   integer :: qty_count
    type(type_entry), allocatable :: toc_entries(:)
 end type
 
@@ -101,7 +101,7 @@
 integer, parameter :: STATE_DEFNOTGROUP = 2
 integer, parameter :: STATE_DEFIMPACT = 3
 
-! are we processing ALL, ALLTYPES, or ALLKINDS
+! are we processing ALL, ALLTYPES, or ALLQTYS
 integer :: this_category
 
 ! define a comment character (#, %, !) which makes the rest
@@ -119,6 +119,7 @@
 ! namelist: input/output names, values, etc
 character(len=512) :: input_filename  = ''
 character(len=512) :: output_filename = ''
+logical :: allow_any_impact_value = .false.
 logical :: debug = .false.  ! .true. for more output
 
 ! namelist
@@ -125,6 +126,7 @@
 namelist /obs_impact_tool_nml/  &
    input_filename,  &
    output_filename, &
+   allow_any_impact_value, &
    debug
 
 contains
@@ -149,7 +151,7 @@
 ! set up space for the output table
 call allocate_impact_table(table)
 
-! read in types and kinds strings, compute sizes,
+! read in types and qty strings, compute sizes,
 ! allocate space for the toc and group types
 
 call init_strings_and_toc(toc, group_toc)
@@ -224,30 +226,30 @@
 !----------------------------------------------------------------------
 
 ! TOOL & RUNTIME:
-subroutine allocate_impact_table(table, ntypes, nkinds)
+subroutine allocate_impact_table(table, ntypes, nqtys)
 
 real(r8), allocatable, intent(out) :: table(:,:)
 integer, optional,     intent(out) :: ntypes
-integer, optional,     intent(out) :: nkinds
+integer, optional,     intent(out) :: nqtys
 
-integer :: kind_count, type_count
+integer :: qty_count, type_count
 
 ! initialization and setup
 !call initialize_module()
 
-! output table is dimensioned (numtypes, 0:numkinds)
+! output table is dimensioned (numtypes, 0:numqtys)
 ! space for results, and initial values