[Dart-dev] DART/branches Revision: 12789

[dart at ucar.edu]

hendric at ucar.edu
2018-08-27 09:47:52 -0600 (Mon, 27 Aug 2018)
109

changing the parameters to simple_test to make
it easier to test a variety of array sizes and
group sizes.




Modified: DART/branches/rma_distrib/developer_tests/mpi_groups/simple_test.f90
===================================================================
--- DART/branches/rma_distrib/developer_tests/mpi_groups/simple_test.f90	2018-08-27 15:34:21 UTC (rev 12788)
+++ DART/branches/rma_distrib/developer_tests/mpi_groups/simple_test.f90	2018-08-27 15:47:52 UTC (rev 12789)
@@ -65,19 +65,11 @@
 !------------------------------------------------------------------
 ! The namelist variables
 !------------------------------------------------------------------
+integer :: group_size = 2
+integer(KIND=MPI_OFFSET_KIND) :: NX = 8 !< lengths of dimensions
 
-logical                       :: single_file = .false.
-integer                       :: num_ens = 1
-integer                       :: dtype = 1
-integer                       :: ltype = 1
-integer                       :: ttype = 1
-character(len=256)            :: input_state_files(MAX_FILES)  = 'null'
-character(len=256)            :: output_state_files(MAX_FILES) = 'null'
+namelist /simple_test_nml/ NX, group_size
 
-
-namelist /simple_test_nml/ num_ens, single_file, input_state_files, output_state_files, &
-                               dtype, ltype, ttype
-
 ! io variables
 integer                   :: iunit, io
 type(file_info_type)      :: file_info_input, file_info_output
@@ -105,12 +97,10 @@
 integer :: my_rank
 
 integer, allocatable :: group_members(:)
-integer :: group_size = 2
 integer :: group_all
 integer :: subgroup
 integer :: mpi_comm_grid
 integer :: local_rank
-integer(KIND=MPI_OFFSET_KIND) :: NX = 8 !< lengths of dimensions
 
 ! grid window
 integer               :: my_window
@@ -119,7 +109,7 @@
 pointer(aa, duplicate_array)
 
 ! index variables
-integer :: ii
+integer :: ii, jj
 
 !======================================================================
 ! start of executable code
@@ -149,28 +139,30 @@
 !----------------------------------------------------------------------
 call create_window()
 
-if (my_task_id() == 0) then
-   print*, my_task_id(), '::', my_array(:)
-endif
+do jj = 0, task_count()-1
+   if (my_task_id() == jj) then
+      print*, my_task_id(), '::', my_array(:)
+   else
+      call task_sync()
+   endif
+enddo
 
-if (my_task_id() == 1) then
-   print*, my_task_id(), '::', my_array(:)
-endif
+do jj = 0, task_count()-1
+   if (my_task_id() == jj) then
+      do ii = 1, NX
+         print*, 'my_task_id() = ', my_task_id(), 'get_owner(ii)', ii, get_owner(ii, my_task_id()), get_my_val(ii)
+      enddo
+   else
+      call task_sync()
+   endif
+enddo
 
-if (my_task_id() == 2) then
-   print*, my_task_id(), '::', my_array(:)
-endif
+call task_sync()
 
-if (my_task_id() == 3) then
-   print*, my_task_id(), '::', my_array(:)
-endif
+call free_window()
 
-do ii = 1, NX
-   print*, 'my_task_id() = ', my_task_id(), 'get_owner(ii)', ii, get_owner(ii, my_task_id()), get_my_val(ii)
-enddo
+call task_sync()
 
-call free_window()
-
 !----------------------------------------------------------------------
 ! finalize simple_test
 !----------------------------------------------------------------------

Modified: DART/branches/rma_distrib/developer_tests/mpi_groups/test/input.nml
===================================================================
--- DART/branches/rma_distrib/developer_tests/mpi_groups/test/input.nml	2018-08-27 15:34:21 UTC (rev 12788)