Changeset 1561 for trunk/NEMO/OPA_SRC/DIA/diawri.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/DIA/diawri.F90 (modified) (8 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