[Dart-dev] DART/branches Revision: 11461

[dart at ucar.edu]

thoar at ucar.edu
2017-04-12 18:43:51 -0600 (Wed, 12 Apr 2017)
257
This is the first in a long line of retroactive versions that Long wants to preserve.
He could not write to the repo, so I will be committing one after another and using his
notes as the commit messages.

This version is the one he started with (I think).




Modified: DART/branches/Tb/models/clm/model_mod.f90
===================================================================
--- DART/branches/Tb/models/clm/model_mod.f90	2017-04-12 20:38:17 UTC (rev 11460)
+++ DART/branches/Tb/models/clm/model_mod.f90	2017-04-13 00:43:51 UTC (rev 11461)
@@ -28,11 +28,11 @@
 use        types_mod, only : r4, r8, SECPERDAY, MISSING_R8,                    &
                              MISSING_I, MISSING_R4, rad2deg, deg2rad, PI,      &
                              obstypelength
-use time_manager_mod, only : time_type, set_time, get_time, set_date, get_date,&
+use time_manager_mod, only : set_time, get_time, set_date, get_date,           &
                              print_time, print_date, set_calendar_type,        &
-                             operator(*),  operator(+),  operator(-),          &
-                             operator(>),  operator(<),  operator(/),          &
-                             operator(/=), operator(<=), operator(==)
+                             operator(*),  operator(+), operator(-),           &
+                             operator(>),  operator(<), operator(/),           &
+                             operator(/=), operator(<=), time_type
 
 use     location_mod, only : location_type, get_dist, query_location,          &
                              get_close_maxdist_init, get_close_type,           &
@@ -48,8 +48,8 @@
                              E_ERR, E_WARN, E_MSG, logfileunit, get_unit,      &
                              nc_check, do_output, to_upper,                    &
                              find_namelist_in_file, check_namelist_read,       &
-                             file_exist, find_textfile_dims, file_to_text,     &
-                             open_file, close_file
+                             open_file, file_exist, find_textfile_dims,        &
+                             file_to_text
 
 use     obs_kind_mod, only : KIND_SOIL_TEMPERATURE,   &
                              KIND_SOIL_MOISTURE,      &
@@ -60,7 +60,6 @@
                              KIND_LEAF_CARBON,        &
                              KIND_WATER_TABLE_DEPTH,  &
                              KIND_GEOPOTENTIAL_HEIGHT,&
-                             KIND_TOTAL_WATER_STORAGE,&
                              KIND_BRIGHTNESS_TEMPERATURE, &
                              paramname_length,        &
                              get_raw_obs_kind_index
@@ -97,14 +96,15 @@
 ! generally useful routines for various support purposes.
 ! the interfaces here can be changed as appropriate.
 
-public :: clm_to_dart_state_vector,     &
+public :: get_gridsize,                 &
+          get_grid_arrays,              &
+          restart_file_to_sv,           &
           sv_to_restart_file,           &
           get_clm_restart_filename,     &
           get_state_time,               &
-          get_column_value,             &
           get_grid_vertval,             &
           compute_gridcell_value,       &
-          gridcell_components,          &
+          find_gridcell_Npft,           &
           DART_get_var,                 &
           get_model_time,               &
           get_ncols_in_gridcell,        &
@@ -142,25 +142,11 @@
 
 integer, parameter :: LAKE = 3
 
-! Codes for restricting the range of a variable
-integer, parameter :: BOUNDED_NONE  = 0 ! ... unlimited range
-integer, parameter :: BOUNDED_BELOW = 1 ! ... minimum, but no maximum
-integer, parameter :: BOUNDED_ABOVE = 2 ! ... maximum, but no minimum
-integer, parameter :: BOUNDED_BOTH  = 3 ! ... minimum and maximum
-
 integer :: nfields
 integer, parameter :: max_state_variables = 40
-integer, parameter :: num_state_table_columns = 6
+integer, parameter :: num_state_table_columns = 2
 character(len=obstypelength) :: variable_table(max_state_variables, num_state_table_columns)
 
-! Codes for interpreting the columns of the variable_table
-integer, parameter :: VT_VARNAMEINDX  = 1 ! ... variable name
-integer, parameter :: VT_KINDINDX     = 2 ! ... DART kind
-integer, parameter :: VT_MINVALINDX   = 3 ! ... minimum value if any
-integer, parameter :: VT_MAXVALINDX   = 4 ! ... maximum value if any
-integer, parameter :: VT_ORIGININDX   = 5 ! ... file of origin
-integer, parameter :: VT_STATEINDX    = 6 ! ... update (state) or not
-
 ! things which can/should be in the model_nml
 
 integer            :: assimilation_period_days = 0
@@ -171,20 +157,14 @@
 character(len=32)  :: calendar = 'Gregorian'
 character(len=256) :: clm_restart_filename = 'clm_restart.nc'
 character(len=256) :: clm_history_filename = 'clm_history.nc'
-character(len=256) :: clm_vector_history_filename = 'clm_vector_history.nc'
 character(len=256) :: casename = 'clm_dart'
-character(len=256) :: auxiliary_nc= '../rtm_auxiliary.nc'
-character(len=256) :: lai_nc = '../rtm_lai_modis.nc'
 
-character(len=obstypelength) :: clm_variables(max_state_variables*num_state_table_columns) = ' '
+character(len=obstypelength) :: clm_state_variables(max_state_variables*num_state_table_columns) = ' '
 
 namelist /model_nml/            &
    casename,                    &
-   auxiliary_nc,                & 
-   lai_nc,                      &