[Dart-dev] [7185] DART/trunk/ensemble_manager/ensemble_manager_mod.f90: Same bug fix as Lanai version 7184.

[nancy at ucar.edu]

Revision: 7185
Author:   hkershaw
Date:     2014-09-26 11:09:48 -0600 (Fri, 26 Sep 2014)
Log Message:
-----------
Same bug fix as Lanai version 7184.  

If you had the round robin layout on and picked a number of tasks between ens_size + 4 and ens_size + 6
the state copies and the corresponding observation copies ended up on different tasks. Fixed
by removing the bail out early test condition nEns_members >= num_pes.

Modified Paths:
--------------
    DART/trunk/ensemble_manager/ensemble_manager_mod.f90

-------------- next part --------------
Modified: DART/trunk/ensemble_manager/ensemble_manager_mod.f90
===================================================================
--- DART/trunk/ensemble_manager/ensemble_manager_mod.f90	2014-09-26 17:04:03 UTC (rev 7184)
+++ DART/trunk/ensemble_manager/ensemble_manager_mod.f90	2014-09-26 17:09:48 UTC (rev 7185)
@@ -1676,11 +1676,6 @@
 if (layout_type /= 1 .and. layout_type /=2) call error_handler(E_ERR,'assign_tasks_to_pes', &
     'not a valid layout_type, must be 1 (standard) or 2 (round-robin)',source,revision,revdate)
 
-if (nEns_members >= num_pes) then   ! if nEns_members >= task_count() then don't try to spread them out
-   call simple_layout(ens_handle, num_pes)
-   return
-endif
-
 if (tasks_per_node >= num_pes) then ! all tasks are on one node, don't try to spread them out
    call simple_layout(ens_handle, num_pes)
    return