[Dart-dev] DART/branches Revision: 12744

[dart at ucar.edu]

thoar at ucar.edu
2018-07-12 16:44:02 -0600 (Thu, 12 Jul 2018)
56
Importing changes from the git version of this branch.




Modified: DART/branches/rma_wrfHydro/assimilation_code/modules/assimilation/assim_model_mod.f90
===================================================================
--- DART/branches/rma_wrfHydro/assimilation_code/modules/assimilation/assim_model_mod.f90	2018-07-12 20:29:10 UTC (rev 12743)
+++ DART/branches/rma_wrfHydro/assimilation_code/modules/assimilation/assim_model_mod.f90	2018-07-12 22:44:02 UTC (rev 12744)
@@ -53,15 +53,11 @@
           write_model_time
 
 ! version controlled file description for error handling, do not edit
-character(len=256), parameter :: source   = &
+character(len=*), parameter :: source   = &
    "$URL$"
-character(len=32 ), parameter :: revision = "$Revision$"
-character(len=128), parameter :: revdate  = "$Date$"
+character(len=*), parameter :: revision = "$Revision$"
+character(len=*), parameter :: revdate  = "$Date$"
 
-
-! Permanent class storage for model_size
-integer :: model_size
-
 ! Ensure init code is called exactly once
 logical :: module_initialized = .false.
 

Modified: DART/branches/rma_wrfHydro/assimilation_code/modules/assimilation/assim_tools_mod.pf.f90
===================================================================
--- DART/branches/rma_wrfHydro/assimilation_code/modules/assimilation/assim_tools_mod.pf.f90	2018-07-12 20:29:10 UTC (rev 12743)
+++ DART/branches/rma_wrfHydro/assimilation_code/modules/assimilation/assim_tools_mod.pf.f90	2018-07-12 22:44:02 UTC (rev 12744)
@@ -8,7 +8,7 @@
 module assim_tools_mod
 
 !> \defgroup assim_tools assim_tools_mod
-!> 
+!>
 !> @{
 use      types_mod,       only : r8, i8, digits12, PI, missing_r8
 
@@ -18,7 +18,7 @@
                                  find_namelist_in_file, register_module, error_handler,   &
                                  E_ERR, E_MSG, nmlfileunit, do_nml_file, do_nml_term,     &
                                  open_file, close_file, timestamp
-use       sort_mod,       only : index_sort 
+use       sort_mod,       only : index_sort
 use random_seq_mod,       only : random_seq_type, random_gaussian, init_random_seq,       &
                                  random_uniform
 
@@ -25,7 +25,7 @@
 use obs_sequence_mod,     only : obs_sequence_type, obs_type, get_num_copies, get_num_qc, &
                                  init_obs, get_obs_from_key, get_obs_def, get_obs_values, &
                                  destroy_obs
-   
+
 use          obs_def_mod, only : obs_def_type, get_obs_def_location, get_obs_def_time,    &
                                  get_obs_def_error_variance, get_obs_def_type_of_obs
 
@@ -48,11 +48,11 @@
                                  get_vertical_localization_coord, get_close_destroy,      &
                                  set_vertical_localization_coord
 
-use ensemble_manager_mod, only : ensemble_type, get_my_num_vars, get_my_vars,             & 
+use ensemble_manager_mod, only : ensemble_type, get_my_num_vars, get_my_vars,             &
                                  compute_copy_mean_var, get_var_owner_index,              &
                                  prepare_to_update_copies, map_pe_to_task
 
-use mpi_utilities_mod,    only : my_task_id, broadcast_send, broadcast_recv,              & 
+use mpi_utilities_mod,    only : my_task_id, broadcast_send, broadcast_recv,              &
                                  sum_across_tasks, task_count, start_mpi_timer,           &
                                  read_mpi_timer
 
@@ -107,7 +107,7 @@
 real(r8), allocatable  :: exp_true_correl(:), alpha(:)
 
 ! if adjust_obs_impact is true, read in triplets from the ascii file
-! and fill this 2d impact table. 
+! and fill this 2d impact table.
 real(r8), allocatable  :: obs_impact_table(:,:)
 
 ! version controlled file description for error handling, do not edit
@@ -179,13 +179,13 @@
 ! "convert_obs" is true by default; in general it seems to
 ! be better for each task to convert the obs vertical before
 ! going into the loop but again this depends on how many
-! obs per task and whether the mean is distributed or 
+! obs per task and whether the mean is distributed or
 ! replicated on each task.
 logical :: convert_all_state_verticals_first = .false.
 logical :: convert_all_obs_verticals_first   = .true.
 
 ! Not in the namelist; this var disables the experimental
-! linear and spherical case code in the adaptive localization 
+! linear and spherical case code in the adaptive localization
 ! sections.  to try out the alternatives, set this to .false.
 logical  :: only_area_adapt  = .true.
 
@@ -199,7 +199,7 @@
 
 ! JPOTERJOY: new namelist variables
 namelist / assim_tools_nml / filter_kind, cutoff, sort_obs_inc, &
-   spread_restoration, sampling_error_correction,                          & 
+   spread_restoration, sampling_error_correction,                          &
    adaptive_localization_threshold, adaptive_cutoff_floor,                 &