[Dart-dev] [6914] DART/trunk: No functional code changes.
nancy at ucar.edu
nancy at ucar.edu
Wed Apr 23 10:50:32 MDT 2014
Revision: 6914
Author: nancy
Date: 2014-04-23 10:50:31 -0600 (Wed, 23 Apr 2014)
Log Message:
-----------
No functional code changes. Mostly remove unused
routine names on module "use" lines. This should
help make it clearer exactly which routines are really
being used by other modules. Also remove a couple
local variables which were being set but then never
referenced again. But mostly, "use" line maintenance.
Modified Paths:
--------------
DART/trunk/adaptive_inflate/adaptive_inflate_mod.f90
DART/trunk/assim_tools/assim_tools_mod.f90
DART/trunk/integrate_model/integrate_model.f90
DART/trunk/location/threed_sphere/location_mod.f90
DART/trunk/models/lorenz_96/model_mod.f90
DART/trunk/obs_def/DEFAULT_obs_def_mod.F90
DART/trunk/obs_def/obs_def_altimeter_mod.f90
DART/trunk/obs_def/obs_def_gps_mod.f90
DART/trunk/obs_kind/DEFAULT_obs_kind_mod.F90
DART/trunk/obs_model/obs_model_mod.f90
DART/trunk/obs_sequence/obs_sequence_mod.f90
DART/trunk/perfect_model_obs/perfect_model_obs.f90
DART/trunk/reg_factor/reg_factor_mod.f90
DART/trunk/smoother/smoother_mod.f90
DART/trunk/time_manager/schedule_mod.f90
-------------- next part --------------
Modified: DART/trunk/adaptive_inflate/adaptive_inflate_mod.f90
===================================================================
--- DART/trunk/adaptive_inflate/adaptive_inflate_mod.f90 2014-04-22 20:27:11 UTC (rev 6913)
+++ DART/trunk/adaptive_inflate/adaptive_inflate_mod.f90 2014-04-23 16:50:31 UTC (rev 6914)
@@ -9,7 +9,7 @@
! Operations and storage required for various adaptive inflation algorithms
use types_mod, only : r8, PI, missing_r8
-use time_manager_mod, only : time_type, get_time, set_time
+use time_manager_mod, only : time_type, get_time
use utilities_mod, only : register_module, open_file, close_file, &
error_handler, E_ERR, E_MSG
use random_seq_mod, only : random_seq_type, random_gaussian, init_random_seq
Modified: DART/trunk/assim_tools/assim_tools_mod.f90
===================================================================
--- DART/trunk/assim_tools/assim_tools_mod.f90 2014-04-22 20:27:11 UTC (rev 6913)
+++ DART/trunk/assim_tools/assim_tools_mod.f90 2014-04-23 16:50:31 UTC (rev 6914)
@@ -1440,7 +1440,7 @@
real(r8) :: obs_var_inv
real(r8) :: prior_mean, prior_cov_inv, new_cov, prior_cov
-real(r8) :: sx, s_x2
+real(r8) :: sx
real(r8) :: weight(ens_size), new_mean(ens_size)
real(r8) :: cum_weight, total_weight, cum_frac(ens_size)
real(r8) :: unif, norm, new_member(ens_size)
@@ -1452,7 +1452,6 @@
! Compute prior mean and covariance
sx = sum(ens)
-s_x2 = sum(ens * ens)
prior_mean = sx / ens_size
prior_cov = sum((ens - prior_mean)**2) / (ens_size - 1)
@@ -1787,7 +1786,6 @@
real(r8), intent(out) :: rel_weight(ens_size)
integer :: i, e_ind(ens_size), lowest_box, j
-real(r8) :: a
real(r8) :: sx, prior_mean, prior_var, prior_var_d2
real(r8) :: var_ratio, new_var, new_sd, umass, left_weight, right_weight
real(r8) :: mass(2*ens_size), weight(ens_size), cumul_mass(0:2*ens_size)
@@ -1796,7 +1794,6 @@
real(r8) :: x(1:2*ens_size - 1), sort_inc(ens_size)
! The factor a is not defined for this filter for now (could it be???)
-a = -1.0_r8
! The relative weights could be used for a multi-dimensional particle-type
! update using update_ens_from_weights. There are algorithmic challenges
Modified: DART/trunk/integrate_model/integrate_model.f90
===================================================================
--- DART/trunk/integrate_model/integrate_model.f90 2014-04-22 20:27:11 UTC (rev 6913)
+++ DART/trunk/integrate_model/integrate_model.f90 2014-04-23 16:50:31 UTC (rev 6914)
@@ -9,17 +9,16 @@
! Program to integrate assimilation model forward for asynchronous filter
! execution.
-use types_mod, only : r8
use time_manager_mod, only : time_type, operator(<), print_time
-use utilities_mod, only : initialize_utilities, register_module, &
- error_handler, E_MSG, E_ERR, timestamp, &
- nmlfileunit, do_output, do_nml_file, do_nml_term, &
+use utilities_mod, only : register_module, &
+ error_handler, E_MSG, nmlfileunit, &
+ do_nml_file, do_nml_term, &
find_namelist_in_file, check_namelist_read
use assim_model_mod, only : static_init_assim_model, get_model_size, &
open_restart_read, open_restart_write, close_restart, &
awrite_state_restart, aread_state_restart
use obs_model_mod, only : advance_state
-use ensemble_manager_mod, only : init_ensemble_manager, put_copy, ensemble_type, get_copy, &
+use ensemble_manager_mod, only : init_ensemble_manager, ensemble_type, &
prepare_to_write_to_vars
use mpi_utilities_mod, only : initialize_mpi_utilities, finalize_mpi_utilities, &
task_count, iam_task0
Modified: DART/trunk/location/threed_sphere/location_mod.f90
===================================================================
--- DART/trunk/location/threed_sphere/location_mod.f90 2014-04-22 20:27:11 UTC (rev 6913)
+++ DART/trunk/location/threed_sphere/location_mod.f90 2014-04-23 16:50:31 UTC (rev 6914)
@@ -103,9 +103,6 @@
! PAR For efficiency for small cases might want to fill tables as needed
real(r8) :: my_sin(-630:630), my_cos(-630:630), my_acos(-1000:1000)
-! If maxdist stays the same, don't need to do box distance calculations
-integer :: last_maxdist = -1.0
-
! Option for verification using exhaustive search
logical :: COMPARE_TO_CORRECT = .false. ! normally false
Modified: DART/trunk/models/lorenz_96/model_mod.f90
===================================================================
--- DART/trunk/models/lorenz_96/model_mod.f90 2014-04-22 20:27:11 UTC (rev 6913)
+++ DART/trunk/models/lorenz_96/model_mod.f90 2014-04-23 16:50:31 UTC (rev 6914)
@@ -13,11 +13,11 @@
get_close_maxdist_init, get_close_obs_init, &
get_close_obs
-use utilities_mod, only : register_module, error_handler, E_ERR, E_MSG, &
+use utilities_mod, only : register_module, do_nml_file, do_nml_term, &
nmlfileunit, find_namelist_in_file, &
- check_namelist_read, nc_check, do_output, &
- do_nml_file, do_nml_term
+ check_namelist_read, nc_check
+
implicit none
private
Modified: DART/trunk/obs_def/DEFAULT_obs_def_mod.F90
===================================================================
--- DART/trunk/obs_def/DEFAULT_obs_def_mod.F90 2014-04-22 20:27:11 UTC (rev 6913)
+++ DART/trunk/obs_def/DEFAULT_obs_def_mod.F90 2014-04-23 16:50:31 UTC (rev 6914)
@@ -45,16 +45,16 @@
! program is used to add in extra observation kinds at the indicated spots in
! the code.
-use types_mod, only : r8, missing_i, missing_r8, RAD2DEG
-use utilities_mod, only : register_module, error_handler, E_ERR, E_MSG, &
+use types_mod, only : r8, missing_i, missing_r8
+use utilities_mod, only : register_module, error_handler, E_ERR, &
ascii_file_format
use location_mod, only : location_type, read_location, write_location, &
interactive_location, set_location_missing
-use time_manager_mod, only : time_type, read_time, write_time, set_time, &
+use time_manager_mod, only : time_type, read_time, write_time, &
set_time_missing, interactive_time
use assim_model_mod, only : get_state_meta_data, interpolate
use obs_kind_mod, only : assimilate_this_obs_kind, evaluate_this_obs_kind, &
- max_obs_kinds, get_obs_kind_name, map_def_index, &
+ get_obs_kind_name, map_def_index, &
get_kind_from_menu
!----------------------------------------------------------------------
Modified: DART/trunk/obs_def/obs_def_altimeter_mod.f90
===================================================================
--- DART/trunk/obs_def/obs_def_altimeter_mod.f90 2014-04-22 20:27:11 UTC (rev 6913)
+++ DART/trunk/obs_def/obs_def_altimeter_mod.f90 2014-04-23 16:50:31 UTC (rev 6914)
@@ -43,10 +43,9 @@
! BEGIN DART PREPROCESS MODULE CODE
module obs_def_altimeter_mod
-use types_mod, only : r8, missing_r8, t_kelvin
-use utilities_mod, only : register_module, error_handler, E_ERR, E_MSG
-use location_mod, only : location_type, set_location, get_location , write_location, &
- read_location
+use types_mod, only : r8, missing_r8
+use utilities_mod, only : register_module
+use location_mod, only : location_type
use assim_model_mod, only : interpolate
use obs_kind_mod, only : KIND_SURFACE_PRESSURE, KIND_SURFACE_ELEVATION
Modified: DART/trunk/obs_def/obs_def_gps_mod.f90
===================================================================
--- DART/trunk/obs_def/obs_def_gps_mod.f90 2014-04-22 20:27:11 UTC (rev 6913)
+++ DART/trunk/obs_def/obs_def_gps_mod.f90 2014-04-23 16:50:31 UTC (rev 6914)
@@ -53,22 +53,17 @@
module obs_def_gps_mod
use types_mod, only : r8, missing_r8, RAD2DEG, DEG2RAD, PI
-use utilities_mod, only : register_module, error_handler, E_ERR, E_MSG, &
- file_exist, open_file, close_file, nmlfileunit, &
- check_namelist_read, find_namelist_in_file, &
- do_output, do_nml_file, do_nml_term, &
+use utilities_mod, only : register_module, error_handler, E_ERR, &
+ nmlfileunit, check_namelist_read, &
+ find_namelist_in_file, do_nml_file, do_nml_term, &
ascii_file_format
use location_mod, only : location_type, set_location, get_location, &
- write_location, read_location, vert_is_height, &
+ vert_is_height, &
VERTISHEIGHT
-use time_manager_mod, only : time_type, read_time, write_time, &
- set_time, set_time_missing, interactive_time
use assim_model_mod, only : interpolate
-use obs_kind_mod, only : KIND_U_WIND_COMPONENT, &
- KIND_V_WIND_COMPONENT, KIND_SURFACE_PRESSURE, &
- KIND_TEMPERATURE, KIND_SPECIFIC_HUMIDITY, &
- KIND_PRESSURE, KIND_GPSRO
+use obs_kind_mod, only : KIND_TEMPERATURE, KIND_SPECIFIC_HUMIDITY, &
+ KIND_PRESSURE
implicit none
private
Modified: DART/trunk/obs_kind/DEFAULT_obs_kind_mod.F90
===================================================================
--- DART/trunk/obs_kind/DEFAULT_obs_kind_mod.F90 2014-04-22 20:27:11 UTC (rev 6913)
+++ DART/trunk/obs_kind/DEFAULT_obs_kind_mod.F90 2014-04-23 16:50:31 UTC (rev 6914)
@@ -14,9 +14,8 @@
module obs_kind_mod
-use utilities_mod, only : register_module, error_handler, &
- E_ERR, E_MSG, E_WARN, &
- logfileunit, find_namelist_in_file, &
+use utilities_mod, only : register_module, error_handler, E_ERR, E_WARN, &
+ logfileunit, find_namelist_in_file, &
check_namelist_read, do_output, ascii_file_format
implicit none
Modified: DART/trunk/obs_model/obs_model_mod.f90
===================================================================
--- DART/trunk/obs_model/obs_model_mod.f90 2014-04-22 20:27:11 UTC (rev 6913)
+++ DART/trunk/obs_model/obs_model_mod.f90 2014-04-23 16:50:31 UTC (rev 6914)
@@ -6,27 +6,26 @@
module obs_model_mod
-use types_mod, only : r8
use utilities_mod, only : register_module, error_handler, &
E_ERR, E_MSG, E_WARN, &
- get_unit, file_exist, do_output, set_output
+ get_unit, file_exist, set_output
use assim_model_mod, only : aget_closest_state_time_to, get_model_time_step, &
open_restart_write, open_restart_read, &
awrite_state_restart, close_restart, adv_1step, &
aread_state_restart
-use obs_sequence_mod, only : obs_sequence_type, obs_type, get_obs_from_key, &
+use obs_sequence_mod, only : obs_sequence_type, obs_type, &
get_obs_def, init_obs, destroy_obs, get_num_copies, &
get_num_qc, get_first_obs, get_next_obs_from_key, &
get_obs_time_range
use obs_def_mod, only : obs_def_type, get_obs_def_time
-use time_manager_mod, only : time_type, set_time, get_time, print_time, &
- operator(/=), operator(>), operator(-), &
+use time_manager_mod, only : time_type, set_time, get_time, &
+ operator(/=), operator(>), operator(-), &
operator(/), operator(+), operator(<), operator(==), &
operator(<=), operator(>=)
-use ensemble_manager_mod, only : get_ensemble_time, ensemble_type, map_task_to_pe, map_pe_to_task, &
+use ensemble_manager_mod, only : get_ensemble_time, ensemble_type, map_task_to_pe, &
prepare_to_update_vars
-use mpi_utilities_mod, only : my_task_id, task_sync, task_count, block_task, &
- sum_across_tasks, shell_execute, send_to, receive_from, my_task_id
+use mpi_utilities_mod, only : my_task_id, task_sync, block_task, &
+ sum_across_tasks, shell_execute, my_task_id
implicit none
private
Modified: DART/trunk/obs_sequence/obs_sequence_mod.f90
===================================================================
--- DART/trunk/obs_sequence/obs_sequence_mod.f90 2014-04-22 20:27:11 UTC (rev 6913)
+++ DART/trunk/obs_sequence/obs_sequence_mod.f90 2014-04-23 16:50:31 UTC (rev 6914)
@@ -16,24 +16,20 @@
! copy subroutines. USERS MUST BE VERY CAREFUL TO NOT DO DEFAULT ASSIGNMENT
! FOR THESE TYPES THAT HAVE COPY SUBROUTINES.
-use types_mod, only : r8, DEG2RAD, MISSING_R8, metadatalength
-use location_mod, only : location_type, interactive_location, &
- is_location_in_region
+use types_mod, only : r8, MISSING_R8, metadatalength
+use location_mod, only : location_type, is_location_in_region
use obs_def_mod, only : obs_def_type, get_obs_def_time, read_obs_def, &
write_obs_def, destroy_obs_def, copy_obs_def, &
interactive_obs_def, get_obs_def_location, &
- get_expected_obs_from_def, get_obs_kind, &
- get_obs_def_key
+ get_expected_obs_from_def, get_obs_kind
use obs_kind_mod, only : write_obs_kind, read_obs_kind, max_obs_kinds, &
get_obs_kind_index
use time_manager_mod, only : time_type, operator(>), operator(<), &
operator(>=), operator(/=), set_time, &
operator(-), operator(+), operator(==)
-use utilities_mod, only : get_unit, close_file, &
- register_module, error_handler, &
- find_namelist_in_file, check_namelist_read, &
- E_ERR, E_WARN, E_MSG, nmlfileunit, do_output, &
- do_nml_file, do_nml_term
+use utilities_mod, only : get_unit, close_file, register_module, error_handler, &
+ find_namelist_in_file, check_namelist_read, &
+ E_ERR, E_MSG, nmlfileunit, do_nml_file, do_nml_term
implicit none
private
@@ -2062,7 +2058,7 @@
type(time_type), optional, intent(in) :: time1, time2
integer :: i, num_copies, num_qc, max_num_obs
-integer :: num_obs, num_keys, key_bounds(2)
+integer :: num_keys, key_bounds(2)
integer, pointer :: keylist(:)
type(obs_type) :: obs
type(time_type) :: first_time, last_time
@@ -2071,7 +2067,6 @@
! Get existing header info
num_copies = get_num_copies(oldseq)
num_qc = get_num_qc(oldseq)
-num_obs = get_num_obs(oldseq)
max_num_obs = get_max_num_obs(oldseq)
call init_obs(obs, num_copies, num_qc)
Modified: DART/trunk/perfect_model_obs/perfect_model_obs.f90
===================================================================
--- DART/trunk/perfect_model_obs/perfect_model_obs.f90 2014-04-22 20:27:11 UTC (rev 6913)
+++ DART/trunk/perfect_model_obs/perfect_model_obs.f90 2014-04-23 16:50:31 UTC (rev 6914)
@@ -22,10 +22,9 @@
write_obs_seq, get_num_obs, init_obs, assignment(=), &
static_init_obs_sequence, get_num_qc, read_obs_seq_header, &
set_qc_meta_data, get_expected_obs, delete_seq_head, &
- delete_seq_tail, set_obs_def, destroy_obs, destroy_obs_sequence
+ delete_seq_tail, destroy_obs, destroy_obs_sequence
-use obs_def_mod, only : obs_def_type, get_obs_def_error_variance, &
- set_obs_def_error_variance, get_obs_def_time
+use obs_def_mod, only : obs_def_type, get_obs_def_error_variance, get_obs_def_time
use obs_model_mod, only : move_ahead, advance_state, set_obs_model_trace
use assim_model_mod, only : static_init_assim_model, get_model_size, &
aget_initial_condition, netcdf_file_type, init_diag_output, &
Modified: DART/trunk/reg_factor/reg_factor_mod.f90
===================================================================
--- DART/trunk/reg_factor/reg_factor_mod.f90 2014-04-22 20:27:11 UTC (rev 6913)
+++ DART/trunk/reg_factor/reg_factor_mod.f90 2014-04-23 16:50:31 UTC (rev 6914)
@@ -8,10 +8,10 @@
use types_mod, only : r8
use utilities_mod, only : get_unit, open_file, register_module, error_handler, &
- E_ERR, E_MSG, nmlfileunit, find_namelist_in_file, &
+ E_ERR, nmlfileunit, find_namelist_in_file, &
check_namelist_read, do_nml_file, do_nml_term
-use time_manager_mod, only : time_type, write_time, get_time
+use time_manager_mod, only : time_type, get_time
implicit none
private
Modified: DART/trunk/smoother/smoother_mod.f90
===================================================================
--- DART/trunk/smoother/smoother_mod.f90 2014-04-22 20:27:11 UTC (rev 6913)
+++ DART/trunk/smoother/smoother_mod.f90 2014-04-23 16:50:31 UTC (rev 6914)
@@ -10,18 +10,16 @@
use types_mod, only : r8, metadatalength
use mpi_utilities_mod, only : my_task_id
-use utilities_mod, only : file_exist, get_unit, check_namelist_read, do_output, &
+use utilities_mod, only : file_exist, check_namelist_read, do_output, &
find_namelist_in_file, register_module, error_handler, &
E_ERR, E_MSG, nmlfileunit, logfileunit, timestamp, &
do_nml_file, do_nml_term
use ensemble_manager_mod, only : ensemble_type, init_ensemble_manager, read_ensemble_restart, &
write_ensemble_restart, all_vars_to_all_copies, &
- duplicate_ens, compute_copy_mean, compute_copy_mean_sd, &
+ duplicate_ens, compute_copy_mean_sd, &
all_copies_to_all_vars, get_copy, map_task_to_pe
use time_manager_mod, only : time_type, operator(==), print_time
-use assim_model_mod, only : static_init_assim_model, get_model_size, &
- netcdf_file_type, init_diag_output, finalize_diag_output, &
- aoutput_diagnostics
+use assim_model_mod, only : netcdf_file_type, init_diag_output, aoutput_diagnostics
use assim_tools_mod, only : filter_assim, get_missing_ok_status
use obs_sequence_mod, only : obs_sequence_type
use adaptive_inflate_mod, only : adaptive_inflate_type, adaptive_inflate_init, &
Modified: DART/trunk/time_manager/schedule_mod.f90
===================================================================
--- DART/trunk/time_manager/schedule_mod.f90 2014-04-22 20:27:11 UTC (rev 6913)
+++ DART/trunk/time_manager/schedule_mod.f90 2014-04-23 16:50:31 UTC (rev 6914)
@@ -8,16 +8,13 @@
use types_mod, only : missing_i, digits12
-use utilities_mod, only : error_handler, E_DBG, E_MSG, E_WARN, E_ERR, &
+use utilities_mod, only : error_handler, E_ERR, &
register_module, nmlfileunit, do_output, &
check_namelist_read, find_namelist_in_file, &
do_nml_file, do_nml_term
use time_manager_mod, only : time_type, set_calendar_type, get_calendar_type, &
- set_time, set_date, get_time, get_date, &
- print_time, print_date, &
- THIRTY_DAY_MONTHS, JULIAN, GREGORIAN, &
- NOLEAP, NO_CALENDAR, GREGORIAN_MARS, SOLAR_MARS, &
+ set_time, set_date, get_time, print_time, print_date, &
operator(*), operator(+), operator(-), &
operator(>), operator(<), operator(/), &
operator(/=), operator(<=)
More information about the Dart-dev
mailing list