# | Line 7 | Line 7 | |
---|---|---|
7 | !! | |
8 | !! @author Charles F. Vardeman II | |
9 | !! @author Matthew Meineke | |
10 | < | !! @version $Id: mpiSimulation_module.F90,v 1.9 2003-11-07 21:46:56 chuckv Exp $, $Date: 2003-11-07 21:46:56 $, $Name: not supported by cvs2svn $, $Revision: 1.9 $ |
10 | > | !! @version $Id: mpiSimulation_module.F90,v 1.14 2004-05-27 18:59:15 gezelter Exp $, $Date: 2004-05-27 18:59:15 $, $Name: not supported by cvs2svn $, $Revision: 1.14 $ |
11 | ||
12 | module mpiSimulation | |
13 | use definitions | |
# | Line 23 | Line 23 | module mpiSimulation | |
23 | public :: gather, scatter | |
24 | public :: setupSimParallel | |
25 | public :: replanSimParallel | |
26 | < | public :: getNcol |
27 | < | public :: getNrow |
26 | > | public :: getNatomsInCol |
27 | > | public :: getNatomsInRow |
28 | > | public :: getNgroupsInCol |
29 | > | public :: getNgroupsInRow |
30 | public :: isMPISimSet | |
31 | public :: printComponentPlan | |
32 | public :: getMyNode | |
# | Line 60 | Line 62 | module mpiSimulation | |
62 | ||
63 | #ifdef PROFILE | |
64 | public :: printCommTime | |
65 | < | |
66 | < | real(kind = dp ), save :: commTime = 0.0_dp |
67 | < | real(kind = dp ) :: commTimeInitial,commTimeFinal |
65 | > | public :: getCommTime |
66 | > | real,save :: commTime = 0.0 |
67 | > | real :: commTimeInitial,commTimeFinal |
68 | #endif | |
69 | ||
70 | !! Include mpiComponentPlan type. mpiComponentPlan is a | |
# | Line 71 | Line 73 | module mpiSimulation | |
73 | #include "mpiComponentPlan.h" | |
74 | ||
75 | ||
74 | – | |
76 | !! Tags used during force loop for parallel simulation | |
77 | < | integer, allocatable, dimension(:) :: tagLocal |
78 | < | integer, public, allocatable, dimension(:) :: tagRow |
79 | < | integer, public, allocatable, dimension(:) :: tagColumn |
77 | > | integer, public, allocatable, dimension(:) :: AtomLocalToGlobal |
78 | > | integer, public, allocatable, dimension(:) :: AtomRowToGlobal |
79 | > | integer, public, allocatable, dimension(:) :: AtomColToGlobal |
80 | > | integer, public, allocatable, dimension(:) :: GroupLocalToGlobal |
81 | > | integer, public, allocatable, dimension(:) :: GroupRowToGlobal |
82 | > | integer, public, allocatable, dimension(:) :: GroupColToGlobal |
83 | ||
84 | !! Logical set true if mpiSimulation has been initialized | |
85 | logical, save :: isSimSet = .false. | |
# | Line 97 | Line 101 | module mpiSimulation | |
101 | end type gs_plan | |
102 | ||
103 | ! plans for different decompositions | |
104 | < | type (gs_plan), public, save :: plan_row |
105 | < | type (gs_plan), public, save :: plan_row3d |
106 | < | type (gs_plan), public, save :: plan_col |
107 | < | type (gs_plan), public, save :: plan_col3d |
108 | < | type (gs_plan), public, save :: plan_row_Rotation |
109 | < | type (gs_plan), public, save :: plan_col_Rotation |
104 | > | type (gs_plan), public, save :: plan_atom_row |
105 | > | type (gs_plan), public, save :: plan_atom_row_3d |
106 | > | type (gs_plan), public, save :: plan_atom_col |
107 | > | type (gs_plan), public, save :: plan_atom_col_3d |
108 | > | type (gs_plan), public, save :: plan_atom_row_Rotation |
109 | > | type (gs_plan), public, save :: plan_atom_col_Rotation |
110 | > | type (gs_plan), public, save :: plan_group_row |
111 | > | type (gs_plan), public, save :: plan_group_col |
112 | > | type (gs_plan), public, save :: plan_group_row_3d |
113 | > | type (gs_plan), public, save :: plan_group_col_3d |
114 | ||
115 | type (mpiComponentPlan), pointer :: simComponentPlan | |
116 | ||
# | Line 131 | Line 139 | contains | |
139 | ||
140 | contains | |
141 | ||
142 | < | !! Sets up mpiComponentPlan with structure passed from C++. |
143 | < | subroutine setupSimParallel(thisComponentPlan,ntags,tags,status) |
144 | < | ! Passed Arguments |
145 | < | ! integer, intent(inout) :: nDim !! Number of dimensions |
142 | > | !! Sets up mpiComponentPlan with structure passed from C++. |
143 | > | subroutine setupSimParallel(thisComponentPlan, nAtomTags, atomTags, & |
144 | > | status) |
145 | > | !! Passed Arguments |
146 | !! mpiComponentPlan struct from C | |
147 | type (mpiComponentPlan), intent(inout) :: thisComponentPlan | |
148 | < | !! Number of tags passed, nlocal |
149 | < | integer, intent(in) :: ntags |
150 | < | !! Result status, 0 = normal, -1 = error |
148 | > | !! Number of tags passed |
149 | > | integer, intent(in) :: nAtomTags |
150 | > | !! Result status, 0 = normal, -1 = error |
151 | integer, intent(out) :: status | |
152 | integer :: localStatus | |
153 | < | !! Global reference tag for local particles |
154 | < | integer, dimension(ntags),intent(inout) :: tags |
153 | > | !! Global reference tag for local particles |
154 | > | integer, dimension(nAtomTags), intent(inout) :: atomTags |
155 | ||
156 | < | write(*,*) 'mpiSim_mod thinks node', thisComponentPlan%myNode, ' has tags(1) = ', tags(1) |
157 | < | |
158 | < | |
151 | < | |
156 | > | !write(*,*) 'mpiSim_mod thinks node', thisComponentPlan%myNode, & |
157 | > | ! ' has atomTags(1) = ', atomTags(1) |
158 | > | |
159 | status = 0 | |
160 | if (componentPlanSet) then | |
161 | return | |
162 | endif | |
163 | componentPlanSet = .true. | |
164 | ||
165 | < | !! copy c component plan to fortran |
165 | > | !! copy c component plan to fortran |
166 | mpiSim = thisComponentPlan | |
167 | < | write(*,*) "Seting up simParallel" |
168 | < | |
169 | < | call make_Force_Grid(mpiSim,localStatus) |
167 | > | !write(*,*) "Seting up simParallel" |
168 | > | |
169 | > | call make_Force_Grid(mpiSim, localStatus) |
170 | if (localStatus /= 0) then | |
171 | write(default_error,*) "Error creating force grid" | |
172 | status = -1 | |
173 | return | |
174 | endif | |
175 | < | |
176 | < | call updateGridComponents(mpiSim,localStatus) |
175 | > | |
176 | > | call updateGridComponents(mpiSim, localStatus) |
177 | if (localStatus /= 0) then | |
178 | write(default_error,*) "Error updating grid components" | |
179 | status = -1 | |
180 | return | |
181 | endif | |
175 | – | |
182 | ||
183 | !! initialize gather and scatter plans used in this simulation | |
184 | < | call plan_gather_scatter(1,mpiSim%myNlocal,& |
185 | < | mpiSim,mpiSim%rowComm,plan_row) |
186 | < | call plan_gather_scatter(nDim,mpiSim%myNlocal,& |
187 | < | mpiSim,mpiSim%rowComm,plan_row3d) |
188 | < | call plan_gather_scatter(9,mpiSim%myNlocal,& |
189 | < | mpiSim,mpiSim%rowComm,plan_row_Rotation) |
190 | < | call plan_gather_scatter(1,mpiSim%myNlocal,& |
191 | < | mpiSim,mpiSim%columnComm,plan_col) |
192 | < | call plan_gather_scatter(nDim,mpiSim%myNlocal,& |
193 | < | mpiSim,mpiSim%columnComm,plan_col3d) |
194 | < | call plan_gather_scatter(9,mpiSim%myNlocal,& |
195 | < | mpiSim,mpiSim%columnComm,plan_col_Rotation) |
196 | < | |
197 | < | |
198 | < | |
184 | > | call plan_gather_scatter(1, mpiSim%nAtomsLocal, & |
185 | > | mpiSim, mpiSim%rowComm, plan_atom_row) |
186 | > | call plan_gather_scatter(nDim, mpiSim%nAtomsLocal, & |
187 | > | mpiSim, mpiSim%rowComm, plan_atom_row_3d) |
188 | > | call plan_gather_scatter(9, mpiSim%nAtomsLocal, & |
189 | > | mpiSim, mpiSim%rowComm, plan_atom_row_Rotation) |
190 | > | call plan_gather_scatter(1, mpiSim%nGroupsLocal, & |
191 | > | mpiSim, mpiSim%rowComm, plan_group_row) |
192 | > | call plan_gather_scatter(nDim, mpiSim%nGroupsLocal, & |
193 | > | mpiSim, mpiSim%rowComm, plan_group_row_3d) |
194 | > | |
195 | > | call plan_gather_scatter(1, mpiSim%nAtomsLocal, & |
196 | > | mpiSim, mpiSim%columnComm, plan_atom_col) |
197 | > | call plan_gather_scatter(nDim, mpiSim%nAtomsLocal, & |
198 | > | mpiSim, mpiSim%columnComm, plan_atom_col_3d) |
199 | > | call plan_gather_scatter(9, mpiSim%nAtomsLocal, & |
200 | > | mpiSim, mpiSim%columnComm, plan_atom_col_Rotation) |
201 | > | call plan_gather_scatter(1, mpiSim%nGroupsLocal, & |
202 | > | mpiSim, mpiSim%columnComm, plan_group_col) |
203 | > | call plan_gather_scatter(nDim, mpiSim%nGroupsLocal, & |
204 | > | mpiSim, mpiSim%columnComm, plan_group_col_3d) |
205 | > | |
206 | ! Initialize tags | |
207 | < | call setTags(tags,localStatus) |
207 | > | |
208 | > | call setAtomTags(atomTags,localStatus) |
209 | if (localStatus /= 0) then | |
210 | status = -1 | |
211 | return | |
# | Line 217 | Line 231 | contains | |
231 | endif | |
232 | ||
233 | !! Unplan Gather Scatter plans | |
234 | < | call unplan_gather_scatter(plan_row) |
235 | < | call unplan_gather_scatter(plan_row3d) |
236 | < | call unplan_gather_scatter(plan_row_Rotation) |
237 | < | call unplan_gather_scatter(plan_col) |
238 | < | call unplan_gather_scatter(plan_col3d) |
225 | < | call unplan_gather_scatter(plan_col_Rotation) |
234 | > | call unplan_gather_scatter(plan_atom_row) |
235 | > | call unplan_gather_scatter(plan_atom_row_3d) |
236 | > | call unplan_gather_scatter(plan_atom_row_Rotation) |
237 | > | call unplan_gather_scatter(plan_group_row) |
238 | > | call unplan_gather_scatter(plan_group_row_3d) |
239 | ||
240 | < | !! initialize gather and scatter plans used in this simulation |
241 | < | call plan_gather_scatter(1,thisComponentPlan%myNlocal,& |
242 | < | thisComponentPlan,thisComponentPlan%rowComm,plan_row) |
243 | < | call plan_gather_scatter(nDim,thisComponentPlan%myNlocal,& |
244 | < | thisComponentPlan,thisComponentPlan%rowComm,plan_row3d) |
232 | < | call plan_gather_scatter(9,thisComponentPlan%myNlocal,& |
233 | < | thisComponentPlan,thisComponentPlan%rowComm,plan_row_Rotation) |
234 | < | call plan_gather_scatter(1,thisComponentPlan%myNlocal,& |
235 | < | thisComponentPlan,thisComponentPlan%columnComm,plan_col) |
236 | < | call plan_gather_scatter(nDim,thisComponentPlan%myNlocal,& |
237 | < | thisComponentPlan,thisComponentPlan%rowComm,plan_col3d) |
238 | < | call plan_gather_scatter(9,thisComponentPlan%myNlocal,& |
239 | < | thisComponentPlan,thisComponentPlan%rowComm,plan_col_Rotation) |
240 | > | call unplan_gather_scatter(plan_atom_col) |
241 | > | call unplan_gather_scatter(plan_atom_col_3d) |
242 | > | call unplan_gather_scatter(plan_atom_col_Rotation) |
243 | > | call unplan_gather_scatter(plan_group_col) |
244 | > | call unplan_gather_scatter(plan_group_col_3d) |
245 | ||
246 | < | |
247 | < | |
246 | > | !! initialize gather and scatter plans used in this simulation |
247 | > | call plan_gather_scatter(1, mpiSim%nAtomsLocal, & |
248 | > | mpiSim, mpiSim%rowComm, plan_atom_row) |
249 | > | call plan_gather_scatter(nDim, mpiSim%nAtomsLocal, & |
250 | > | mpiSim, mpiSim%rowComm, plan_atom_row_3d) |
251 | > | call plan_gather_scatter(9, mpiSim%nAtomsLocal, & |
252 | > | mpiSim, mpiSim%rowComm, plan_atom_row_Rotation) |
253 | > | call plan_gather_scatter(1, mpiSim%nGroupsLocal, & |
254 | > | mpiSim, mpiSim%rowComm, plan_group_row) |
255 | > | call plan_gather_scatter(nDim, mpiSim%nGroupsLocal, & |
256 | > | mpiSim, mpiSim%rowComm, plan_group_row_3d) |
257 | > | |
258 | > | call plan_gather_scatter(1, mpiSim%nAtomsLocal, & |
259 | > | mpiSim, mpiSim%columnComm, plan_atom_col) |
260 | > | call plan_gather_scatter(nDim, mpiSim%nAtomsLocal, & |
261 | > | mpiSim, mpiSim%columnComm, plan_atom_col_3d) |
262 | > | call plan_gather_scatter(9, mpiSim%nAtomsLocal, & |
263 | > | mpiSim, mpiSim%columnComm, plan_atom_col_Rotation) |
264 | > | call plan_gather_scatter(1, mpiSim%nGroupsLocal, & |
265 | > | mpiSim, mpiSim%columnComm, plan_group_col) |
266 | > | call plan_gather_scatter(nDim, mpiSim%nGroupsLocal, & |
267 | > | mpiSim, mpiSim%columnComm, plan_group_col_3d) |
268 | > | |
269 | end subroutine replanSimParallel | |
270 | ||
271 | < | !! Updates number of row and column components for long range forces. |
272 | < | subroutine updateGridComponents(thisComponentPlan,status) |
271 | > | !! Updates number of row and column components for long range forces. |
272 | > | subroutine updateGridComponents(thisComponentPlan, status) |
273 | type (mpiComponentPlan) :: thisComponentPlan !! mpiComponentPlan | |
274 | < | |
275 | < | !! Status return |
276 | < | !! - 0 Success |
277 | < | !! - -1 Failure |
274 | > | |
275 | > | !! Status return |
276 | > | !! - 0 Success |
277 | > | !! - -1 Failure |
278 | integer, intent(out) :: status | |
279 | < | integer :: nComponentsLocal |
280 | < | integer :: nComponentsRow = 0 |
281 | < | integer :: nComponentsColumn = 0 |
279 | > | integer :: nAtomsLocal |
280 | > | integer :: nAtomsInRow = 0 |
281 | > | integer :: nAtomsInColumn = 0 |
282 | > | integer :: nGroupsLocal |
283 | > | integer :: nGroupsInRow = 0 |
284 | > | integer :: nGroupsInColumn = 0 |
285 | integer :: mpiErrors | |
286 | ||
287 | status = 0 | |
288 | if (.not. componentPlanSet) return | |
289 | ||
290 | < | if (thisComponentPlan%myNlocal == 0 ) then |
290 | > | if (thisComponentPlan%nAtomsLocal == 0) then |
291 | status = -1 | |
292 | return | |
293 | + | endif |
294 | + | if (thisComponentPlan%nGroupsLocal == 0) then |
295 | + | write(*,*) 'tcp%ngl = ', thisComponentPlan%nGroupsLocal |
296 | + | status = -1 |
297 | + | return |
298 | endif | |
299 | ||
300 | < | nComponentsLocal = thisComponentPlan%myNlocal |
300 | > | nAtomsLocal = thisComponentPlan%nAtomsLocal |
301 | > | nGroupsLocal = thisComponentPlan%nGroupsLocal |
302 | ||
303 | < | write(*,*) "UpdateGridComponents: myNlocal ", nComponentsLocal |
304 | < | call mpi_allreduce(nComponentsLocal,nComponentsRow,1,mpi_integer,& |
270 | < | mpi_sum,thisComponentPlan%rowComm,mpiErrors) |
303 | > | call mpi_allreduce(nAtomsLocal, nAtomsInRow, 1, mpi_integer, & |
304 | > | mpi_sum, thisComponentPlan%rowComm, mpiErrors) |
305 | if (mpiErrors /= 0) then | |
306 | status = -1 | |
307 | return | |
308 | endif | |
309 | ||
310 | < | call mpi_allreduce(nComponentsLocal,nComponentsColumn,1,mpi_integer, & |
311 | < | mpi_sum,thisComponentPlan%columnComm,mpiErrors) |
310 | > | call mpi_allreduce(nAtomsLocal, nAtomsInColumn, 1, mpi_integer, & |
311 | > | mpi_sum, thisComponentPlan%columnComm, mpiErrors) |
312 | if (mpiErrors /= 0) then | |
313 | status = -1 | |
314 | return | |
315 | endif | |
316 | + | |
317 | + | call mpi_allreduce(nGroupsLocal, nGroupsInRow, 1, mpi_integer, & |
318 | + | mpi_sum, thisComponentPlan%rowComm, mpiErrors) |
319 | + | if (mpiErrors /= 0) then |
320 | + | status = -1 |
321 | + | return |
322 | + | endif |
323 | ||
324 | < | thisComponentPlan%nComponentsRow = nComponentsRow |
325 | < | thisComponentPlan%nComponentsColumn = nComponentsColumn |
326 | < | write(*,*) "UpdateGridComponents: myNRow ",& |
327 | < | thisComponentPlan%nComponentsRow |
328 | < | write(*,*) "UpdateGridComponents: myNColumn ",& |
329 | < | thisComponentPlan%nComponentsColumn |
324 | > | call mpi_allreduce(nGroupsLocal, nGroupsInColumn, 1, mpi_integer, & |
325 | > | mpi_sum, thisComponentPlan%columnComm, mpiErrors) |
326 | > | if (mpiErrors /= 0) then |
327 | > | status = -1 |
328 | > | return |
329 | > | endif |
330 | ||
331 | + | thisComponentPlan%nAtomsInRow = nAtomsInRow |
332 | + | thisComponentPlan%nAtomsInColumn = nAtomsInColumn |
333 | + | thisComponentPlan%nGroupsInRow = nGroupsInRow |
334 | + | thisComponentPlan%nGroupsInColumn = nGroupsInColumn |
335 | + | |
336 | end subroutine updateGridComponents | |
337 | ||
338 | ||
339 | < | !! Creates a square force decomposition of processors into row and column |
340 | < | !! communicators. |
339 | > | !! Creates a square force decomposition of processors into row and column |
340 | > | !! communicators. |
341 | subroutine make_Force_Grid(thisComponentPlan,status) | |
342 | type (mpiComponentPlan) :: thisComponentPlan | |
343 | integer, intent(out) :: status !! status returns -1 if error | |
344 | < | integer :: nColumnsMax !! Maximum number of columns |
345 | < | integer :: nWorldProcessors !! Total number of processors in World comm. |
344 | > | integer :: nColumnsMax !! Maximum number of columns |
345 | > | integer :: nWorldProcessors !! Total number of processors in World comm. |
346 | integer :: rowIndex !! Row for this processor. | |
347 | integer :: columnIndex !! Column for this processor. | |
348 | integer :: nRows !! Total number of rows. | |
# | Line 311 | Line 357 | contains | |
357 | if (.not. ComponentPlanSet) return | |
358 | status = 0 | |
359 | ||
360 | < | !! We make a dangerous assumption here that if numberProcessors is |
361 | < | !! zero, then we need to get the information from MPI. |
362 | < | if (thisComponentPlan%numberProcessors == 0 ) then |
360 | > | !! We make a dangerous assumption here that if numberProcessors is |
361 | > | !! zero, then we need to get the information from MPI. |
362 | > | if (thisComponentPlan%nProcessors == 0 ) then |
363 | call mpi_comm_size( MPI_COMM_WORLD, nWorldProcessors,mpiErrors) | |
364 | if ( mpiErrors /= 0 ) then | |
365 | status = -1 | |
# | Line 324 | Line 370 | contains | |
370 | status = -1 | |
371 | return | |
372 | endif | |
373 | < | |
373 | > | |
374 | else | |
375 | < | nWorldProcessors = thisComponentPlan%numberProcessors |
375 | > | nWorldProcessors = thisComponentPlan%nProcessors |
376 | myWorldRank = thisComponentPlan%myNode | |
377 | endif | |
378 | < | |
333 | < | |
334 | < | |
335 | < | |
378 | > | |
379 | nColumnsMax = nint(sqrt(real(nWorldProcessors,kind=dp))) | |
380 | < | |
380 | > | |
381 | do i = 1, nColumnsMax | |
382 | if (mod(nWorldProcessors,i) == 0) nColumns = i | |
383 | end do | |
384 | < | |
384 | > | |
385 | nRows = nWorldProcessors/nColumns | |
386 | < | |
386 | > | |
387 | rowIndex = myWorldRank/nColumns | |
388 | < | |
346 | < | |
347 | < | |
388 | > | |
389 | call mpi_comm_split(mpi_comm_world,rowIndex,0,rowCommunicator,mpiErrors) | |
390 | if ( mpiErrors /= 0 ) then | |
391 | write(default_error,*) "MPI comm split failed at row communicator" | |
392 | status = -1 | |
393 | return | |
394 | endif | |
395 | < | |
395 | > | |
396 | columnIndex = mod(myWorldRank,nColumns) | |
397 | call mpi_comm_split(mpi_comm_world,columnIndex,0,columnCommunicator,mpiErrors) | |
398 | if ( mpiErrors /= 0 ) then | |
# | Line 359 | Line 400 | contains | |
400 | status = -1 | |
401 | return | |
402 | endif | |
403 | < | |
404 | < | ! Set appropriate components of thisComponentPlan |
403 | > | |
404 | > | ! Set appropriate components of thisComponentPlan |
405 | thisComponentPlan%rowComm = rowCommunicator | |
406 | thisComponentPlan%columnComm = columnCommunicator | |
407 | thisComponentPlan%rowIndex = rowIndex | |
408 | thisComponentPlan%columnIndex = columnIndex | |
409 | < | thisComponentPlan%numberRows = nRows |
410 | < | thisComponentPlan%numberColumns = nColumns |
409 | > | thisComponentPlan%nRows = nRows |
410 | > | thisComponentPlan%nColumns = nColumns |
411 | ||
371 | – | |
412 | end subroutine make_Force_Grid | |
413 | < | |
374 | < | |
413 | > | |
414 | !! initalizes a gather scatter plan | |
415 | < | subroutine plan_gather_scatter( nDim,nComponents,thisComponentPlan, & |
416 | < | thisComm, this_plan,status) |
415 | > | subroutine plan_gather_scatter( nDim, nObjects, thisComponentPlan, & |
416 | > | thisComm, this_plan, status) |
417 | integer, intent(in) :: nDim !! Number of dimensions for gather scatter plan | |
418 | < | integer, intent(in) :: nComponents |
418 | > | integer, intent(in) :: nObjects |
419 | type (mpiComponentPlan), intent(in), target :: thisComponentPlan | |
420 | type (gs_plan), intent(out) :: this_plan !! MPI Component Plan | |
421 | integer, intent(in) :: thisComm !! MPI communicator for this plan | |
# | Line 387 | Line 426 | contains | |
426 | integer :: i,junk | |
427 | ||
428 | if (present(status)) status = 0 | |
390 | – | |
391 | – | |
429 | ||
430 | < | !! Set gsComponetPlan pointer |
430 | > | !! Set gsComponentPlan pointer |
431 | !! to the componet plan we want to use for this gather scatter plan. | |
432 | !! WARNING this could be dangerous since thisComponentPlan was origionally | |
433 | !! allocated in C++ and there is a significant difference between c and | |
# | Line 398 | Line 435 | contains | |
435 | this_plan%gsComponentPlan => thisComponentPlan | |
436 | ||
437 | ! Set this plan size for displs array. | |
438 | < | this_plan%gsPlanSize = nDim * nComponents |
438 | > | this_plan%gsPlanSize = nDim * nObjects |
439 | ||
440 | ! Duplicate communicator for this plan | |
441 | < | call mpi_comm_dup(thisComm,this_plan%myPlanComm,mpi_err) |
441 | > | call mpi_comm_dup(thisComm, this_plan%myPlanComm, mpi_err) |
442 | if (mpi_err /= 0) then | |
443 | if (present(status)) status = -1 | |
444 | return | |
445 | end if | |
446 | < | call mpi_comm_rank(this_plan%myPlanComm,this_plan%myPlanRank,mpi_err) |
446 | > | call mpi_comm_rank(this_plan%myPlanComm, this_plan%myPlanRank, mpi_err) |
447 | if (mpi_err /= 0) then | |
448 | if (present(status)) status = -1 | |
449 | return | |
450 | end if | |
451 | ||
452 | < | call mpi_comm_size(this_plan%myPlanComm,this_plan%planNprocs,mpi_err) |
452 | > | call mpi_comm_size(this_plan%myPlanComm, this_plan%planNprocs, mpi_err) |
453 | ||
454 | if (mpi_err /= 0) then | |
455 | if (present(status)) status = -1 | |
# | Line 442 | Line 479 | contains | |
479 | return | |
480 | end if | |
481 | ||
445 | – | |
482 | !! figure out the total number of particles in this plan | |
483 | this_plan%globalPlanSize = sum(this_plan%counts) | |
484 | ||
449 | – | |
485 | !! initialize plan displacements. | |
486 | this_plan%displs(0) = 0 | |
487 | do i = 1, this_plan%planNprocs - 1,1 | |
488 | this_plan%displs(i) = this_plan%displs(i-1) + this_plan%counts(i-1) | |
489 | end do | |
455 | – | |
456 | – | |
490 | end subroutine plan_gather_scatter | |
491 | ||
459 | – | |
492 | subroutine unplan_gather_scatter(this_plan) | |
493 | type (gs_plan), intent(inout) :: this_plan | |
494 | ||
463 | – | |
495 | this_plan%gsComponentPlan => null() | |
496 | call mpi_comm_free(this_plan%myPlanComm,mpi_err) | |
497 | ||
# | Line 478 | Line 509 | contains | |
509 | integer, intent(out), optional :: status | |
510 | integer :: i | |
511 | ||
481 | – | |
482 | – | |
512 | if (present(status)) status = 0 | |
513 | noffset = this_plan%displs(this_plan%myPlanRank) | |
514 | ||
# | Line 512 | Line 541 | contains | |
541 | if (present(status)) status = 0 | |
542 | noffset = this_plan%displs(this_plan%myPlanRank) | |
543 | #ifdef PROFILE | |
544 | < | commTimeInitial = mpi_wtime() |
544 | > | call cpu_time(commTimeInitial) |
545 | #endif | |
546 | call mpi_allgatherv(sbuffer,this_plan%gsPlanSize, mpi_double_precision, & | |
547 | rbuffer,this_plan%counts,this_plan%displs,mpi_double_precision, & | |
548 | this_plan%myPlanComm, mpi_err) | |
549 | #ifdef PROFILE | |
550 | < | commTimeFinal = mpi_wtime() |
550 | > | call cpu_time(commTimeFinal) |
551 | commTime = commTime + commTimeFinal - commTimeInitial | |
552 | #endif | |
553 | ||
# | Line 542 | Line 571 | contains | |
571 | ||
572 | ! noffset = this_plan%displs(this_plan%me) | |
573 | #ifdef PROFILE | |
574 | < | commTimeInitial = mpi_wtime() |
574 | > | call cpu_time(commTimeInitial) |
575 | #endif | |
576 | ||
577 | call mpi_allgatherv(sbuffer,this_plan%gsPlanSize, mpi_double_precision, & | |
# | Line 550 | Line 579 | contains | |
579 | this_plan%myPlanComm, mpi_err) | |
580 | ||
581 | #ifdef PROFILE | |
582 | < | commTimeFinal = mpi_wtime() |
582 | > | call cpu_time(commTimeFinal) |
583 | commTime = commTime + commTimeFinal - commTimeInitial | |
584 | #endif | |
585 | ||
# | Line 571 | Line 600 | contains | |
600 | if (present(status)) status = 0 | |
601 | ||
602 | #ifdef PROFILE | |
603 | < | commTimeInitial = mpi_wtime() |
603 | > | call cpu_time(commTimeInitial) |
604 | #endif | |
605 | call mpi_reduce_scatter(sbuffer,rbuffer, this_plan%counts, & | |
606 | mpi_double_precision, MPI_SUM, this_plan%myPlanComm, mpi_err) | |
607 | #ifdef PROFILE | |
608 | < | commTimeFinal = mpi_wtime() |
608 | > | call cpu_time(commTimeFinal) |
609 | commTime = commTime + commTimeFinal - commTimeInitial | |
610 | #endif | |
611 | ||
# | Line 596 | Line 625 | contains | |
625 | ||
626 | if (present(status)) status = 0 | |
627 | #ifdef PROFILE | |
628 | < | commTimeInitial = mpi_wtime() |
628 | > | call cpu_time(commTimeInitial) |
629 | #endif | |
630 | ||
631 | call mpi_reduce_scatter(sbuffer,rbuffer, this_plan%counts, & | |
632 | mpi_double_precision, MPI_SUM, this_plan%myPlanComm, mpi_err) | |
633 | #ifdef PROFILE | |
634 | < | commTimeFinal = mpi_wtime() |
634 | > | call cpu_time(commTimeFinal) |
635 | commTime = commTime + commTimeFinal - commTimeInitial | |
636 | #endif | |
637 | ||
# | Line 611 | Line 640 | contains | |
640 | endif | |
641 | ||
642 | end subroutine scatter_double_2d | |
643 | < | |
644 | < | |
616 | < | subroutine setTags(tags,status) |
643 | > | |
644 | > | subroutine setAtomTags(tags, status) |
645 | integer, dimension(:) :: tags | |
646 | integer :: status | |
647 | ||
648 | integer :: alloc_stat | |
649 | ||
650 | < | integer :: ncol |
651 | < | integer :: nrow |
650 | > | integer :: nAtomsInCol |
651 | > | integer :: nAtomsInRow |
652 | ||
653 | status = 0 | |
654 | ! allocate row arrays | |
655 | < | nrow = getNrow(plan_row) |
656 | < | ncol = getNcol(plan_col) |
655 | > | nAtomsInRow = getNatomsInRow(plan_atom_row) |
656 | > | nAtomsInCol = getNatomsInCol(plan_atom_col) |
657 | > | |
658 | > | if(.not. allocated(AtomLocalToGlobal)) then |
659 | > | allocate(AtomLocalToGlobal(size(tags)),STAT=alloc_stat) |
660 | > | if (alloc_stat /= 0 ) then |
661 | > | status = -1 |
662 | > | return |
663 | > | endif |
664 | > | else |
665 | > | deallocate(AtomLocalToGlobal) |
666 | > | allocate(AtomLocalToGlobal(size(tags)),STAT=alloc_stat) |
667 | > | if (alloc_stat /= 0 ) then |
668 | > | status = -1 |
669 | > | return |
670 | > | endif |
671 | ||
672 | < | if (.not. allocated(tagRow)) then |
673 | < | allocate(tagRow(nrow),STAT=alloc_stat) |
672 | > | endif |
673 | > | |
674 | > | AtomLocalToGlobal = tags |
675 | > | |
676 | > | if (.not. allocated(AtomRowToGlobal)) then |
677 | > | allocate(AtomRowToGlobal(nAtomsInRow),STAT=alloc_stat) |
678 | if (alloc_stat /= 0 ) then | |
679 | status = -1 | |
680 | return | |
681 | endif | |
682 | else | |
683 | < | deallocate(tagRow) |
684 | < | allocate(tagRow(nrow),STAT=alloc_stat) |
683 | > | deallocate(AtomRowToGlobal) |
684 | > | allocate(AtomRowToGlobal(nAtomsInRow),STAT=alloc_stat) |
685 | if (alloc_stat /= 0 ) then | |
686 | status = -1 | |
687 | return | |
# | Line 643 | Line 689 | contains | |
689 | ||
690 | endif | |
691 | ! allocate column arrays | |
692 | < | if (.not. allocated(tagColumn)) then |
693 | < | allocate(tagColumn(ncol),STAT=alloc_stat) |
692 | > | if (.not. allocated(AtomColToGlobal)) then |
693 | > | allocate(AtomColToGlobal(nAtomsInCol),STAT=alloc_stat) |
694 | if (alloc_stat /= 0 ) then | |
695 | status = -1 | |
696 | return | |
697 | endif | |
698 | else | |
699 | < | deallocate(tagColumn) |
700 | < | allocate(tagColumn(ncol),STAT=alloc_stat) |
699 | > | deallocate(AtomColToGlobal) |
700 | > | allocate(AtomColToGlobal(nAtomsInCol),STAT=alloc_stat) |
701 | if (alloc_stat /= 0 ) then | |
702 | status = -1 | |
703 | return | |
704 | endif | |
705 | endif | |
706 | ||
707 | < | call gather(tags,tagRow,plan_row) |
708 | < | call gather(tags,tagColumn,plan_col) |
709 | < | |
710 | < | end subroutine setTags |
711 | < | |
712 | < | ! pure function getNcol(thisplan) result(ncol) |
667 | < | function getNcol(thisplan) result(ncol) |
707 | > | call gather(tags, AtomRowToGlobal, plan_atom_row) |
708 | > | call gather(tags, AtomColToGlobal, plan_atom_col) |
709 | > | |
710 | > | end subroutine setAtomTags |
711 | > | |
712 | > | function getNatomsInCol(thisplan) result(nInCol) |
713 | type (gs_plan), intent(in) :: thisplan | |
714 | < | integer :: ncol |
715 | < | ncol = thisplan%gsComponentPlan%nComponentsColumn |
716 | < | end function getNcol |
714 | > | integer :: nInCol |
715 | > | nInCol = thisplan%gsComponentPlan%nAtomsInColumn |
716 | > | end function getNatomsInCol |
717 | ||
718 | < | ! pure function getNrow(thisplan) result(nrow) |
674 | < | function getNrow(thisplan) result(nrow) |
718 | > | function getNatomsInRow(thisplan) result(nInRow) |
719 | type (gs_plan), intent(in) :: thisplan | |
720 | < | integer :: nrow |
721 | < | nrow = thisplan%gsComponentPlan%nComponentsRow |
722 | < | end function getNrow |
720 | > | integer :: nInRow |
721 | > | nInRow = thisplan%gsComponentPlan%nAtomsInRow |
722 | > | end function getNatomsInRow |
723 | > | |
724 | > | function getNgroupsInCol(thisplan) result(nInCol) |
725 | > | type (gs_plan), intent(in) :: thisplan |
726 | > | integer :: nInCol |
727 | > | nInCol = thisplan%gsComponentPlan%nGroupsInColumn |
728 | > | end function getNgroupsInCol |
729 | ||
730 | + | function getNgroupsInRow(thisplan) result(nInRow) |
731 | + | type (gs_plan), intent(in) :: thisplan |
732 | + | integer :: nInRow |
733 | + | nInRow = thisplan%gsComponentPlan%nGroupsInRow |
734 | + | end function getNgroupsInRow |
735 | + | |
736 | function isMPISimSet() result(isthisSimSet) | |
737 | logical :: isthisSimSet | |
738 | if (isSimSet) then | |
# | Line 686 | Line 742 | contains | |
742 | endif | |
743 | end function isMPISimSet | |
744 | ||
689 | – | |
690 | – | |
745 | subroutine printComponentPlan(this_plan,printNode) | |
746 | ||
747 | type (mpiComponentPlan), intent(in) :: this_plan | |
# | Line 708 | Line 762 | contains | |
762 | write(default_error,*) "nBondGlobal: ", mpiSim%nBondsGlobal | |
763 | write(default_error,*) "nTorsionsGlobal: ", mpiSim%nTorsionsGlobal | |
764 | write(default_error,*) "nSRIGlobal: ", mpiSim%nSRIGlobal | |
765 | < | write(default_error,*) "myNlocal: ", mpiSim%myNlocal |
765 | > | write(default_error,*) "nAtomsLocal: ", mpiSim%nAtomsLocal |
766 | write(default_error,*) "myNode: ", mpiSim%myNode | |
767 | < | write(default_error,*) "numberProcessors: ", mpiSim%numberProcessors |
767 | > | write(default_error,*) "nProcessors: ", mpiSim%nProcessors |
768 | write(default_error,*) "rowComm: ", mpiSim%rowComm | |
769 | write(default_error,*) "columnComm: ", mpiSim%columnComm | |
770 | < | write(default_error,*) "numberRows: ", mpiSim%numberRows |
771 | < | write(default_error,*) "numberColumns: ", mpiSim%numberColumns |
772 | < | write(default_error,*) "nComponentsRow: ", mpiSim%nComponentsRow |
773 | < | write(default_error,*) "nComponentsColumn: ", mpiSim%nComponentsColumn |
770 | > | write(default_error,*) "nRows: ", mpiSim%nRows |
771 | > | write(default_error,*) "nColumns: ", mpiSim%nColumns |
772 | > | write(default_error,*) "nAtomsInRow: ", mpiSim%nAtomsInRow |
773 | > | write(default_error,*) "nAtomsInColumn: ", mpiSim%nAtomsInColumn |
774 | write(default_error,*) "rowIndex: ", mpiSim%rowIndex | |
775 | write(default_error,*) "columnIndex: ", mpiSim%columnIndex | |
776 | endif | |
# | Line 729 | Line 783 | contains | |
783 | ||
784 | #ifdef PROFILE | |
785 | subroutine printCommTime() | |
732 | – | |
786 | write(*,*) "MPI communication time is: ", commTime | |
734 | – | |
787 | end subroutine printCommTime | |
788 | + | |
789 | + | function getCommTime() result(comm_time) |
790 | + | real :: comm_time |
791 | + | comm_time = commTime |
792 | + | end function getCommTime |
793 | + | |
794 | #endif | |
795 | ||
796 | #endif // is_mpi |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |