[Dart-dev] DART/branches Revision: 10869

[dart at ucar.edu]

hendric at ucar.edu
2017-01-04 16:02:20 -0700 (Wed, 04 Jan 2017)
131
Changes from todays code review.  I believe this is
ready to be commited to the rma_trunk.  One more
round of testing to be safe.




Modified: DART/branches/rma_fixed_filenames/adaptive_inflate/adaptive_inflate_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/adaptive_inflate/adaptive_inflate_mod.f90	2017-01-04 20:41:06 UTC (rev 10868)
+++ DART/branches/rma_fixed_filenames/adaptive_inflate/adaptive_inflate_mod.f90	2017-01-04 23:02:20 UTC (rev 10869)
@@ -54,7 +54,7 @@
 type adaptive_inflate_type
    private
    ! Flavor can be 0:none, 1:obs_inflate, 2:varying_ss_inflate, 3:single_ss_inflate
-   ! Depricating 1:obs_inflate, there is concerns how the observation space inflation
+   ! Deprecating 1:obs_inflate, there is concerns how the observation space inflation
    ! is happening. JPH.
    integer               :: inflation_flavor
    logical               :: output_restart = .false.
@@ -73,7 +73,7 @@
 end type adaptive_inflate_type
 
 ! Module storage for writing error messages
-character(len = 255) :: msgstring, msgstring2
+character(len=512) :: msgstring, msgstring2
 
 ! Flag indicating whether module has been initialized
 logical :: initialized = .false.

Modified: DART/branches/rma_fixed_filenames/assim_tools/assim_tools_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/assim_tools/assim_tools_mod.f90	2017-01-04 20:41:06 UTC (rev 10868)
+++ DART/branches/rma_fixed_filenames/assim_tools/assim_tools_mod.f90	2017-01-04 23:02:20 UTC (rev 10869)
@@ -150,6 +150,10 @@
 ! Option to distribute the mean.
 logical  :: distribute_mean  = .true.
 
+! Lanai bitwise. This is for unit testing and runs much slower.
+! Only use for when testing against the non-rma trunk.
+logical  :: lanai_bitwise = .false.
+
 namelist / assim_tools_nml / filter_kind, cutoff, sort_obs_inc, &
    spread_restoration, sampling_error_correction,                          & 
    adaptive_localization_threshold, adaptive_cutoff_floor,                 &
@@ -156,7 +160,7 @@
    print_every_nth_obs, rectangular_quadrature, gaussian_likelihood_tails, &
    output_localization_diagnostics, localization_diagnostics_file,         &
    special_localization_obs_types, special_localization_cutoffs,           &
-   allow_missing_in_clm, distribute_mean, close_obs_caching
+   allow_missing_in_clm, distribute_mean, close_obs_caching, lanai_bitwise
 
 !============================================================================
 
@@ -373,7 +377,6 @@
 logical :: local_obs_inflate
 
 ! HK observation location conversion
-logical  :: lanai_bitwise
 real(r8) :: vert_obs_loc_in_localization_coord
 
 !HK timing
@@ -381,9 +384,6 @@
 
 integer :: vstatus !< for vertical conversion status. Can we just smash the dart qc instead?
 
-!HK debug
-lanai_bitwise = .true.
-
 ! we are going to read/write the copies array
 call prepare_to_update_copies(ens_handle)
 call prepare_to_update_copies(obs_ens_handle)

Modified: DART/branches/rma_fixed_filenames/filter/filter.nml
===================================================================
--- DART/branches/rma_fixed_filenames/filter/filter.nml	2017-01-04 20:41:06 UTC (rev 10868)
+++ DART/branches/rma_fixed_filenames/filter/filter.nml	2017-01-04 23:02:20 UTC (rev 10869)
@@ -35,11 +35,7 @@
    inf_flavor                   = 0,                       0,
    inf_initial_from_restart     = .false.,                 .false.,
    inf_sd_initial_from_restart  = .false.,                 .false.,
-
    inf_deterministic            = .true.,                  .true.,
-
-
-
    inf_initial                  = 1.0,                     1.0,
    inf_sd_initial               = 0.0,                     0.0,
    inf_damping                  = 1.0,                     1.0,

Modified: DART/branches/rma_fixed_filenames/filter/filter_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/filter/filter_mod.f90	2017-01-04 20:41:06 UTC (rev 10868)
+++ DART/branches/rma_fixed_filenames/filter/filter_mod.f90	2017-01-04 23:02:20 UTC (rev 10869)
@@ -1604,7 +1604,7 @@
   if (sync) call task_sync()
 endif
 
-if (do_output()) call timestamp(' '//trim(msg), pos='brief')  ! was debug
+if (do_output()) call timestamp(' '//trim(msg), pos='brief')
 
 end subroutine timestamp_message
 
@@ -2171,6 +2171,8 @@
    my_stage = stages(i)
    call to_upper(my_stage)
    if (trim(my_stage) /= trim('NULL')) then
+      !>@todo store uppercase stages and check that we are not