Skip to content

Feature/memcheck #848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MatthewMasarik-NOAA merged 17 commits into from
Dec 9, 2022
Merged

Feature/memcheck #848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7f69166
replace W3_MEMCHECK with utility routine
DeniseWorthen Nov 4, 2022
060b67a
fix typo
DeniseWorthen Nov 4, 2022
ee0b378
fix missing variable declaration
DeniseWorthen Nov 4, 2022
02cbf22
fix typo
DeniseWorthen Nov 4, 2022
5f2474b
fix bad ifdef
DeniseWorthen Nov 7, 2022
08a5af7
Merge remote-tracking branch 'origin/develop' into feature/memcheck
DeniseWorthen Nov 8, 2022
59da952
remove trailing whitespace from pr 841
DeniseWorthen Nov 8, 2022
2c089ad
fixes after testing in unstr/pdlib feature branch
DeniseWorthen Nov 8, 2022
b3c4db2
remove CESMCOUPLED variables
DeniseWorthen Nov 8, 2022
326d213
clean up
DeniseWorthen Nov 8, 2022
63f0fc8
clean up
DeniseWorthen Nov 11, 2022
20b3315
use memunit
DeniseWorthen Nov 14, 2022
673135d
remove blank lines
DeniseWorthen Nov 14, 2022
ed15265
Merge remote-tracking branch 'origin/develop' into feature/memcheck
DeniseWorthen Nov 15, 2022
0613f46
reset location of memunit assignment
DeniseWorthen Nov 18, 2022
a73f0de
Merge branch 'NOAA-EMC:develop' into feature/memcheck
DeniseWorthen Nov 28, 2022
dd80c1d
initialize memunit after call to wseto
DeniseWorthen Nov 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 43 additions & 97 deletions model/src/PDLIB/yowpdlibmain.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@
!> \date 2011-2012
module yowpdlibMain
use yowerr
use yowDatapool, only: rkind
#ifdef W3_MEMCHECK
USE MallocInfo_m
USE W3ADATMD, ONLY: MALLINFOS
#endif
use yowDatapool, only : rkind
use w3servmd, only : print_memcheck

!module default
implicit none

private
public :: initFromGridDim, finalizePD

Expand All @@ -69,60 +69,41 @@ subroutine initFromGridDim(MNP, MNE, INE_global, secDim, MPIcomm)
use yowSidepool, only: ns, ns_global
use yowExchangeModule, only: nConnDomains, setDimSize
use yowRankModule, only: initRankModule, ipgl_npa
#ifdef W3_MEMCHECK
USE MallocInfo_m
USE W3ADATMD, ONLY: MALLINFOS
#endif

implicit none
integer, intent(in) :: MNP, MNE
integer, intent(in) :: INE_global(3,MNE)
integer, intent(in) :: secDim
integer, intent(in) :: MPIcomm
integer istat
integer :: istat, memunit

! note: myrank=0 until after initMPI is called, so only rank=0 file
! contains the 'section 1' information
memunit = 70000+myrank

