Skip to content

EFDC: Remove OpenMP parallelisation AIX version #239

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

Open
wkramer wants to merge 3 commits into
base: master
Choose a base branch
from
Open

EFDC: Remove OpenMP parallelisation AIX version #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d36cb5
EFDC: Remove OpenMP parallelisation AIX version
vt-max Dec 6, 2022
2166c0e
fixup: Remove OMP loops in additional files
vt-max Dec 12, 2022
a06b512
Remove OMP loop around buoyancy initialisation
vt-max Dec 12, 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
10 changes: 1 addition & 9 deletions model_efdc_dll/native/efdc_fortran_dll/openDA_wrapper/model_init_3.for
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,15 +714,7 @@ C
C
C ** INITIALIZE BUOYANCY AND EQUATION OF STATE
C
!$OMP PARALLEL DO PRIVATE(LF,LL)

do ithds=0,nthds-1
LF=jse(1,ithds)
LL=jse(2,ithds)
c
CALL CALBUOY(LF,LL)
c
enddo
CALL CALBUOY
C
C ** INITIALIZE SFL IF(ISRESTI.EQ.0.AND ISTRAN(4).GE.1)
C
Expand Down
62 changes: 8 additions & 54 deletions model_efdc_dll/native/efdc_fortran_dll/original_efdc_files/BAL2T3A.for
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ C
IMPLICIT NONE
INTEGER::LD,K,L,NSX,NS,NWR,NCTL,ID,JD,KU,NT,M,JU,LU,KD,LL,NQSTMP
INTEGER::IU,NCSTMP
INTEGER::LF,ithds
REAL::RQWD

IF(ISDYNSTP.EQ.0)THEN
Expand All @@ -23,20 +22,12 @@ C
C
C ** ACCUMULATE INTERNAL SOURCES AND SINKS
C
!$OMP PARALLEL DO PRIVATE(LF,LL) REDUCTION(-:VOLOUT,WVOLOUT)
do ithds=0,nthds-1
LF=jse(1,ithds)
LL=jse(2,ithds)
c
DO L=LF,LL
DO L=2,LA
VOLOUT=VOLOUT-DELT*(QSUME(L)-QDWASTE(L))
c ENDDO
c DO L=2,LA
ENDDO
DO L=2,LA
WVOLOUT=WVOLOUT-DELT*(QSUME(L)-QDWASTE(L))
ENDDO
c
enddo

DO K=1,KC
DO LL=1,NQSIJ
L=LQS(LL)
Expand All @@ -45,19 +36,11 @@ c
ENDDO
ENDDO
IF(ISTRAN(1).GE.1)THEN
!$OMP PARALLEL DO PRIVATE(LF,LL)
do ithds=0,nthds-1
LF=jse_2_LC(1,ithds)
LL=jse_2_LC(2,ithds)
c
DO K=1,KC
DO L=LF,LL
DO L=2,LC
CONT(L,K)=SAL1(L,K)
ENDDO
ENDDO
c
enddo

DO NS=1,NQSIJ
L=LQS(NS)
NQSTMP=NQSERQ(NS)
Expand Down Expand Up @@ -104,19 +87,11 @@ c
ENDDO
ENDIF
IF(ISTRAN(3).GE.1)THEN
!$OMP PARALLEL DO PRIVATE(LF,LL)
do ithds=0,nthds-1
LF=jse_2_LC(1,ithds)
LL=jse_2_LC(2,ithds)
c
DO K=1,KC
DO L=LF,LL
DO L=2,LC
CONT(L,K)=DYE1(L,K)
ENDDO
ENDDO
c
enddo

