[Dart-dev] DART/branches Revision: 12781

[dart at ucar.edu]

hendric at ucar.edu
2018-08-23 10:58:26 -0600 (Thu, 23 Aug 2018)
53

everything compiles but at the end of the program.




Modified: DART/branches/rma_distrib/assimilation_code/modules/assimilation/filter_mod.f90
===================================================================
--- DART/branches/rma_distrib/assimilation_code/modules/assimilation/filter_mod.f90	2018-08-22 20:59:06 UTC (rev 12780)
+++ DART/branches/rma_distrib/assimilation_code/modules/assimilation/filter_mod.f90	2018-08-23 16:58:26 UTC (rev 12781)
@@ -59,7 +59,8 @@
                                   map_task_to_pe,  map_pe_to_task, prepare_to_update_copies,  &
                                   copies_in_window, set_num_extra_copies, get_allow_transpose, &
                                   allocate_single_copy, allocate_vars, deallocate_single_copy, &
-                                  all_copies_to_all_vars, all_vars_to_all_copies, get_my_num_vars
+                                  all_copies_to_all_vars, all_vars_to_all_copies,              &
+                                  get_my_num_vars, get_my_vars
                                   
 
 use adaptive_inflate_mod,  only : do_ss_inflate, mean_from_restart, sd_from_restart,          &

Modified: DART/branches/rma_distrib/assimilation_code/modules/utilities/ensemble_manager_mod.f90
===================================================================
--- DART/branches/rma_distrib/assimilation_code/modules/utilities/ensemble_manager_mod.f90	2018-08-22 20:59:06 UTC (rev 12780)
+++ DART/branches/rma_distrib/assimilation_code/modules/utilities/ensemble_manager_mod.f90	2018-08-23 16:58:26 UTC (rev 12781)
@@ -874,8 +874,7 @@
 ! and its index in that pes local storage. Depends on distribution_type
 ! with only option 1 currently implemented.
 
-type (ensemble_type),  intent(in)  :: ens_handle
-type (ensemble_type), intent(in)  :: ens_handle
+type (ensemble_type), intent(in) :: ens_handle
 integer, intent(in)  :: copy_number
 integer, intent(out) :: owner, owners_index
 
@@ -1171,7 +1170,7 @@
 integer     :: num_copies, my_num_vars, my_num_copies, my_pe
 integer     :: max_num_vars, max_num_copies, num_copies_to_receive
 integer     :: sending_pe, recv_pe, k, sv, num_vars_to_send, copy
-integer     :: global_ens_index
+integer     :: global_ens_index, num_pes
 
 ! only output if there is a label
 if (present(label)) then
@@ -1508,7 +1507,7 @@
 integer     :: num_vars_to_receive
 integer     :: sending_pe, recv_pe, k, sv, num_copies_to_send
 integer     :: global_ens_index, copy
-integer     :: group_pe, group_size
+integer     :: group_pe, group_size, num_vars_to_reveive
 
 ! only output if there is a label
 if (present(label)) then
@@ -1628,9 +1627,9 @@
 
                call receive_from(group_pe, transfer_temp(1:num_vars_to_receive), get_group_comm())
                ! Copy the transfer array to my local storage
-               call compute_number_of_groups()
+               !#! call compute_number_of_groups()
                do sv = 1, num_vars_to_receive
-                  ens_handle1%vars(var_list(), 1) = transfer_temp(sv)
+                  ens_handle2%vars(var_list(:), 1) = transfer_temp(sv) !JPH todo: ens_handle1->2
                enddo
            enddo COPIES_RECV_LOOP
          !#! enddo ALL_MY_COPIES_RECV_LOOP

Modified: DART/branches/rma_distrib/assimilation_code/modules/utilities/mpi_utilities_mod.f90
===================================================================
--- DART/branches/rma_distrib/assimilation_code/modules/utilities/mpi_utilities_mod.f90	2018-08-22 20:59:06 UTC (rev 12780)
+++ DART/branches/rma_distrib/assimilation_code/modules/utilities/mpi_utilities_mod.f90	2018-08-23 16:58:26 UTC (rev 12781)
@@ -109,8 +109,7 @@
           get_from_fwd, get_from_mean, broadcast_minmax, broadcast_flag,     &
           start_mpi_timer, read_mpi_timer, create_groups, get_group_size,    &
           set_group_size, group_task_id, get_group_comm, get_group_id,       &
-          start_mpi_timer, read_mpi_timer, send_sum_to,                      &
-          all_reduce_min_max  ! deprecated, replace by broadcast_minmax
+          send_sum_to, all_reduce_min_max  ! deprecated, replace by broadcast_minmax
 
 ! version controlled file description for error handling, do not edit
 character(len=256), parameter :: source   = &
@@ -1963,7 +1962,7 @@
 !-----------------------------------------------------------------------------
 ! cover routine which is deprecated.  when all user code replaces this
 ! with broadcast_minmax(), remove this.
-subroutine :ll_reduce_min_max(min_var, max_var, num_elements)
+subroutine all_reduce_min_max(min_var, max_var, num_elements)
 
 integer,  intent(in)    :: num_elements
 real(r8), intent(inout) :: min_var(num_elements)

Modified: DART/branches/rma_distrib/developer_tests/mpi_groups/test/path_names_test_group_mean
===================================================================
--- DART/branches/rma_distrib/developer_tests/mpi_groups/test/path_names_test_group_mean	2018-08-22 20:59:06 UTC (rev 12780)
+++ DART/branches/rma_distrib/developer_tests/mpi_groups/test/path_names_test_group_mean	2018-08-23 16:58:26 UTC (rev 12781)
@@ -21,7 +21,7 @@
 assimilation_code/modules/utilities/distributed_state_mod.f90
 assimilation_code/modules/utilities/ensemble_manager_mod.f90
 assimilation_code/modules/utilities/netcdf_utilities_mod.f90
-assimilation_code/modules/utilities/null_mpi_utilities_mod.f90
+assimilation_code/modules/utilities/mpi_utilities_mod.f90
 assimilation_code/modules/utilities/no_cray_win_mod.f90
 assimilation_code/modules/utilities/obs_impact_mod.f90
 assimilation_code/modules/utilities/options_mod.f90

Deleted: DART/branches/rma_distrib/developer_tests/mpi_groups/test/preprocess
===================================================================
(Binary files differ)