call setDimSize(secDim)
#ifdef W3_MEMCHECK
WRITE(70000+myrank,*) 'memcheck_____:', 'WW3_PDLIB SECTION 1'
call getMallocInfo(mallinfos)
call printMallInfo(70000+myrank,mallInfos)
#endif
call print_memcheck(memunit, 'memcheck_____:'//' WW3_PDLIB SECTION 1')
#ifdef W3_DEBUGINIT
Print *, '1: MPIcomm=', MPIcomm
#endif
call initMPI(MPIcomm)
#ifdef W3_MEMCHECK
WRITE(70000+myrank,*) 'memcheck_____:', 'WW3_PDLIB SECTION 2'
call getMallocInfo(mallinfos)
call printMallInfo(70000+myrank,mallInfos)
#endif

memunit = 70000+myrank
call print_memcheck(memunit, 'memcheck_____:'//' WW3_PDLIB SECTION 2')
#ifdef W3_DEBUGINIT
Print *, '2: After initMPI'
#endif
call assignMesh(MNP, MNE)
#ifdef W3_MEMCHECK
WRITE(70000+myrank,*) 'memcheck_____:', 'WW3_PDLIB SECTION 3'
call getMallocInfo(mallinfos)
call printMallInfo(70000+myrank,mallInfos)
#endif
call print_memcheck(memunit, 'memcheck_____:'//' WW3_PDLIB SECTION 3')
#ifdef W3_DEBUGINIT
Print *, '3: After assignMesh'
#endif
call prePartition()
#ifdef W3_MEMCHECK
WRITE(70000+myrank,*) 'memcheck_____:', 'WW3_PDLIB SECTION 4'
call getMallocInfo(mallinfos)
call printMallInfo(70000+myrank,mallInfos)
#endif
call print_memcheck(memunit, 'memcheck_____:'//' WW3_PDLIB SECTION 4')
#ifdef W3_DEBUGINIT
Print *, '3: After prePartition'
#endif
call findConnNodes(INE_global)
#ifdef W3_MEMCHECK
WRITE(70000+myrank,*) 'memcheck_____:', 'WW3_PDLIB SECTION 5'
call getMallocInfo(mallinfos)
call printMallInfo(70000+myrank,mallInfos)
#endif
call print_memcheck(memunit, 'memcheck_____:'//' WW3_PDLIB SECTION 5')
#ifdef W3_DEBUGINIT
Print *, '4: After findConnNodes'
#endif
Expand All @@ -144,66 +125,37 @@ subroutine initFromGridDim(MNP, MNE, INE_global, secDim, MPIcomm)
#endif
! CALL REAL_MPI_BARRIER_PDLIB(MPIcomm, "Before call to runParmetis")
call runParmetis(MNP)
#ifdef W3_MEMCHECK
WRITE(70000+myrank,*) 'memcheck_____:', 'WW3_PDLIB SECTION 6'
call getMallocInfo(mallinfos)
call printMallInfo(70000+myrank,mallInfos)
#endif
call print_memcheck(memunit, 'memcheck_____:'//' WW3_PDLIB SECTION 6')
! CALL REAL_MPI_BARRIER_PDLIB(MPIcomm, "After call to runParmetis")
#ifdef W3_DEBUGINIT
Print *, '5: After runParmetis'
#endif
call postPartition
#ifdef W3_MEMCHECK
WRITE(70000+myrank,*) 'memcheck_____:', 'WW3_PDLIB SECTION 7'
call getMallocInfo(mallinfos)
call printMallInfo(70000+myrank,mallInfos)
#endif
call print_memcheck(memunit, 'memcheck_____:'//' WW3_PDLIB SECTION 7')
#ifdef W3_DEBUGINIT
Print *, 'Before findGhostNodes'
#endif
call findGhostNodes
#ifdef W3_MEMCHECK
WRITE(70000+myrank,*) 'memcheck_____:', 'WW3_PDLIB SECTION 8'
call getMallocInfo(mallinfos)
call printMallInfo(70000+myrank,mallInfos)
#endif
call print_memcheck(memunit, 'memcheck_____:'//' WW3_PDLIB SECTION 8')

call findConnDomains
#ifdef W3_MEMCHECK
WRITE(70000+myrank,*) 'memcheck_____:', 'WW3_PDLIB SECTION 9'
call getMallocInfo(mallinfos)
call printMallInfo(70000+myrank,mallInfos)
#endif
call print_memcheck(memunit, 'memcheck_____:'//' WW3_PDLIB SECTION 9')

call exchangeGhostIds
#ifdef W3_MEMCHECK
WRITE(70000+myrank,*) 'memcheck_____:', 'WW3_PDLIB SECTION 10'
call getMallocInfo(mallinfos)
call printMallInfo(70000+myrank,mallInfos)
#endif
call print_memcheck(memunit, 'memcheck_____:'//' WW3_PDLIB SECTION 10')

call postPartition2(INE_global)
#ifdef W3_MEMCHECK
WRITE(70000+myrank,*) 'memcheck_____:', 'WW3_PDLIB SECTION 11'
call getMallocInfo(mallinfos)
call printMallInfo(70000+myrank,mallInfos)
#endif
call print_memcheck(memunit, 'memcheck_____:'//' WW3_PDLIB SECTION 11')

call initRankModule
#ifdef W3_MEMCHECK
WRITE(70000+myrank,*) 'memcheck_____:', 'WW3_PDLIB SECTION 12'
call getMallocInfo(mallinfos)
call printMallInfo(70000+myrank,mallInfos)
#endif
call print_memcheck(memunit, 'memcheck_____:'//' WW3_PDLIB SECTION 12')

call ComputeTRIA_IEN_SI_CCON
#ifdef W3_MEMCHECK
WRITE(70000+myrank,*) 'memcheck_____:', 'WW3_PDLIB SECTION 13'
call getMallocInfo(mallinfos)
call printMallInfo(70000+myrank,mallInfos)
#endif
call print_memcheck(memunit, 'memcheck_____:'//' WW3_PDLIB SECTION 13')

call ComputeIA_JA_POSI_NNZ
#ifdef W3_MEMCHECK
WRITE(70000+myrank,*) 'memcheck_____:', 'WW3_PDLIB SECTION 14'
call getMallocInfo(mallinfos)
call printMallInfo(70000+myrank,mallInfos)
#endif
call print_memcheck(memunit, 'memcheck_____:'//' WW3_PDLIB SECTION 14')

if(debugPostPartition) then
if(myrank == 0) then
write(*,*) "New data after partition"
Expand All @@ -223,7 +175,7 @@ end subroutine initFromGridDim


SUBROUTINE REAL_MPI_BARRIER_PDLIB(TheComm, string)
IMPLICIT NONE

INCLUDE "mpif.h"
integer, intent(in) :: TheComm
character(*), intent(in) :: string
Expand Down Expand Up @@ -259,7 +211,7 @@ subroutine initMPI(MPIcomm)
use yowDatapool, only: comm, nTasks, myrank
use yowerr
use MPI
implicit none

integer, intent(in) :: MPIcomm
logical :: flag
integer :: ierr
Expand Down Expand Up @@ -306,7 +258,7 @@ subroutine assignMesh(MNP, MNE)
use yowNodepool, only: nodes_global, np_global
use yowElementpool, only: ne_global
use yowerr, only: parallel_abort
implicit none

integer, intent(in) :: MNP, MNE
!integer, intent(in) :: INE(3,MNE)
integer :: stat, i
Expand Down Expand Up @@ -341,7 +293,6 @@ subroutine prePartition
use yowDatapool, only: nTasks ,myrank
use yowerr, only: parallel_abort
use yowNodepool, only: np_global, np, np_perProc, np_perProcSum, iplg
implicit none

integer :: i, stat

Expand Down Expand Up @@ -392,7 +343,6 @@ subroutine findConnNodes(INE_global)
use yowNodepool, only: np, np_global, nodes_global, nodes, maxConnNodes, t_Node, connNodes_data
use yowElementpool, only: ne_global
use yowSidepool, only: ns, ns_global
implicit none

integer, intent(in) :: INE_global(3,ne_global)
integer :: i, j, stat
Expand Down Expand Up @@ -476,7 +426,7 @@ subroutine runParmetis(MNP)
use yowElementpool, only: ne, ne_global
use w3gdatmd, only: xgrd, ygrd
use MPI
implicit none

integer, intent(in) :: MNP

! Parmetis
Expand Down Expand Up @@ -820,7 +770,6 @@ subroutine postPartition
use yowDatapool, only: myrank, nTasks
use yowNodepool, only: np_global, np, nodes_global, nodes, np_perProc, np_perProcSum, iplg, ipgl, t_Node
use yowSidepool, only: ns
implicit none

integer :: i, j, stat
type(t_Node), pointer :: node
Expand Down Expand Up @@ -883,7 +832,7 @@ subroutine findGhostNodes
use yowerr, only: parallel_abort
use yowDatapool, only: myrank
use yowNodepool, only: t_Node, np, nodes, ghosts, nodes_global, ng, ghostlg, ghostgl, npa, np_global, iplg
implicit none

integer :: i, j, k, stat
type(t_Node), pointer :: node, nodeNeighbor, nodeGhost
!> temporary hold the ghost numbers
Expand Down Expand Up @@ -1007,7 +956,6 @@ subroutine findConnDomains
use yowNodepool, only: ghosts, ng, t_Node
use yowDatapool, only: nTasks, myrank
use yowExchangeModule, only: neighborDomains, initNbrDomains
implicit none

integer :: i, stat, itemp
type(t_Node), pointer :: ghost
Expand Down Expand Up @@ -1093,7 +1041,6 @@ subroutine exchangeGhostIds
use yowDatapool, only: nTasks, myrank, comm
use yowExchangeModule, only: neighborDomains, nConnDomains, createMPITypes
use MPI
implicit none

integer :: i, j, k
integer :: ierr
Expand Down Expand Up @@ -1224,7 +1171,7 @@ subroutine postPartition2(INE_global)
use yowNodepool, only: np_global, np, nodes_global, iplg, t_Node, ghostlg, ng, npa
use yowNodepool, only: x, y, z
use w3gdatmd, only: xgrd, ygrd, zb
implicit none

integer, intent(in) :: INE_global(3,ne_global)

integer :: i, j, k, stat, IP_glob
Expand Down Expand Up @@ -1347,7 +1294,7 @@ subroutine ComputeTRIA_IEN_SI_CCON
use yowDatapool, only: myrank
use yowNodepool, only: np_global, np, iplg, t_Node, ghostlg, ng, npa
use yowNodepool, only: x, y, z, PDLIB_SI, PDLIB_IEN, PDLIB_TRIA, PDLIB_CCON, PDLIB_TRIA03
implicit none

integer I1, I2, I3, stat, IE, NI(3)
real(rkind) :: DXP1, DXP2, DXP3, DYP1, DYP2, DYP3, DBLTMP, TRIA03
logical :: CROSSES_DATELINE
Expand Down Expand Up @@ -1409,7 +1356,7 @@ subroutine ELEMENT_CROSSES_DATELINE(RX1, RX2, RX3, CROSSES_DATELINE)
! Purpose: understanding if an element crosses the dateline.
! An element crossing the dateline has, e.g. a node with lon < 180
! and another 2 with lon > -180
IMPLICIT NONE

REAL(rkind), INTENT(IN) :: RX1, RX2, RX3
LOGICAL, INTENT(OUT) :: CROSSES_DATELINE
INTEGER :: R1GT180, R2GT180, R3GT180
Expand All @@ -1428,7 +1375,7 @@ subroutine CORRECT_DX_GT180(DXP)
! Purpose: the absolute zonal distance between 2 points is always <= 180
! This subroutine corrects the zonal distance to satifsy
! this requirement
IMPLICIT NONE

REAL(rkind), INTENT(INOUT) :: DXP
IF (DXP .le. -180) THEN
DXP=DXP + 360
Expand All @@ -1448,7 +1395,7 @@ subroutine ComputeIA_JA_POSI_NNZ
use yowNodepool, only: PDLIB_CCON, PDLIB_IA, PDLIB_JA, PDLIB_JA_IE, PDLIB_IA_P, PDLIB_JA_P
use yowNodepool, only: PDLIB_NNZ, PDLIB_POSI, PDLIB_IE_CELL, PDLIB_POS_CELL, PDLIB_IE_CELL2
use yowNodepool, only: PDLIB_POS_CELL2, PDLIB_I_DIAG
IMPLICIT NONE

integer CHILF(npa)
integer istat
integer MAXMNECON
Expand Down Expand Up @@ -1639,7 +1586,6 @@ subroutine finalizePD()
use yowNodepool, only: finalizeNodepool
use yowElementpool, only: finalizeElementpool
use yowRankModule, only: finalizeRankModule
implicit none

call finalizeRankModule()
call finalizeExchangeModule()
Expand Down
Loading