Skip to content

Orion module update and typo fixes #1011

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
JessicaMeixner-NOAA merged 3 commits into from
May 23, 2023
Merged

Orion module update and typo fixes #1011

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
410817a
matrix_cmake_ncep: update orion 'module use' statement
MatthewMasarik-NOAA May 17, 2023
dafbee7
w3profsmd.F90: removed typo '^' character
MatthewMasarik-NOAA May 17, 2023
ce28a31
w3src3md.F90: shift comment from trailing #endif, to just before it
MatthewMasarik-NOAA May 17, 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
2 changes: 1 addition & 1 deletion model/src/w3profsmd.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ SUBROUTINE W3XYPFSN2 ( ISP, C, LCALC, RD10, RD20, DT, AC)
IF (REFPARS(3).LT.0.5.AND.IOBPD(ITH,IP).EQ.0.AND.IOBPA(IP).EQ.0) THEN
U(IP) = AC(IP) ! restores reflected boundary values
ENDIF
#endif^
#endif
END DO
! update spectrum
AC = U
Expand Down
15 changes: 8 additions & 7 deletions model/src/w3srcemd.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1424,7 +1424,7 @@ SUBROUTINE W3SRCE ( srce_call, IT, ISEA, JSEA, IX, IY, IMOD, &
#ifdef W3_PDLIB
IF (B_JGS_LIMITER_FUNC == 2) THEN
DO IK=1, NK
JAC = CG1(IK)/CLATSL
JAC = CG1(IK)/CLATSL
JAC2 = 1./TPI/SIG(IK)
FRLOCAL = SIG(IK)*TPIINV
#ifdef W3_ST6
Expand All @@ -1449,7 +1449,7 @@ SUBROUTINE W3SRCE ( srce_call, IT, ISEA, JSEA, IX, IY, IMOD, &
#ifdef W3_ST6
VS(IS) = VS(IS) + VSWL(IS)
#endif
#ifndef W3_PDLIB
#ifndef W3_PDLIB
#ifdef W3_TR1
VS(IS) = VS(IS) + VSTR(IS)
#endif
Expand Down Expand Up @@ -1491,8 +1491,8 @@ SUBROUTINE W3SRCE ( srce_call, IT, ISEA, JSEA, IX, IY, IMOD, &
#endif
END DO ! end of loop on IS

!VD = 0
!VS = 0
!VD = 0
!VS = 0
!
DT = MAX ( 0.5, DT ) ! The hardcoded min. dt is a problem for certain cases e.g. laborotary scale problems.
!
Expand Down Expand Up @@ -1702,7 +1702,8 @@ SUBROUTINE W3SRCE ( srce_call, IT, ISEA, JSEA, IX, IY, IMOD, &
RETURN ! return everything is done for the implicit ...

END IF ! srce_imp_pre
#endif !W3_PDLIB
!W3_PDLIB
#endif
!
#ifdef W3_T
WRITE (NDST,9040) DTRAW, DT, SHAVE
Expand Down Expand Up @@ -1736,7 +1737,7 @@ SUBROUTINE W3SRCE ( srce_call, IT, ISEA, JSEA, IX, IY, IMOD, &
eInc1 = VDTR(IS) * DT / MAX ( 1. , (1.-HDT*VDTR(IS)))
SPEC(IS) = MAX ( 0. , SPEC(IS)+eInc1 )
END DO
#endif
#endif

#ifdef W3_DEBUGSRC
IF (IX == DEBUG_NODE) WRITE(44,'(1EN15.4)') SUM(VSIN)
Expand Down Expand Up @@ -2257,7 +2258,7 @@ SUBROUTINE W3SRCE ( srce_call, IT, ISEA, JSEA, IX, IY, IMOD, &
IF (IX .eq. DEBUG_NODE) THEN
WRITE(740+IAPROC,*) '5 : sum(SPEC)=', sum(SPEC)
END IF
#endif
#endif

#ifdef W3_REF1
IF (REFLEC(1).GT.0.OR.REFLEC(2).GT.0.OR.(REFLEC(4).GT.0.AND.BERG.GT.0)) THEN
Expand Down
2 changes: 1 addition & 1 deletion regtests/bin/matrix_cmake_ncep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ EOF
batchq='slurm'
basemodcomp='intel/2022.1.2'
basemodmpi='impi/2022.1.2'
hpcstackpath='/work/noaa/epic-ps/hpc-stack/libs/intel/2022.1.2/modulefiles/stack'
hpcstackpath='/work/noaa/epic-ps/role-epic-ps/hpc-stack/libs/intel-2022.1.2/modulefiles/stack'
hpcstackversion='hpc/1.2.0'
modcomp='hpc-intel/2022.1.2'
modmpi='hpc-impi/2022.1.2'
Expand Down