[Dart-dev] DART/branches Revision: 10864

[dart at ucar.edu]

hendric at ucar.edu
2017-01-04 11:09:24 -0700 (Wed, 04 Jan 2017)
124
changes from yesterdays code review.  updated filter_mod.dopplerfold.f90 
to be current with the most recent file changes.




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-03 23:37:44 UTC (rev 10863)
+++ DART/branches/rma_fixed_filenames/adaptive_inflate/adaptive_inflate_mod.f90	2017-01-04 18:09:24 UTC (rev 10864)
@@ -56,7 +56,7 @@
    ! 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
    ! is happening. JPH.
-   integer               :: inflation_flavor, obs_diag_unit
+   integer               :: inflation_flavor
    logical               :: output_restart = .false.
    logical               :: deterministic
    real(r8)              :: inflate, sd, sd_lower_bound, inf_lower_bound, inf_upper_bound
@@ -220,9 +220,6 @@
 if (trim(label)=='Prior') inflate_handle%prior = .true.
 if (trim(label)=='Posterior') inflate_handle%posterior = .true.
 
-! Set obs_diag unit to -1 indicating it has not been opened yet
-inflate_handle%obs_diag_unit = -1
-
 ! Cannot support non-determistic inflation and an inf_lower_bound < 1
 if(.not. deterministic .and. inf_lower_bound < 1.0_r8) then
    write(msgstring, *) 'Cannot have non-deterministic inflation and inf_lower_bound < 1'

Modified: DART/branches/rma_fixed_filenames/common/types_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/common/types_mod.f90	2017-01-03 23:37:44 UTC (rev 10863)
+++ DART/branches/rma_fixed_filenames/common/types_mod.f90	2017-01-04 18:09:24 UTC (rev 10864)
@@ -76,6 +76,7 @@
 ! real precision:
 integer, parameter :: r4 = SELECTED_REAL_KIND(6,30)
 integer, parameter :: r8 = SELECTED_REAL_KIND(12)   ! real r8
+! integer, parameter :: r8 = r4                       ! alias r8 to r4
 
 ! complex precision:
 integer, parameter :: c4 = SELECTED_REAL_KIND(6,30)
@@ -83,7 +84,6 @@
 
 ! TO RUN WITH REDUCED PRECISION REALS (and use correspondingly less memory)
 ! comment OUT the r8 definition above and use this one:
-! integer, parameter :: r8 = r4                       ! alias r8 to r4
 
 
 ! 'digits12' is reserved for real variables that MUST retain 64 bits of

Modified: DART/branches/rma_fixed_filenames/ensemble_manager/ensemble_manager_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/ensemble_manager/ensemble_manager_mod.f90	2017-01-03 23:37:44 UTC (rev 10863)
+++ DART/branches/rma_fixed_filenames/ensemble_manager/ensemble_manager_mod.f90	2017-01-04 18:09:24 UTC (rev 10864)
@@ -115,6 +115,7 @@
 ! namelist with default values
 
 ! Complain if unneeded transposes are done
+!>@todo remove all things related to this
 ! logical  :: flag_unneeded_transposes = .false.
 ! Communication configuration:
 !  1 = usual default, 2 - 4 are valid and depend on the machine, ensemble count, and task count
@@ -126,7 +127,7 @@
 
 namelist / ensemble_manager_nml / communication_configuration, &
                                   layout, tasks_per_node,  &
-                                  debug!, flag_unneeded_transposes
+                                  debug
                                   
 !-----------------------------------------------------------------
 

Modified: DART/branches/rma_fixed_filenames/filter/filter.nml
===================================================================
--- DART/branches/rma_fixed_filenames/filter/filter.nml	2017-01-03 23:37:44 UTC (rev 10863)
+++ DART/branches/rma_fixed_filenames/filter/filter.nml	2017-01-04 18:09:24 UTC (rev 10864)
@@ -5,8 +5,8 @@
    output_restarts              = .false.,
    obs_sequence_in_name         = "obs_seq.out",
    obs_sequence_out_name        = "obs_seq.final",
-   input_restart_file_list      = ''
-   output_restart_file_list     = '',
+   input_restart_file_list      = 'null'
+   output_restart_file_list     = 'null',
    tasks_per_model_advance      = 1
    init_time_days               = 0,
    init_time_seconds            = 0,
@@ -18,8 +18,6 @@
    num_output_obs_members       = 0,
    output_interval              = 1,
    num_groups                   = 1,
-   obs_window_days              = 0
-   obs_window_seconds           = 0
    output_forward_op_errors     = .false.,
    output_mean                  = .false.,
    output_sd                    = .false.,
@@ -30,7 +28,7 @@
    single_file_in               = .false.,
    single_file_out              = .false.,
    write_all_stages_at_end      = .false. 
-   stages_to_write              = 3*'null','output'
+   stages_to_write              = 'null', 'null', 'null', 'output'
    perturb_from_single_instance = .false.,
    perturbation_amplitude       = 0.2,