DO NS=1,NQSIJ
L=LQS(NS)
NQSTMP=NQSERQ(NS)
Expand Down Expand Up @@ -176,18 +151,11 @@ c
IF(ISTRAN(5).GE.1)THEN
DO NT=1,NTOX
M=MSVTOX(NT)
!$OMP PARALLEL DO PRIVATE(LF,LL)
do ithds=0,nthds-1
LF=jse_2_LC(1,ithds)
LL=jse_2_LC(2,ithds)
c
DO K=1,KC
DO L=LF,LL
DO L=2,LC
CONT(L,K)=TOX1(L,K,NT)
ENDDO
ENDDO
c
enddo
C
C TOXOUT2T(NT) IS NET TOXIC MASS GOING OUT OF DOMAIN DUE
C TO WATER COLUMN VOLUME SOURCES AND SINKS
Expand Down Expand Up @@ -241,18 +209,11 @@ C
IF(ISTRAN(6).GE.1)THEN
DO NSX=1,NSED
M=MSVSED(NSX)
!$OMP PARALLEL DO PRIVATE(LF,LL)
do ithds=0,nthds-1
LF=jse_2_LC(1,ithds)
LL=jse_2_LC(2,ithds)
c
DO K=1,KC
DO L=LF,LL
DO L=2,LC
CONT(L,K)=SED1(L,K,NSX)
ENDDO
ENDDO
c
enddo
C
C SEDOUT2T(NSX) IS IS NET COHESIVE MASS GOING OUT OF DOMAIN DUE
C TO WATER COLUMN VOLUME SOURCES AND SINKS
Expand Down Expand Up @@ -306,18 +267,11 @@ C
IF(ISTRAN(7).GE.1)THEN
DO NSX=1,NSND
M=MSVSND(NSX)
!$OMP PARALLEL DO PRIVATE(LF,LL)
do ithds=0,nthds-1
LF=jse_2_LC(1,ithds)
LL=jse_2_LC(2,ithds)
c
DO K=1,KC
DO L=LF,LL
DO L=2,LC
CONT(L,K)=SND1(L,K,NSX)
ENDDO
ENDDO
c
enddo
C
C SNDOUT2T(NSX) IS NET NONCOHESIVE MASS GOING OUT OF DOMAIN DUE
C TO WATER COLUMN VOLUME SOURCES AND SINKS
Expand Down
37 changes: 4 additions & 33 deletions model_efdc_dll/native/efdc_fortran_dll/original_efdc_files/BAL2T3B.for
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,36 +20,21 @@ C
C ** ACCUMULATE INTERNAL SOURCES AND SINKS
C
IF(IBALSTDT.EQ.1)THEN
!$OMP PARALLEL DO PRIVATE(LF,LL) REDUCTION(-:WVOLOUT)
!$OMP& REDUCTION(+:BVOLOUT,VOLMORPH2T)
do ithds=0,nthds-1
LF=jse(1,ithds)
LL=jse(2,ithds)
c
DO L=LF,LL
DO L=2,LA
WVOLOUT=WVOLOUT-DTSED*QMORPH(L)
BVOLOUT=BVOLOUT+DTSED*QMORPH(L)
VOLMORPH2T=VOLMORPH2T+DTSED*QMORPH(L)
ENDDO
c
enddo
ENDIF
IF(ISTRAN(5).GE.1)THEN
DO NT=1,NTOX
M=MSVTOX(NT)
WRITE(8,*)'NT M ',NT,M
!$OMP PARALLEL DO PRIVATE(LF,LL)
do ithds=0,nthds-1
LF=jse_2_LC(1,ithds)
LL=jse_2_LC(2,ithds)
c
DO K=1,KC
DO L=LF,LL
DO L=2,LC
CONT(L,K)=TOX(L,K,NT)
ENDDO
ENDDO
c
enddo
C
C TOXBLB2T(NT) IS NET TOXIC MASS GOING OUT OF DOMAIN DUE
C DUE TO BED LOAD TRANSPORT OUT OF DOMAIN
Expand Down Expand Up @@ -79,18 +64,11 @@ C
IF(ISTRAN(6).GE.1)THEN
DO NSX=1,NSED
M=MSVSED(NSX)
!$OMP PARALLEL DO PRIVATE(LF,LL)
do ithds=0,nthds-1
LF=jse_2_LC(1,ithds)
LL=jse_2_LC(2,ithds)
c
DO K=1,KC
DO L=LF,LL
DO L=2,LC
CONT(L,K)=SED(L,K,NSX)
ENDDO
ENDDO
c
enddo
C
C SEDFLUX2T(NSX) IS IS NET COHESIVE MASS FLUX POSITIVE FROM BED
C TO WATER COLUMN
Expand All @@ -105,18 +83,11 @@ C
IF(ISTRAN(7).GE.1)THEN
DO NSX=1,NSND
M=MSVSND(NSX)
!$OMP PARALLEL DO PRIVATE(LF,LL)
do ithds=0,nthds-1
LF=jse_2_LC(1,ithds)
LL=jse_2_LC(2,ithds)
c
DO K=1,KC
DO L=LF,LL
DO L=2,LC
CONT(L,K)=SND(L,K,NSX)
ENDDO
ENDDO
c
enddo
C
C SBLOUT2T(NSX) IS NET NONCOHESIVE SEDIMENT MASS GOING OUT OF DOMAIN DU
C DUE TO BED LOAD TRANSPORT OUT OF DOMAIN
Expand Down
12 changes: 2 additions & 10 deletions model_efdc_dll/native/efdc_fortran_dll/original_efdc_files/BAL2T4.for
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,15 @@ C
C
C ** CALCULATE MOMENTUM AND ENERGY DISSIPATION
C
!$OMP PARALLEL DO PRIVATE(LF,LL,LN,DUTMP,DVTMP)
!$OMP& REDUCTION(+:UUEOUT,VVEOUT,BBEOUT)
do ithds=0,nthds-1
LF=jse(1,ithds)
LL=jse(2,ithds)
c
DO L=LF,LL
DO L=2,LA
LN=LNC(L)
UUEOUT=UUEOUT+0.5*DELT*SPB(L)*DXYP(L)*(U(L,1)*TBX(L)
& +U(L+1,1)*TBX(L+1)-U(L,KC)*TSX(L)-U(L+1,KC)*TSX(L+1))
VVEOUT=VVEOUT+0.5*DELT*SPB(L)*DXYP(L)*(V(L,1)*TBY(L)
& +V(LN,1)*TBX(LN)-V(L,KC)*TSY(L)-V(LN,KC)*TSX(LN))
ENDDO
DO K=1,KS
DO L=LF,LL
DO L=2,LA
LN=LNC(L)
DUTMP=0.5*( U(L,K+1)+U(L+1,K+1)-U(L,K)-U(L+1,K) )
DVTMP=0.5*( V(L,K+1)+V(LN,K+1)-V(L,K)-V(LN,K) )
Expand All @@ -43,8 +37,6 @@ c
& *GP*AB(L,K)*(B(L,K+1)-B(L,K))
ENDDO
ENDDO
c
enddo
RETURN
END

