[Dart-dev] DART/branches Revision: 11460

[dart at ucar.edu]

thoar at ucar.edu
2017-04-12 14:38:17 -0600 (Wed, 12 Apr 2017)
246
This is exactly what the UT Austin folks have as of 10 April 2017.
If we commit this, they can 'update' without a zillion conflicts.

I have backup copies of the newer code which will be in the next 
commit. Hopefully this will be less painful.




Modified: DART/branches/Tb/assim_model/assim_model_mod.f90
===================================================================
--- DART/branches/Tb/assim_model/assim_model_mod.f90	2017-04-12 20:18:05 UTC (rev 11459)
+++ DART/branches/Tb/assim_model/assim_model_mod.f90	2017-04-12 20:38:17 UTC (rev 11460)
@@ -9,26 +9,29 @@
 ! This module is used to wrap around the basic portions of existing dynamical models to
 ! add capabilities needed by the standard assimilation methods.
 
-use    types_mod, only : r8, digits12
-use location_mod, only : location_type, read_location, LocationDims
+use        types_mod, only : r8, digits12
+
+use     location_mod, only : location_type, read_location, LocationDims
+
 use time_manager_mod, only : time_type, get_time, read_time, write_time,           &
                              THIRTY_DAY_MONTHS, JULIAN, GREGORIAN, NOLEAP,         &
                              operator(<), operator(>), operator(+), operator(-),   &
                              operator(/), operator(*), operator(==), operator(/=), &
                              get_calendar_type
-use utilities_mod, only : get_unit, close_file, register_module, error_handler,    &
-                          E_ERR, E_WARN, E_MSG, E_DBG, nmlfileunit,                &
-                          dump_unit_attributes, find_namelist_in_file,             &
-                          check_namelist_read, nc_check, do_nml_file, do_nml_term, &
-                          find_textfile_dims, file_to_text, set_output,            &
-                          ascii_file_format, set_output, file_exist, open_file, close_file
-use     model_mod, only : get_model_size, static_init_model, get_state_meta_data,  &
-                          get_model_time_step, model_interpolate, init_conditions, &
-                          init_time, adv_1step, end_model, nc_write_model_atts,    &
-                          nc_write_model_vars, pert_model_state,                   &
-                          get_close_maxdist_init, get_close_obs_init,              &
-                          get_close_obs, ens_mean_for_model
 
+use    utilities_mod, only : get_unit, close_file, register_module, error_handler,    &
+                             E_ERR, E_WARN, E_MSG, E_DBG, nmlfileunit,                &
+                             dump_unit_attributes, find_namelist_in_file,             &
+                             check_namelist_read, nc_check, do_nml_file, do_nml_term, &
+                             find_textfile_dims, file_to_text, set_output,            &
+                             ascii_file_format, set_output
+use        model_mod, only : get_model_size, static_init_model, get_state_meta_data,  &
+                             get_model_time_step, model_interpolate, init_conditions, &
+                             init_time, adv_1step, end_model, nc_write_model_atts,    &
+                             nc_write_model_vars, pert_model_state,                   &
+                             get_close_maxdist_init, get_close_obs_init,              &
+                             get_close_obs, ens_mean_for_model
+
 implicit none
 private
 
@@ -85,14 +88,14 @@
 logical :: module_initialized = .false.
 
 ! Global storage for default restart formats
-character(len=16) :: read_format = "unformatted", write_format = "unformatted"
+character(len = 16) :: read_format = "unformatted", write_format = "unformatted"
 
 ! Global storage for error string output
-character(len=512)  :: msgstring
+character(len = 129)  :: msgstring
 
 !-------------------------------------------------------------
 ! Namelist with default values
-! write_binary_restart_files  == .true.  -> use unformatted file format.
+! write_binary_restart_files  == .true.  -> use unformatted file format. 
 !                                     Full precision, faster, smaller,
 !                                     but not as portable.
 
@@ -113,7 +116,7 @@
 !
 ! Allocates storage for an instance of an assim_model_type. With this
 ! implementation, need to be VERY careful about assigment and maintaining
-! permanent storage locations. Need to revisit the best way to do
+! permanent storage locations. Need to revisit the best way to do 
 ! assim_model_copy below.
 
 implicit none
@@ -136,7 +139,7 @@
 ! subroutine static_init_assim_model()
 !
 ! Initializes class data for the assim_model. Also calls the static
-! initialization for the underlying model. So far, this simply
+! initialization for the underlying model. So far, this simply 
 ! is initializing the position of the state variables as location types.
 
 implicit none
@@ -146,7 +149,7 @@
 ! only execute this code once, even if called multiple times.
 if (module_initialized) return
 
-! First thing to do is echo info to logfile ...
+! First thing to do is echo info to logfile ... 
 call register_module(source, revision, revdate)
 module_initialized = .true.
 
@@ -155,7 +158,7 @@
 read(iunit, nml = assim_model_nml, iostat = io)
 call check_namelist_read(iunit, io, "assim_model_nml")
 
-! Record the namelist values used for the run ...
+! Record the namelist values used for the run ... 
 if (do_nml_file()) write(nmlfileunit, nml=assim_model_nml)
 if (do_nml_term()) write(     *     , nml=assim_model_nml)