Skip to content

Issue #998 - coupling update error fix #999

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 2 commits into from
Apr 28, 2023
Merged

Issue #998 - coupling update error fix #999

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
797bc7e
Issue #998 - coupling update error fix
ukmo-juan-castillo Apr 24, 2023
638702f
Merge branch 'develop' into bf_coupling_condition
ukmo-juan-castillo Apr 26, 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
66 changes: 1 addition & 65 deletions model/src/ww3_shel.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2062,7 +2062,7 @@ PROGRAM W3SHEL
DTTST=0.
ELSE
ID_OASIS_TIME = NINT(DSEC21 ( TIME00 , TFN(:,J) ))
IF ( NINT(MOD(DSEC21(TIME00,TIME), DTOUT(7))) .EQ. 0 .AND. &
IF ( MOD(NINT(DSEC21(TIME00,TIME)), NINT(DTOUT(7))) .EQ. 0 .AND. &
DSEC21 (TFN(:,J), TIMEEND) .GT. 0.0 ) DTTST=0.
ENDIF
ENDIF
Expand Down Expand Up @@ -2100,10 +2100,6 @@ PROGRAM W3SHEL
#ifdef W3_OASICM
IF (FLAGSC(J)) FLAGSCI = .TRUE.
IF (.NOT.FLAGSCI) ID_OASIS_TIME = -1
#endif
#ifdef W3_OASIS
IF (ID_OASIS_TIME >0 .OR. FIRST_STEP .OR. &
.NOT. FLAGSC(J)) THEN
#endif
CALL W3FLDG ('READ', IDSTR(J), NDSF(J), &
NDST, NDSEN, NX, NY, NX, NY, TIME0, TIMEN, &
Expand All @@ -2113,11 +2109,6 @@ PROGRAM W3SHEL
, COUPL_COMM &
#endif
)
#ifdef W3_OASIS
ELSE
IERR = -1
END IF
#endif
END IF
IF ( IERR .LT. 0 ) FLLST_ALL(J) = .TRUE.

Expand Down Expand Up @@ -2176,10 +2167,6 @@ PROGRAM W3SHEL
#ifdef W3_OASICM
IF (FLAGSC(J)) FLAGSCI = .TRUE.
IF (.NOT.FLAGSCI) ID_OASIS_TIME = -1
#endif
#ifdef W3_OASIS
IF (ID_OASIS_TIME >0 .OR. FIRST_STEP .OR. &
.NOT. FLAGSC(J)) THEN
#endif
CALL W3FLDG ('READ', IDSTR(J), NDSF(J), &
NDST, NDSEN, NX, NY, NX, NY, TIME0, TIMEN, &
Expand All @@ -2189,11 +2176,6 @@ PROGRAM W3SHEL
, COUPL_COMM &
#endif
)
#ifdef W3_OASIS
ELSE
IERR = -1
END IF
#endif
END IF
IF ( IERR .LT. 0 )FLLST_ALL(J) = .TRUE.

Expand Down Expand Up @@ -2261,10 +2243,6 @@ PROGRAM W3SHEL
#endif
#ifdef W3_OASOCM
IF (.NOT.FLAGSC(J)) ID_OASIS_TIME = -1
#endif
#ifdef W3_OASIS
IF (ID_OASIS_TIME >0 .OR. FIRST_STEP .OR. &
.NOT. FLAGSC(J)) THEN
#endif
CALL W3FLDG ('READ', IDSTR(J), NDSF(J), &
NDST, NDSEN, NX, NY, NX, NY, TIME0, TIMEN, &
Expand All @@ -2274,11 +2252,6 @@ PROGRAM W3SHEL
, COUPL_COMM &
#endif
)
#ifdef W3_OASIS
ELSE
IERR = -1
END IF
#endif
#ifdef W3_TIDE
END IF
#endif
Expand Down Expand Up @@ -2318,10 +2291,6 @@ PROGRAM W3SHEL
#endif
#ifdef W3_OASOCM
IF (.NOT.FLAGSC(J)) ID_OASIS_TIME = -1
#endif
#ifdef W3_OASIS
IF (ID_OASIS_TIME >0 .OR. FIRST_STEP .OR. &
.NOT. FLAGSC(J)) THEN
#endif
CALL W3FLDG ('READ', IDSTR(J), NDSF(J), &
NDST, NDSEN, NX, NY, NX, NY, TIME0, TIMEN, &
Expand All @@ -2331,9 +2300,6 @@ PROGRAM W3SHEL
, COUPL_COMM &
#endif
)
#ifdef W3_OASIS
END IF
#endif
#ifdef W3_TIDE
END IF
#endif
Expand Down Expand Up @@ -2361,10 +2327,6 @@ PROGRAM W3SHEL
#endif
#ifdef W3_OASACM
IF (.NOT.FLAGSC(J)) ID_OASIS_TIME = -1
#endif
#ifdef W3_OASIS
IF (ID_OASIS_TIME >0 .OR. FIRST_STEP .OR. &
.NOT. FLAGSC(J)) THEN
#endif
CALL W3FLDG ('READ', IDSTR(J), NDSF(J), &
NDST, NDSEN, NX, NY, NX, NY, TIME0, TIMEN, &
Expand All @@ -2374,9 +2336,6 @@ PROGRAM W3SHEL
, COUPL_COMM &
#endif
)
#ifdef W3_OASIS
END IF
#endif
END IF

! ICE : ice conc.
Expand All @@ -2392,10 +2351,6 @@ PROGRAM W3SHEL
#ifdef W3_OASICM
IF (FLAGSC(J)) FLAGSCI = .TRUE.
IF (.NOT.FLAGSCI) ID_OASIS_TIME = -1
#endif
#ifdef W3_OASIS
IF (ID_OASIS_TIME >0 .OR. FIRST_STEP .OR. &
.NOT. FLAGSC(J)) THEN
#endif
CALL W3FLDG ('READ', IDSTR(J), NDSF(J), &
NDST, NDSEN, NX, NY, NX, NY, TIME0, TIMEN, &
Expand All @@ -2405,11 +2360,6 @@ PROGRAM W3SHEL
, COUPL_COMM &
#endif
)
#ifdef W3_OASIS
ELSE
IERR = -1
END IF
#endif
IF ( IERR .LT. 0 ) FLLSTI = .TRUE.
!could be: IF ( IERR .LT. 0 ) FLLST_ALL(J) = .TRUE.
END IF
Expand All @@ -2436,10 +2386,6 @@ PROGRAM W3SHEL
#endif
#ifdef W3_OASACM
IF (.NOT.FLAGSC(J)) ID_OASIS_TIME = -1
#endif
#ifdef W3_OASIS
IF (ID_OASIS_TIME >0 .OR. FIRST_STEP .OR. &
.NOT. FLAGSC(J)) THEN
#endif
CALL W3FLDG ('READ', IDSTR(J), NDSF(J), &
NDST, NDSEN, NX, NY, NX, NY, TIME0, TIMEN, &
Expand All @@ -2449,9 +2395,6 @@ PROGRAM W3SHEL
, COUPL_COMM &
#endif
)
#ifdef W3_OASIS
END IF
#endif
END IF

! RHO : air density
Expand All @@ -2475,10 +2418,6 @@ PROGRAM W3SHEL
#endif
#ifdef W3_OASACM
IF (.NOT.FLAGSC(J)) ID_OASIS_TIME = -1
#endif
#ifdef W3_OASIS
IF (ID_OASIS_TIME >0 .OR. FIRST_STEP .OR. &
.NOT. FLAGSC(J)) THEN
#endif
CALL W3FLDG ('READ', IDSTR(J), NDSF(J), &
NDST, NDSEN, NX, NY, NX, NY, TIME0, TIMEN, &
Expand All @@ -2488,9 +2427,6 @@ PROGRAM W3SHEL
, COUPL_COMM &
#endif
)
#ifdef W3_OASIS
END IF
#endif
IF ( IERR .LT. 0 ) FLLSTR = .TRUE.
END IF

Expand Down