Skip to content
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

optimize do loops #979

Merged
merged 4 commits into from
Apr 12, 2023
Merged

optimize do loops #979

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6aeea3
fix for block_explicit
DeniseWorthen Apr 7, 2023
ba748aa
re-align comments
DeniseWorthen Apr 7, 2023
fa04bec
switch loop ordering
DeniseWorthen Apr 10, 2023
47cbb11
Merge remote-tracking branch 'origin/develop' into feature/optimizelo…
DeniseWorthen Apr 11, 2023
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
37 changes: 19 additions & 18 deletions model/src/w3profsmd_pdlib.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6435,20 +6435,20 @@ SUBROUTINE PDLIB_EXPLICIT_BLOCK(IMOD, FACX, FACY, DTG, VGX, VGY, LCALC)
CALL WAVNU3 (SIG(IK), DW(iplg(IP)), KSIG(IP), CGSIG(IP))
ENDDO

DO ITH = 1, NTH
DO IP = 1, NPA
DO IP = 1, NPA
DO ITH = 1, NTH
ISEA = IPLG(IP)
CXX(ITH,IP) = CGSIG(IP) * FACX * ECOS(ITH) / CLATS(ISEA)
CYY(ITH,IP) = CGSIG(IP) * FACY * ESIN(ITH)
ENDDO
ENDDO ! ith
IF (FLCUR) THEN
DO IP = 1, NPA
DO ITH = 1, NTH
ISEA = IPLG(IP)
IF (IOBP_LOC(IP) .GT. 0) THEN
CXX(ITH,IP) = CXX(ITH,IP) + FACX * CX(ISEA)/CLATS(ISEA)
CYY(ITH,IP) = CYY(ITH,IP) + FACY * CY(ISEA)
ENDIF
ENDDO
ENDDO !ith
ENDIF
ENDDO

Expand Down Expand Up @@ -6538,12 +6538,13 @@ SUBROUTINE PDLIB_EXPLICIT_BLOCK(IMOD, FACX, FACY, DTG, VGX, VGY, LCALC)
END IF ! LCALC

! Exact and convert Wave Action - should be some subroutine function or whatever
DO ITH = 1, NTH
ISP = ITH + (IK-1) * NTH
DO IP = 1, NPA
U(ITH,IP) = VA(ISP,IP) / CGSIG(IP) * CLATS(IPLG(IP))
ENDDO
ENDDO
do ip = 1,npa
isp = 0
do ith = 1,nth
isp = ith + (ik-1)*nth
u(ith,ip) = va(isp,ip) / cgsig(ip) * clats(iplg(ip))
enddo
enddo
UOLD = U

DO IT = 1, ITER(IK)
Expand All @@ -6559,7 +6560,6 @@ SUBROUTINE PDLIB_EXPLICIT_BLOCK(IMOD, FACX, FACY, DTG, VGX, VGY, LCALC)
END DO ! IE
DO IP = 1, NP
DO ITH = 1, NTH
ISP = ITH + (IK-1) * NTH
U(ITH,IP) = MAX(ZERO,U(ITH,IP)-DTSI(IP)*ST(ITH,IP)*(1-IOBPA_LOC(IP)))*IOBPD_LOC(ITH,IP)*IOBDP_LOC(IP)
#ifdef W3_REF1
IF (REFPARS(3).LT.0.5.AND.IOBPD_LOC(ITH,IP).EQ.0.AND.IOBPA_LOC(IP).EQ.0) U(ITH,IP) = UOLD(ITH,IP) ! restores reflected boundary values
Expand Down Expand Up @@ -6594,12 +6594,13 @@ SUBROUTINE PDLIB_EXPLICIT_BLOCK(IMOD, FACX, FACY, DTG, VGX, VGY, LCALC)
ENDDO ! IT

! Exact and convert Wave Action
DO ITH = 1, NTH
ISP = ITH + (IK-1) * NTH
DO IP = 1, NPA
VA(ISP,IP) = U(ITH,IP) * CGSIG(IP) / CLATS(IPLG(IP))
ENDDO
ENDDO
do ip = 1,npa
isp = 0
do ith = 1,nth
isp = ith + (ik-1)*nth
va(isp,ip) = u(ith,ip) * cgsig(ip) / clats(iplg(ip))
end do
end do

ENDDO ! IK

Expand Down