[Dart-dev] DART/branches Revision: 11810

[dart at ucar.edu]

thoar at ucar.edu
2017-07-12 15:09:32 -0600 (Wed, 12 Jul 2017)
97
Getting a clean copy for a merge ... these commits are untested and could/should be blown away.




Modified: DART/branches/coamps/assimilation_code/location/threed_sphere/location_mod.f90
===================================================================
--- DART/branches/coamps/assimilation_code/location/threed_sphere/location_mod.f90	2017-07-12 20:39:54 UTC (rev 11809)
+++ DART/branches/coamps/assimilation_code/location/threed_sphere/location_mod.f90	2017-07-12 21:09:32 UTC (rev 11810)
@@ -1396,7 +1396,7 @@
 type(get_close_type),          intent(in)  :: gc
 type(location_type),           intent(inout) :: base_loc, locs(:)
 integer,                       intent(in)  :: base_type, loc_qtys(:), loc_types(:)
-integer,                       intent(out) :: num_close, close_ind(:)
+integer(i8),                   intent(out) :: num_close, close_ind(:)
 real(r8),            optional, intent(out) :: dist(:)
 type(ensemble_type), optional, intent(in)  :: ens_handle
 
@@ -1418,7 +1418,7 @@
 type(location_type),           intent(inout)  :: base_loc, locs(:)
 integer,                       intent(in)  :: base_type, loc_qtys(:)
 integer(i8),                   intent(in)  :: loc_indx(:)
-integer,                       intent(out) :: num_close, close_ind(:)
+integer(i8),                   intent(out) :: num_close, close_ind(:)
 real(r8),            optional, intent(out) :: dist(:)
 type(ensemble_type), optional, intent(in)  :: ens_handle
 
@@ -1439,7 +1439,7 @@
 type(get_close_type),          intent(in)  :: gc
 type(location_type),           intent(inout)  :: base_loc, locs(:)
 integer,                       intent(in)  :: base_type, loc_qtys(:)
-integer,                       intent(out) :: num_close, close_ind(:)
+integer(i8),                   intent(out) :: num_close, close_ind(:)
 real(r8),            optional, intent(out) :: dist(:)
 type(ensemble_type), optional, intent(in)  :: ens_handle
 

Modified: DART/branches/coamps/assimilation_code/modules/assimilation/assim_tools_mod.f90
===================================================================
--- DART/branches/coamps/assimilation_code/modules/assimilation/assim_tools_mod.f90	2017-07-12 20:39:54 UTC (rev 11809)
+++ DART/branches/coamps/assimilation_code/modules/assimilation/assim_tools_mod.f90	2017-07-12 21:09:32 UTC (rev 11810)
@@ -10,7 +10,7 @@
 !> \defgroup assim_tools assim_tools_mod
 !> 
 !> @{
-use      types_mod,       only : r8, i8, digits12, PI, missing_r8
+use      types_mod,       only : r8, i8, i4, digits12, PI, missing_r8
 use  utilities_mod,       only : file_exist, get_unit, check_namelist_read, do_output,    &
                                  find_namelist_in_file, register_module, error_handler,   &
                                  E_ERR, E_MSG, nmlfileunit, do_nml_file, do_nml_term,     &
@@ -363,16 +363,16 @@
 integer(i8) :: state_index
 integer(i8) :: my_state_indx(ens_handle%my_num_vars)
 integer(i8) :: my_obs_indx(obs_ens_handle%my_num_vars)
+integer(i8) :: num_close_obs, obs_index, num_close_states
+integer(i8) :: total_num_close_obs, last_num_close_obs, last_num_close_states
+integer(i8) :: close_obs_ind(obs_ens_handle%my_num_vars)
+integer(i8) :: close_state_ind(ens_handle%my_num_vars)
+integer(i8) :: last_close_obs_ind(obs_ens_handle%my_num_vars)
+integer(i8) :: last_close_state_ind(ens_handle%my_num_vars)
 
 integer  :: my_num_obs, i, j, owner, owners_index, my_num_state
 integer  :: this_obs_key, obs_mean_index, obs_var_index
 integer  :: grp_beg(num_groups), grp_end(num_groups), grp_size, grp_bot, grp_top, group
-integer  :: close_obs_ind(obs_ens_handle%my_num_vars)
-integer  :: close_state_ind(ens_handle%my_num_vars)
-integer  :: last_close_obs_ind(obs_ens_handle%my_num_vars)
-integer  :: last_close_state_ind(ens_handle%my_num_vars)
-integer  :: num_close_obs, obs_index, num_close_states
-integer  :: total_num_close_obs, last_num_close_obs, last_num_close_states
 integer  :: base_obs_kind, base_obs_type, my_obs_kind(obs_ens_handle%my_num_vars)
 integer  :: my_obs_type(obs_ens_handle%my_num_vars)
 integer  :: my_state_kind(ens_handle%my_num_vars), nth_obs
@@ -2699,7 +2699,7 @@
 
 function revised_distance(orig_dist, newcount, oldcount, base, cutfloor)
  real(r8),            intent(in) :: orig_dist
- integer,             intent(in) :: newcount, oldcount
+ integer(i8),         intent(in) :: newcount, oldcount
  type(location_type), intent(in) :: base
  real(r8),            intent(in) :: cutfloor
 
@@ -2774,8 +2774,9 @@
 !--------------------------------------------------------------------
 
 function count_close(num_close, index_list, my_types, dist, maxdist)
- integer, intent(in)  :: num_close, index_list(:), my_types(:)
- real(r8), intent(in) :: dist(:), maxdist
+ integer(i8), intent(in) :: num_close, index_list(:)
+ integer,     intent(in) :: my_types(:)
+ real(r8),    intent(in) :: dist(:), maxdist
  integer :: count_close
 
 ! return the total number of items from the index_list which
@@ -2784,7 +2785,8 @@
 ! items too far away.   this routine does a global communication
 ! so if any MPI tasks make this call, all must.
 
-integer :: k, thistype, local_count
+integer(i8) :: k, local_count
+integer :: thistype
 
 local_count = 0
 do k=1, num_close
@@ -2805,7 +2807,7 @@
 end do