Skip to content

Avoid ST6 IRANGE heap allocations in source loops #16

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
ezhilsabareesh8 merged 5 commits into from
Jul 6, 2026
Merged

Avoid ST6 IRANGE heap allocations in source loops #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a48d6e8
Avoid ST6 IRANGE heap allocations in source loops
ezhilsabareesh8 Jun 26, 2026
65b55f7
Remove the explicit DEALLOCATE block
ezhilsabareesh8 Jul 2, 2026
a4e8ae0
Avoid ST6 IRANGE heap allocations in source loops
ezhilsabareesh8 Jul 2, 2026
ad9870e
Remove IRANGE
ezhilsabareesh8 Jul 2, 2026
10fa061
Remove the explicit DEALLOCATE block
ezhilsabareesh8 Jul 2, 2026
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
73 changes: 14 additions & 59 deletions model/src/w3src6md.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ MODULE W3SRC6MD
! W3SIN6 Subr. Public Observation-based wind input.
! W3SDS6 Subr. Public Observation-based dissipation.
!
! IRANGE Func. Private Generate a sequence of integer values.
! LFACTOR Func. Private Calculate reduction factor for Sin.
! TAUWINDS Func. Private Normal stress calculation for Sin.
! ----------------------------------------------------------------
Expand All @@ -97,7 +96,7 @@ MODULE W3SRC6MD
!/ ------------------------------------------------------------------- /
!/
PUBLIC :: W3SPR6, W3SIN6, W3SDS6
PRIVATE :: LFACTOR, TAUWINDS, IRANGE
PRIVATE :: LFACTOR, TAUWINDS
CONTAINS
!/ ------------------------------------------------------------------- /

