From 797bc7ef19c09601854b3dc4d6a7d4f08c8a9f01 Mon Sep 17 00:00:00 2001
From: "ukmo-juan.castillo" <juan.m.castillo@metoffice.gov.uk>
Date: Mon, 24 Apr 2023 10:14:37 +0100
Subject: [PATCH] Issue #998 - coupling update error fix

---
 model/src/ww3_shel.F90 | 66 +-----------------------------------------
 1 file changed, 1 insertion(+), 65 deletions(-)

diff --git a/model/src/ww3_shel.F90 b/model/src/ww3_shel.F90
index fe5544ac94..d7e9790bb2 100644
--- a/model/src/ww3_shel.F90
+++ b/model/src/ww3_shel.F90
@@ -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
@@ -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, &
@@ -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.
 
@@ -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, &
@@ -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.
 
@@ -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, &
@@ -2274,11 +2252,6 @@ PROGRAM W3SHEL
                    , COUPL_COMM                       &
 #endif
                    )
-#ifdef W3_OASIS
-            ELSE
-              IERR = -1
-            END IF
-#endif
 #ifdef W3_TIDE
             END IF
 #endif
@@ -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, &
@@ -2331,9 +2300,6 @@ PROGRAM W3SHEL
                    , COUPL_COMM                       &
 #endif
                    )
-#ifdef W3_OASIS
-            END IF
-#endif
 #ifdef W3_TIDE
             END IF
 #endif
@@ -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, &
@@ -2374,9 +2336,6 @@ PROGRAM W3SHEL
                  , COUPL_COMM                       &
 #endif
                  )
-#ifdef W3_OASIS
-          END IF
-#endif
           END IF
 
           ! ICE : ice conc.
@@ -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,    &
@@ -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
@@ -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, &
@@ -2449,9 +2395,6 @@ PROGRAM W3SHEL
                  , COUPL_COMM                               &
 #endif
                  )
-#ifdef W3_OASIS
-          END IF
-#endif
           END IF
 
           ! RHO : air density
@@ -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, &
@@ -2488,9 +2427,6 @@ PROGRAM W3SHEL
                  , COUPL_COMM                               &
 #endif
                  )
-#ifdef W3_OASIS
-          END IF
-#endif
             IF ( IERR .LT. 0 ) FLLSTR = .TRUE.
           END IF