49 changes: 10 additions & 39 deletions model_efdc_dll/native/efdc_fortran_dll/original_efdc_files/CALAVB.for
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,14 @@ C
ABMIN=10.
RIQMIN=-0.023
RIQMAX=0.28
!
!$OMP PARALLEL DO PRIVATE(LF,LL)
do ithds=0,nthds-1
LF=jse_LC(1,ithds)
LL=jse_LC(2,ithds)
!
DO K=1,KC
DO L=LF,LL
DO L=1,LC
IF(IMASKDRY(L).EQ.1)THEN
AV(L,K)=AVO*HPI(L)
AB(L,K)=ABO*HPI(L)
ENDIF
ENDDO
ENDDO
!
enddo !do ithds=0,nthds-1
!$OMP END PARALLEL DO
IF(ISFAVB.EQ.0)THEN
DO K=1,KS
DO L=2,LA
Expand Down Expand Up @@ -85,17 +76,15 @@ C
ENDDO
ENDIF
IF(ISFAVB.EQ.1)THEN
!
!$OMP PARALLEL DO PRIVATE(LF,LL,RIQ,SFAV,SFAB,ABTMP,AVTMP)
!$OMP& REDUCTION(max:AVMAX,ABMAX) REDUCTION(min:AVMIN,ABMIN)
do ithds=0,nthds-1
LF=jse(1,ithds)
LL=jse(2,ithds)
DO K=1,KS
DO L=LF,LL
DO L=2,LA
IF(LMASKDRY(L))THEN
QQI(L)=1./QQ(L,K)
QQI(L)=MIN(QQI(L),QQIMAX)
ENDIF
ENDDO
DO L=2,LA
IF(LMASKDRY(L))THEN
RIQ=-GP*HP(L)*DML(L,K)*DML(L,K)*DZIG(K)
& *(B(L,K+1)-B(L,K))*QQI(L)
RIQ=MAX(RIQ,RIQMIN)
Expand All @@ -121,9 +110,6 @@ C
ENDIF
ENDDO
ENDDO
!
enddo !do ithds=0,nthds-1
!$OMP END PARALLEL DO
ENDIF
IF(ISFAVB.EQ.2)THEN
DO K=1,KS
Expand Down Expand Up @@ -159,29 +145,17 @@ C
ENDIF
! *** NOW APPLY MAXIMUM, IF REQURIED
IF(ISAVBMX.GE.1)THEN
!
!$OMP PARALLEL DO PRIVATE(LF,LL,ABTMP,AVTMP)
do ithds=0,nthds-1
LF=jse(1,ithds)
LL=jse(2,ithds)
DO K=1,KS
DO L=LF,LL
DO L=2,LA
AVTMP=AVMX*HPI(L)
ABTMP=ABMX*HPI(L)
AV(L,K)=MIN(AV(L,K),AVTMP)
AB(L,K)=MIN(AB(L,K),ABTMP)
ENDDO
ENDDO
!
enddo !do ithds=0,nthds-1
!$OMP END PARALLEL DO
ENDIF
!$OMP PARALLEL DO PRIVATE(LF,LL,LS)
do ithds=0,nthds-1
LF=jse(1,ithds)
LL=jse(2,ithds)
DO K=1,KS
DO L=LF,LL
DO L=2,LA
LS=LSC(L)
c pmc AVUI(L,K)=2./(AV(L,K)+AV(L-1,K))
c pmc AVVI(L,K)=2./(AV(L,K)+AV(LS,K))
Expand All @@ -190,17 +164,14 @@ c pmc AVVI(L,K)=2./(AV(L,K)+AV(LS,K))
ENDDO
ENDDO
DO K=2,KS
DO L=LF,LL
DO L=2,LA
AQ(L,K)=0.205*(AV(L,K-1)+AV(L,K))
ENDDO
ENDDO
DO L=LF,LL
DO L=2,LA
AQ(L,1)=0.205*AV(L,1)
AQ(L,KC)=0.205*AV(L,KS)
ENDDO
!
enddo !do ithds=0,nthds-1
!$OMP END PARALLEL DO
RETURN
END

Loading