[Dart-dev] DART/branches Revision: 11469

[dart at ucar.edu]

thoar at ucar.edu
2017-04-12 19:02:56 -0600 (Wed, 12 Apr 2017)
96
This was simply called model_mod.f90.beforerewrite111714
which I think means it was 2014-11-17




Modified: DART/branches/Tb/models/clm/model_mod.f90
===================================================================
--- DART/branches/Tb/models/clm/model_mod.f90	2017-04-13 00:58:49 UTC (rev 11468)
+++ DART/branches/Tb/models/clm/model_mod.f90	2017-04-13 01:02:56 UTC (rev 11469)
@@ -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 : set_time, get_time, set_date, get_date,           &
+use time_manager_mod, only : time_type, set_time, get_time, set_date, get_date,&
                              print_time, print_date, set_calendar_type,        &
-                             operator(*),  operator(+), operator(-),           &
-                             operator(>),  operator(<), operator(/),           &
-                             operator(/=), operator(<=), time_type
+                             operator(*),  operator(+),  operator(-),          &
+                             operator(>),  operator(<),  operator(/),          &
+                             operator(/=), operator(<=), operator(==)
 
 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,       &
-                             open_file, file_exist, find_textfile_dims,        &
-                             file_to_text
+                             file_exist, find_textfile_dims, file_to_text,     &
+                             open_file, close_file
 
 use     obs_kind_mod, only : KIND_SOIL_TEMPERATURE,   &
                              KIND_SOIL_MOISTURE,      &
@@ -62,8 +62,7 @@
                              KIND_GEOPOTENTIAL_HEIGHT,&
                              KIND_BRIGHTNESS_TEMPERATURE, &
                              paramname_length,        &
-                             get_raw_obs_kind_index,  &
-                             KIND_CANOPY_TEMPERATURE
+                             get_raw_obs_kind_index
 
 use mpi_utilities_mod, only: my_task_id
 
@@ -97,15 +96,13 @@
 ! generally useful routines for various support purposes.
 ! the interfaces here can be changed as appropriate.
 
-public :: get_gridsize,                 &
-          get_grid_arrays,              &
-          restart_file_to_sv,           &
+public :: clm_to_dart_state_vector,     &
           sv_to_restart_file,           &
           get_clm_restart_filename,     &
           get_state_time,               &
           get_grid_vertval,             &
           compute_gridcell_value,       &
-          find_gridcell_Npft,           &
+          gridcell_components,          &
           DART_get_var,                 &
           get_model_time,               &
           get_ncols_in_gridcell,        &
@@ -143,11 +140,25 @@
 
 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 = 2
+integer, parameter :: num_state_table_columns = 6
 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
@@ -158,11 +169,12 @@
 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) :: surfpara_nc= 'Yangpara_0.9x1.25_c140822.nc'
 character(len=256) :: lai_nc = 'LAI_GLASS.nc'
 
-character(len=obstypelength) :: clm_state_variables(max_state_variables*num_state_table_columns) = ' '
+character(len=obstypelength) :: clm_variables(max_state_variables*num_state_table_columns) = ' '
 
 namelist /model_nml/            &
    casename,                    &
@@ -170,6 +182,7 @@