[Dart-dev] DART/branches Revision: 11557

[dart at ucar.edu]

hendric at ucar.edu
2017-04-27 16:11:57 -0600 (Thu, 27 Apr 2017)
115
Changing the model interfaces for CLM.  Using the new build script
from Nancy.  Compiles but still needs testing.




Modified: DART/branches/model_mod_changes/models/clm/model_mod.f90
===================================================================
--- DART/branches/model_mod_changes/models/clm/model_mod.f90	2017-04-27 22:09:56 UTC (rev 11556)
+++ DART/branches/model_mod_changes/models/clm/model_mod.f90	2017-04-27 22:11:57 UTC (rev 11557)
@@ -25,26 +25,19 @@
 ! 8 crop (if using crop model)
 
 ! Modules that are absolutely required for use are listed
-use        types_mod, only : r4, r8, SECPERDAY, MISSING_R8,                    &
-                             MISSING_I, MISSING_R4, rad2deg, deg2rad, PI,      &
+use        types_mod, only : r4, r8, MISSING_R8, MISSING_I, MISSING_R4, &
                              obstypelength, i8
 
-use time_manager_mod, only : time_type, set_time, get_time, set_date, get_date,&
+use time_manager_mod, only : time_type, set_time, get_time, set_date,          &
                              print_time, print_date, set_calendar_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,           &
-                             set_location, get_location, horiz_dist_only,      &
-                             vert_is_undef,    VERTISUNDEF,                    &
-                             vert_is_surface,  VERTISSURFACE,                  &
-                             vert_is_level,    VERTISLEVEL,                    &
-                             vert_is_pressure, VERTISPRESSURE,                 &
-                             vert_is_height,   VERTISHEIGHT,                   &
-                             get_close_obs_init, LocationDims,                 &
-                             loc_get_close_obs => get_close_obs
+use     location_mod, only : location_type, set_location, get_location,       &
+                             VERTISHEIGHT, LocationDims, get_close_obs,       &
+                             get_close_state, convert_vertical_obs,           &
+                             convert_vertical_state
 
 use    utilities_mod, only : register_module, error_handler,                   &
                              E_ERR, E_WARN, E_MSG, logfileunit, get_unit,      &
@@ -54,6 +47,9 @@
                              open_file, close_file, do_nml_file, do_nml_term,  &
                              nmlfileunit
 
+use netcdf_utilities_mod, only : nc_add_global_attribute, nc_sync, &
+                                 nc_add_global_creation_time, nc_redef, nc_enddef
+
 use     obs_kind_mod, only : QTY_SOIL_TEMPERATURE,       &
                              QTY_SOIL_MOISTURE,          &
                              QTY_LIQUID_WATER,           &
@@ -89,6 +85,8 @@
 !> @todo FIXME write a write_model_time for CLM
 use dart_time_io_mod,      only : write_model_time
 
+use default_model_mod,     only : adv_1step, init_time, init_conditions, nc_write_model_vars
+
 use typesizes
 use netcdf
 
@@ -101,7 +99,6 @@
           adv_1step,              &
           get_state_meta_data,    &
           model_interpolate,      &
-          get_model_time_step,    &
           static_init_model,      &
           end_model,              &
           init_time,              &
@@ -109,20 +106,18 @@
           nc_write_model_atts,    &
           nc_write_model_vars,    &
           pert_model_copies,      &
-          get_close_maxdist_init, &
-          get_close_obs_init,     &
           get_close_obs, &
+          get_close_state, &
           write_model_time, &
           read_model_time, &
-          query_vert_localization_coord, &
-          vert_convert
+          shortest_time_between_assimilations, &
+          convert_vertical_obs, &
+          convert_vertical_state
 
 ! generally useful routines for various support purposes.
 ! the interfaces here can be changed as appropriate.
 
 public :: get_gridsize,                 &
-          clm_to_dart_state_vector,     &
-          sv_to_restart_file,           &
           get_clm_restart_filename,     &
           get_grid_vertval,             &
           compute_gridcell_value,       &
@@ -378,39 +373,13 @@
 
 
 
-subroutine adv_1step(x, time)
+subroutine get_state_meta_data(indx, location, var_type)
 !------------------------------------------------------------------
-! CLM is never advanced by DART.
-! If we get here, something is wrong and we should stop right away.
-
-real(r8),        intent(inout) :: x(:)
-type(time_type), intent(in)    :: time