[Dart-dev] DART/branches Revision: 10775

[dart at ucar.edu]

hendric at ucar.edu
2016-11-22 16:10:53 -0700 (Tue, 22 Nov 2016)
109
Moving maximum number of domains to common/types_mod.f90 and
removing unused variables in affected modules.




Modified: DART/branches/rma_fixed_filenames/adaptive_inflate/adaptive_inflate_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/adaptive_inflate/adaptive_inflate_mod.f90	2016-11-22 23:09:13 UTC (rev 10774)
+++ DART/branches/rma_fixed_filenames/adaptive_inflate/adaptive_inflate_mod.f90	2016-11-22 23:10:53 UTC (rev 10775)
@@ -188,9 +188,6 @@
 logical,                     intent(in)    :: missing_ok
 character(len = *),          intent(in)    :: label
 
-character(len = 128) :: rsread, nmread
-integer  :: restart_unit, io
-
 ! Record the module version if this is first initialize call
 if(.not. initialized) then
    initialized = .true.

Modified: DART/branches/rma_fixed_filenames/common/types_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/common/types_mod.f90	2016-11-22 23:09:13 UTC (rev 10774)
+++ DART/branches/rma_fixed_filenames/common/types_mod.f90	2016-11-22 23:10:53 UTC (rev 10775)
@@ -21,6 +21,7 @@
 public :: t_kelvin, es_alpha, es_beta, es_gamma, gas_constant_v, gas_constant
 public :: L_over_Rv, ps0, earth_radius, gravity
 public :: metadatalength, obstypelength, varnamelength, vtablenamelength
+public :: MAX_NUM_DOMS
 
 ! version controlled file description for error handling, do not edit
 character(len=256), parameter :: source   = &
@@ -39,6 +40,8 @@
                                             ! use this for obs types/kinds
 integer, parameter :: vtablenamelength = 64 ! use this for the model_mod variable table items
                                            
+integer, parameter :: MAX_NUM_DOMS     = 10 ! max num domains. this is arbitrarily 
+                                            ! based on WRF's maximum number of domains
 
 !----------------------------------------------------------------------------
 ! Attributes for variable kinds -- declaring sizes explicitly means we know

Modified: DART/branches/rma_fixed_filenames/filter/filter_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/filter/filter_mod.f90	2016-11-22 23:09:13 UTC (rev 10774)
+++ DART/branches/rma_fixed_filenames/filter/filter_mod.f90	2016-11-22 23:10:53 UTC (rev 10775)
@@ -7,7 +7,7 @@
 module filter_mod
 
 !------------------------------------------------------------------------------
-use types_mod,             only : r8, i8, missing_r8, metadatalength
+use types_mod,             only : r8, i8, missing_r8, metadatalength, MAX_NUM_DOMS
 use obs_sequence_mod,      only : read_obs_seq, obs_type, obs_sequence_type,                  &
                                   get_obs_from_key, set_copy_meta_data, get_copy_meta_data,   &
                                   get_obs_def, get_time_range_keys, set_obs_values, set_obs,  &
@@ -105,16 +105,10 @@
 ! Defining whether diagnostics are for prior or posterior
 integer, parameter :: PRIOR_DIAG = 0, POSTERIOR_DIAG = 2
 
-! Maximum number of domains. This is arbitrarily set based on 
-! the maximum number of domains in WRF.  
-!>@todo put this is the types_mod or some 'common' place for parameters
-integer, parameter :: MAX_NUM_DOMS = 10
-
 !----------------------------------------------------------------
 ! Namelist input with default values
 !
 integer  :: async = 0, ens_size = 20
-logical  :: output_restart_mean = .false.
 integer  :: tasks_per_model_advance = 1
 ! if init_time_days and seconds are negative initial time is 0, 0
 ! for no restart or comes from restart if restart exists
@@ -180,7 +174,7 @@
    init_time_days, init_time_seconds, &
    first_obs_days, first_obs_seconds, last_obs_days, last_obs_seconds, &
    obs_window_days, obs_window_seconds, &
-   num_output_obs_members, output_restart_mean, &
+   num_output_obs_members, &
    output_interval, num_groups, trace_execution, &
    output_forward_op_errors, output_timestamps, &
    inf_flavor, inf_initial_from_restart, inf_sd_initial_from_restart, &
@@ -215,7 +209,7 @@
 integer,    allocatable :: keys(:)
 integer(i8)             :: model_size
 integer                 :: i, iunit, io, time_step_number, num_obs_in_set
-integer                 :: ierr, last_key_used, key_bounds(2)
+integer                 :: last_key_used, key_bounds(2)
 integer                 :: in_obs_copy, obs_val_index
 integer                 :: output_state_mean_index, output_state_spread_index
 integer                 :: prior_obs_mean_index, posterior_obs_mean_index
@@ -1876,9 +1870,6 @@
 type(file_info_type), intent(inout) :: file_info
 character(len=*),     intent(in)    :: stage_name
 
-integer :: ens_size
-integer :: num_extras
-
 call set_file_metadata(file_info, stage_name, ENS_MEAN_COPY,     'mean', 'ensemble mean')
 call set_file_metadata(file_info, stage_name, ENS_SD_COPY,       'sd', 'ensemble spread (standard deviation)')
 

Modified: DART/branches/rma_fixed_filenames/io/io_filenames_mod.f90
===================================================================
--- DART/branches/rma_fixed_filenames/io/io_filenames_mod.f90	2016-11-22 23:09:13 UTC (rev 10774)
+++ DART/branches/rma_fixed_filenames/io/io_filenames_mod.f90	2016-11-22 23:10:53 UTC (rev 10775)
@@ -39,7 +39,7 @@