Changeset 1561 for trunk/NEMO/OPA_SRC/stpctl.F90

Timestamp:

2009-07-30T10:50:07+02:00 (15 years ago)

Author:

ctlod

Message:

Fix output state following an error state trapped by stpctl.F90, see ticket: #496

File:

• trunk/NEMO/OPA_SRC/stpctl.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/stpctl.F90

@@ -18 +18 @@
    USE sol_oce         ! ocean space and time domain variables 
    USE in_out_manager  ! I/O manager
-   USE diawri          ! ocean output file 
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE lib_mpp         ! distributed memory computing
@@ -87 +86 @@
       IF( MOD( kt, nwrite ) == 1 .AND. lwp )   WRITE(numout,*) ' ==>> time-step= ',kt,' abs(U) max: ', zumax
       !
-      IF( zumax > 20.) THEN
+      IF( zumax > 20.e0 ) THEN
          IF( lk_mpp ) THEN
             CALL mpp_maxloc(ABS(un),umask,zumax,ii,ij,ik)
@@ -104 +103 @@
             WRITE(numout,*) '          output of last fields in numwso'
          ENDIF
-         IF( kindic >= 0 ) THEN      ! create a abort file (only if not already done)
-            kindic  = -3
-            CALL dia_wri( kt, kindic )
-         ENDIF
+         kindic = -3
       ENDIF
 9400  FORMAT (' kt=',i6,' max abs(U): ',1pg11.4,', i j k: ',3i5)
@@ -141 +137 @@
             WRITE(numout,*) '          output of last fields in numwso'
          ENDIF
-         IF( kindic >= 0 ) THEN      ! create a abort file (only if not already done)
-            kindic  = -3
-            CALL dia_wri( kt, kindic )
-         ENDIF
+         kindic = -3
       ENDIF
 9500  FORMAT (' kt=',i6,' min SSS: ',1pg11.4,', i j: ',2i5)
@@ -154 +147 @@
          IF(lwp) WRITE(numsol,9200) kt, niter, res, SQRT(epsr)/eps      ! Solver
          !
-         IF( kindic < 0 ) THEN                                          ! create a abort file if problem found 
+         IF( kindic < 0 .AND. zsmin > 0.e0 .AND. zumax <= 20.e0 ) THEN                                          ! create a abort file if problem found 
             IF(lwp) THEN
                WRITE(numout,*) ' stpctl: the elliptic solver DO not converge or explode'
@@ -163 +156 @@
                WRITE(numout,*) ' ======  '
             ENDIF
-            CALL dia_wri( kt, kindic )
          ENDIF
          !