Changeset 1561

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

Location:

trunk/NEMO/OPA_SRC

Files:

• DIA/diawri.F90 (modified) (8 diffs)
• step.F90 (modified) (1 diff)
• stpctl.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/DIA/diawri.F90

@@ -74 +74 @@
    !!----------------------------------------------------------------------
 # if defined key_iomput
-   SUBROUTINE dia_wri( kt, kindic )
+   SUBROUTINE dia_wri( kt )
       !!---------------------------------------------------------------------
       !!                  ***  ROUTINE dia_wri  ***
@@ -87 +87 @@
       !!----------------------------------------------------------------------
       INTEGER, INTENT( in ) ::   kt      ! ocean time-step index
-      INTEGER, INTENT( in ) ::   kindic  ! 
       !!----------------------------------------------------------------------
       ! 
@@ -112 +111 @@
 
 #else
-   SUBROUTINE dia_wri( kt, kindic )
+   SUBROUTINE dia_wri( kt )
       !!---------------------------------------------------------------------
       !!                  ***  ROUTINE dia_wri  ***
@@ -123 +122 @@
       !!      At each time step call histdef to compute the mean if ncessary
       !!      Each nwrite time step, output the instantaneous or mean fields
-      !!      IF kindic <0, output of fields before the model interruption.
-      !!      IF kindic =0, time step loop
-      !!      IF kindic >0, output of fields before the time step loop
       !!
       !! History :
@@ -140 +136 @@
       !! * Arguments
       INTEGER, INTENT( in ) ::   kt      ! ocean time-step index
-      INTEGER, INTENT( in ) ::   kindic  ! 
 
       !! * Local declarations
@@ -199 +194 @@
       ! 1. Define NETCDF files and fields at beginning of first time step
       ! -----------------------------------------------------------------
-
-      IF(ll_print) WRITE(numout,*) 'dia_wri kt = ', kt, ' kindic ', kindic
 
       IF( kt == nit000 ) THEN
@@ -525 +518 @@
       ! 3. Close all files
       ! ---------------------------------------
-      IF( kt == nitend .OR. kindic < 0 ) THEN
+      IF( kt == nitend ) THEN
          CALL histclo( nid_T )
          CALL histclo( nid_U )
@@ -658 +651 @@
       ! -----------------
       CALL histclo( id_i )
+#if ! defined key_iomput
+      IF( ninist /= 1  ) THEN
+         CALL histclo( nid_T )
+         CALL histclo( nid_U )
+         CALL histclo( nid_V )
+         CALL histclo( nid_W )
+      ENDIF
+#endif
 
    END SUBROUTINE dia_wri_state

trunk/NEMO/OPA_SRC/step.F90

@@ -242 +242 @@
       ! diagnostics and outputs             (ua, va, ta, sa used as workspace)
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-                         CALL dia_wri( kstp, indic )  ! ocean model: outputs
+                         CALL dia_wri( kstp )         ! ocean model: outputs
       IF( lk_floats  )   CALL flo_stp( kstp )         ! drifting Floats
       IF( lk_diahth  )   CALL dia_hth( kstp )         ! Thermocline depth (20 degres isotherm depth)

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
          !