[Dart-dev] DART/branches Revision: 12925

[dart at ucar.edu]

thoar at ucar.edu
2018-11-08 11:04:59 -0700 (Thu, 08 Nov 2018)
261
Removed the vestiges of the progvar structure.
Removed some routines that were redundant given the use of the direct_netcdf_mod.f90 -
specifically the ones relating to replacing the CLM missing values with DART missing
and vice-versa. DART does that natively.




Modified: DART/branches/cesm_clm/models/clm/model_mod.f90
===================================================================
--- DART/branches/cesm_clm/models/clm/model_mod.f90	2018-11-01 22:25:47 UTC (rev 12924)
+++ DART/branches/cesm_clm/models/clm/model_mod.f90	2018-11-08 18:04:59 UTC (rev 12925)
@@ -59,7 +59,8 @@
                                  nc_check, nc_add_global_creation_time,        &
                                  nc_begin_define_mode, nc_end_define_mode,     &
                                  nc_open_file_readonly, nc_open_file_readwrite, &
-                                 nc_close_file, nc_add_attribute_to_variable
+                                 nc_close_file, nc_add_attribute_to_variable, &
+                                 nc_get_variable
 
 use     obs_kind_mod, only : QTY_SOIL_TEMPERATURE,       &
                              QTY_SOIL_MOISTURE,          &
@@ -100,7 +101,9 @@
                                   get_num_domains, get_num_variables, &
                                   get_num_dims, get_dim_name,         &
                                   get_dim_length, get_variable_name,  &
-                                  do_io_update, get_variable_size
+                                  do_io_update, get_variable_size,    &
+                                  get_model_variable_indices,         &
+                                  get_domain_size, get_varid_from_kind
 
 use obs_def_utilities_mod, only : track_status
 
@@ -151,7 +154,6 @@
           compute_gridcell_value,       &
           gridcell_components,          &
           DART_get_var,                 &
-          fill_missing_r8_with_orig,    &
           mark_missing_r8_values
 
 ! version controlled file description for error handling, do not edit
@@ -165,9 +167,9 @@
 logical, save :: module_initialized = .false.
 
 ! 'Handles' for the different domains.
-integer :: dom_restart        = -1
-integer :: dom_history        = -1
-integer :: dom_vector_history = -1
+integer :: dom_restart = -1
+integer :: dom_history = -1
+integer :: dom_vector  = -1
 
 !------------------------------------------------------------------
 !
@@ -210,7 +212,6 @@
 
 ! things which can/should be in the model_nml
 
-logical            :: allow_missing_clm = .true.
 integer            :: assimilation_period_days = 0
 integer            :: assimilation_period_seconds = 60
 integer            :: debug = 0   ! turn up for more and more debug messages
@@ -227,43 +228,10 @@
    clm_vector_history_filename, &
    assimilation_period_days,    &  ! for now, this is the timestep
    assimilation_period_seconds, &
-   allow_missing_clm,           &
    calendar,                    &
    debug,                       &
    clm_variables
 
-! Everything needed to describe a variable
-
-type progvartype
-   private
-   character(len=NF90_MAX_NAME) :: varname
-   character(len=NF90_MAX_NAME) :: long_name
-   character(len=NF90_MAX_NAME) :: units
-   character(len=obstypelength), dimension(NF90_MAX_VAR_DIMS) :: dimnames
-   integer, dimension(NF90_MAX_VAR_DIMS) :: dimlens
-   integer  :: numdims
-   integer  :: maxlevels
-   integer  :: xtype
-   integer(i8)  :: varsize     ! prod(dimlens(1:numdims))
-   integer(i8)  :: index1      ! location in dart state vector of first occurrence
-   integer(i8)  :: indexN      ! location in dart state vector of last  occurrence
-   integer  :: dart_qty
-   integer  :: rangeRestricted
-   real(r8) :: minvalue
-   real(r8) :: maxvalue
-   integer  :: spvalINT, missingINT
-   real(r4) :: spvalR4, missingR4
-   real(r8) :: spvalR8, missingR8
-   logical  :: has_fill_value      ! intended for future use
-   logical  :: has_missing_value   ! intended for future use
-   character(len=obstypelength) :: kind_string
-   character(len=512) :: origin    ! the file it came from
-   logical  :: update
-   integer  :: domain
-end type progvartype
-
-type(progvartype), dimension(max_state_variables) :: progvar
-
 !----------------------------------------------------------------------
 ! how many and which columns are in each gridcell
 !----------------------------------------------------------------------
@@ -350,7 +318,7 @@
 ! module storage
 !------------------------------------------------------------------