Merge pull request #38 from ecmwf-ifs/develop-1.3.2

Propagate develop-1.3.2 changes (from IFS CY49R1 for IFS master) to develop-1.3

Author: awnawab

src/ecwam/outstep0.F90

@@ -43,6 +43,7 @@ SUBROUTINE OUTSTEP0 (WVENVI, WVPRPT, FF_NOW, INTFLDS,  &
       USE YOWPARAM , ONLY : NANG     ,NFRE     ,LLUNSTR
       USE YOWSTAT  , ONLY : CDTPRO   ,CDTINTT  ,IREST   , MARSTYPE ,    &
      &                      LLSOURCE , LANAONLY ,LFRSTFLD
+      USE YOWTEST  , ONLY : IU06
       USE YOWTEXT  , ONLY : LRESTARTED
 #ifdef WAM_HAVE_UNWAM
       USE UNWAM    , ONLY : EXCHANGE_FOR_FL1
@@ -219,11 +220,15 @@ SUBROUTINE OUTSTEP0 (WVENVI, WVPRPT, FF_NOW, INTFLDS,  &
         IF ( .NOT. LRESTARTED ) THEN
           IF (IREST == 1 .AND. MARSTYPE /= 'an' .AND. LGRIBOUT) THEN
             CALL OUTSPEC(FL1, FF_NOW)
+            WRITE(IU06,*) ''
+            WRITE(IU06,*) ' OUTSTEP0: OUTSPEC WAS CALLED !'
             LLFLUSH = .TRUE.
           ENDIF
 
           IF (NIPRMOUT > 0 ) THEN
             CALL OUTWINT(BOUTST0)
+            WRITE(IU06,*) ''
+            WRITE(IU06,*) ' OUTSTEP0: OUTWINT WAS CALLED !'
             LLFLUSH = .TRUE.
           ENDIF
 

src/ecwam/wavemdl.F90

@@ -107,7 +107,7 @@ SUBROUTINE WAVEMDL (CBEGDAT, PSTEP, KSTOP, KSTPW,                 &
 
       USE PARKIND_WAVE, ONLY : JWIM, JWRB, JWRU
 
-      USE YOWCOUT  , ONLY : CASS     ,NASS
+      USE YOWCOUT  , ONLY : CASS     ,NASS, LWAMANOUT
       USE YOWCOUP  , ONLY : LWCOU, LWCOU2W, LWCOUHMF, LWFLUX,           &
      &         LWCOUNORMS, LLNORMWAMOUT_GLOBAL, LLNORMWAM2IFS,          &
      &         KCOUSTEP, LMASK_OUT_NOT_SET, LMASK_TASK_STR,             &
@@ -1015,6 +1015,11 @@ SUBROUTINE WAVEMDL (CBEGDAT, PSTEP, KSTOP, KSTPW,                 &
 !     4. END OF RUN ?
 !        -----------
       IF (CDATEE == CDTPRO) THEN
+        IF(LWCOU) THEN
+          ! Prevent any further output until the namelist is read again.
+          LWAMANOUT = .FALSE.
+          WRITE(IU06,*) '  WAVEMDL: NORMAL END OF RUN. OUTPUT IS NOW DISABLED !'
+        ENDIF
         CALL MPL_BARRIER(CDSTRING='WAVEMDL: END')
         CALL FLUSH(IU06)
       ENDIF