Expand Down Expand Up @@ -343,7 +342,6 @@ SUBROUTINE W3SIN6 (A, CG, WN2, UABS, USTAR, USDIR, CD, DAIR, &
! Name Type Module Description
! ----------------------------------------------------------------
! LFACTOR Subr. W3SRC6MD
! IRANGE Func. W3SRC6MD
! STRACE Subr. W3SERVMD Subroutine tracing.
! ----------------------------------------------------------------
!
Expand Down Expand Up @@ -435,8 +433,9 @@ SUBROUTINE W3SIN6 (A, CG, WN2, UABS, USTAR, USDIR, CD, DAIR, &
ECOS2 = ECOS(1:NSPEC) ! Only indices from 1 to NSPEC
ESIN2 = ESIN(1:NSPEC) ! are requested.
!
IKN = IRANGE(1,NSPEC,NTH) ! Index vector for elements of 1 ... NK
! ! such that e.g. SIG(1:NK) = SIG2(IKN).
DO IK = 1, NK
IKN(IK) = 1 + (IK-1)*NTH
END DO
DSII2 = DDEN2 / DTH / SIG2 ! Frequency bandwidths (int.) (rad)
DSII = DSII2(IKN)
SIG = SIG2(IKN)
Expand Down Expand Up @@ -673,9 +672,9 @@ SUBROUTINE W3SDS6 (A, CG, WN, S, D)
#endif
!
!/ 0) --- Initialize essential parameters ---------------------------- /
IKN = IRANGE(1,NSPEC,NTH) ! Index vector for elements of 1,
! ! 2,..., NK such that for example
! ! SIG(1:NK) = SIG2(IKN).
DO IK = 1, NK
IKN(IK) = 1 + (IK-1)*NTH
END DO
FREQ = SIG2(IKN)/TPI
ANAR = 1.0
BNT = 0.035**2
Expand Down Expand Up @@ -833,7 +832,6 @@ SUBROUTINE LFACTOR(S, CINV, U10, USTAR, USDIR, SIG, DSII, &
! Name Type Scope Description
! ----------------------------------------------------------------
! STRACE Subr. W3SERVMD Subroutine tracing.
! IRANGE Func. Private Index generator (ie, array addressing)
! TAUWINDS Func. Private Normal stress calculation (TAU_NRM)
! ----------------------------------------------------------------
!
Expand Down Expand Up @@ -899,7 +897,9 @@ SUBROUTINE LFACTOR(S, CINV, U10, USTAR, USDIR, SIG, DSII, &
NK10Hz = MAX(NK,NK10Hz)
!
ALLOCATE(IK10Hz(NK10Hz))
IK10Hz = REAL( IRANGE(1,NK10Hz,1) )
DO IK = 1, NK10Hz
IK10Hz(IK) = REAL(IK)
END DO
!
ALLOCATE(SIG10Hz(NK10Hz))
ALLOCATE(CINV10Hz(NK10Hz))
Expand Down Expand Up @@ -1108,7 +1108,6 @@ SUBROUTINE TAU_WAVE_ATMOS(S, CINV, SIG, DSII, TAUNWX, TAUNWY )
! Name Type Scope Description
! ----------------------------------------------------------------
! STRACE Subr. W3SERVMD Subroutine tracing.
! IRANGE Func. Private Index generator (ie, array addressing)
! TAUWINDS Func. Private Normal stress calculation (TAU_NRM)
! ----------------------------------------------------------------
!
Expand All @@ -1134,7 +1133,7 @@ SUBROUTINE TAU_WAVE_ATMOS(S, CINV, SIG, DSII, TAUNWX, TAUNWY )
INTEGER, SAVE :: IENT = 0
#endif
REAL, PARAMETER :: FRQMAX = 10. ! Upper freq. limit to extrapolate to.
INTEGER :: NK10Hz
INTEGER :: NK10Hz, I
!
REAL :: ECOS2(NSPEC), ESIN2(NSPEC)
REAL, ALLOCATABLE :: IK10Hz(:), SIG10Hz(:), CINV10Hz(:)
Expand All @@ -1152,7 +1151,9 @@ SUBROUTINE TAU_WAVE_ATMOS(S, CINV, SIG, DSII, TAUNWX, TAUNWY )
NK10Hz = MAX(NK,NK10Hz)
!
ALLOCATE(IK10Hz(NK10Hz))
IK10Hz = REAL( IRANGE(1,NK10Hz,1) )
DO I = 1, NK10Hz
IK10Hz(I) = REAL(I)
END DO
!
ALLOCATE(SIG10Hz(NK10Hz))
ALLOCATE(CINV10Hz(NK10Hz))
Expand Down Expand Up @@ -1198,52 +1199,6 @@ END SUBROUTINE TAU_WAVE_ATMOS
!/ ------------------------------------------------------------------- /
!/

!>
!> @brief Generate a sequence of linear-spaced integer numbers.
!>
!> @details Used for instance array addressing (indexing).
!>
!> @param X0
!> @param X1
!> @param DX
!> @returns IX
!>
!> @author S. Zieger
!> @date 15-Feb-2011
!>
FUNCTION IRANGE(X0,X1,DX) RESULT(IX)
!/
!/ +-----------------------------------+
!/ | WAVEWATCH III NOAA/NCEP |
!/ | S. Zieger |
!/ | FORTRAN 90 |
!/ | Last update : 15-Feb-2011 |
!/ +-----------------------------------+
!/
!/ 15-Feb-2011 : Origination ( version 4.04 )
!/ (S. Zieger)
!/
! 1. Purpose :
! Generate a sequence of linear-spaced integer numbers.
! Used for instance array addressing (indexing).
!
!/
IMPLICIT NONE
INTEGER, INTENT(IN) :: X0, X1, DX
INTEGER, ALLOCATABLE :: IX(:)
INTEGER :: N
INTEGER :: I
!
N = INT(REAL(X1-X0)/REAL(DX))+1
ALLOCATE(IX(N))
DO I = 1, N
IX(I) = X0+ (I-1)*DX
END DO
!/
END FUNCTION IRANGE
!/ ------------------------------------------------------------------- /
!/

!>
!> @brief Wind stress (tau) computation from wind-momentum-input.
!>
Expand Down
62 changes: 7 additions & 55 deletions model/src/w3swldmd.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ MODULE W3SWLDMD
! W3SWL4 Subr. Public Ardhuin et al (2010+) swell dissipation
! W3SWL6 Subr. Public Babanin (2011) swell dissipation
!
! IRANGE Func. Private Generate a sequence of integer values
! ----------------------------------------------------------------
!
! 4. Subroutines and functions used :
Expand All @@ -71,7 +70,6 @@ MODULE W3SWLDMD
!/ ------------------------------------------------------------------- /
!/
PUBLIC :: W3SWL4, W3SWL6
PRIVATE :: IRANGE
!/
CONTAINS
!/ ------------------------------------------------------------------- /
Expand Down Expand Up @@ -126,7 +124,6 @@ SUBROUTINE W3SWL4 (A, CG, WN, DAIR, S, D)
!
! Name Type Module Description
! ----------------------------------------------------------------
! IRANGE Func. W3SWLDMD
! STRACE Subr. W3SERVMD Subroutine tracing.
! ----------------------------------------------------------------
!
Expand Down Expand Up @@ -174,7 +171,7 @@ SUBROUTINE W3SWL4 (A, CG, WN, DAIR, S, D)
#ifdef W3_S
INTEGER, SAVE :: IENT = 0
#endif
INTEGER :: IKN(NK), ITH
INTEGER :: IKN(NK), ITH, IK
REAL, PARAMETER :: VA = 1.4E-5 ! Air kinematic viscosity (used in WAM).
REAL :: EB(NK), WN2(NSPEC), EMEAN
REAL :: FE, AORB, RE, RECRIT, UOSIG, CDSV
Expand All @@ -185,7 +182,9 @@ SUBROUTINE W3SWL4 (A, CG, WN, DAIR, S, D)
CALL STRACE (IENT, 'W3SWL4')
#endif
!
IKN = IRANGE(1,NSPEC,NTH)
DO IK = 1, NK
IKN(IK) = 1 + (IK-1)*NTH
END DO
D = 0.
WN2 = 0.
!
Expand Down Expand Up @@ -288,7 +287,6 @@ SUBROUTINE W3SWL6 (A, CG, WN, S, D)
!
! Name Type Module Description
! ----------------------------------------------------------------
! IRANGE Func. W3SWLDMD
! STRACE Subr. W3SERVMD Subroutine tracing.
! ----------------------------------------------------------------
!
Expand Down Expand Up @@ -351,8 +349,9 @@ SUBROUTINE W3SWL6 (A, CG, WN, S, D)
#endif
!
!/ 0) --- Initialize parameters -------------------------------------- /
IKN = IRANGE(1,NSPEC,NTH) ! Index vector for array access, e.g.
! ! in form of WN(1:NK) == WN2(IKN).
DO IK = 1, NK
IKN(IK) = 1 + (IK-1)*NTH
END DO
ABAND = SUM(RESHAPE(A,(/ NTH,NK /)),1) ! action density as function of wavenumber
DDIS = 0.
D = 0.
Expand Down Expand Up @@ -413,51 +412,4 @@ SUBROUTINE W3SWL6 (A, CG, WN, S, D)
END SUBROUTINE W3SWL6
!/ ------------------------------------------------------------------- /
!/
!>
!> @brief Generate a linear-spaced sequence of integer numbers.
!>
!> @details Used for array addressing (indexing).
!>
!> @param X0
!> @param X1
!> @param DX
!> @returns IX
!>
!> @author H. L. Tolman
!> @author S. Zieger
!> @date 15-Feb-2011
!>
FUNCTION IRANGE(X0,X1,DX) RESULT(IX)
!/
!/ +-----------------------------------+
!/ | WAVEWATCH III NOAA/NCEP |
!/ | H. L. Tolman |
!/ | S. Zieger |
!/ | FORTRAN 90 |
!/ | Last update : 15-Feb-2011 |
!/ +-----------------------------------+
!/
!/ 15-Feb-2011 : Origination from W3SRC6MD ( version 4.07 )
!/ (S. Zieger)
!/
! 1. Purpose :
! Generate a linear-spaced sequence of integer
! numbers. Used for array addressing (indexing).
!
!/
IMPLICIT NONE
INTEGER, INTENT(IN) :: X0, X1, DX
INTEGER, ALLOCATABLE :: IX(:)
INTEGER :: N
INTEGER :: I
!
N = INT(REAL(X1-X0)/REAL(DX))+1
ALLOCATE(IX(N))
DO I = 1, N
IX(I) = X0+ (I-1)*DX
END DO
!/
END FUNCTION IRANGE
!/ ------------------------------------------------------------------- /
!/
END MODULE W3SWLDMD
Loading