Changeset 1567

Timestamp:

2009-07-31T16:39:55+02:00 (15 years ago)

Author:

ctlod

Message:

DIMG: remove kindic argument from dia_wri call subroutine, see ticket: #509 & #496

Location:

trunk/NEMO/OPA_SRC/DIA

Files:

• diawri.F90 (modified) (3 diffs)
• diawri_dimg.h90 (modified) (9 diffs)

trunk/NEMO/OPA_SRC/DIA/diawri.F90

@@ -528 +528 @@
 # endif
 
+#endif
+
    SUBROUTINE dia_wri_state( cdfile_name, kt )
       !!---------------------------------------------------------------------
@@ -651 +653 @@
       ! -----------------
       CALL histclo( id_i )
-#if ! defined key_iomput
+#if ! defined key_iomput && ! defined key_dimgout
       IF( ninist /= 1  ) THEN
          CALL histclo( nid_T )
@@ -661 +663 @@
 
    END SUBROUTINE dia_wri_state
-
-#endif
    !!======================================================================
 END MODULE diawri

trunk/NEMO/OPA_SRC/DIA/diawri_dimg.h90

@@ -7 +7 @@
   !!----------------------------------------------------------------------
 
-  SUBROUTINE dia_wri (kt, kindic)
+  SUBROUTINE dia_wri (kt)
     !!----------------------------------------------------------------------
     !!           *** routine dia_wri ***
@@ -21 +21 @@
     !!     If 'key_diainstant' is defined, no mean values are computed and the 
     !!     instantaneous fields are dump.
-    !!     kindic is 0 or >0 in normal condition. When < 0 it indicates an error
-    !!     condition and instantaneous file output is forced.
     !!       Each processor creates its own file with its local data
     !!     Merging all the files is performed off line by a dedicated program
@@ -78 +76 @@
 
     !! * Arguments
-    INTEGER ,INTENT(in) :: kt, kindic
+    INTEGER ,INTENT(in) :: kt
 
     !! * local declarations
@@ -197 +195 @@
 
        IF(  ( MOD (kt-nit000+1,nwrite) ==  0 )          &
-            &   .OR.       kindic <   0            &
-            &   .OR. ( kt == 1 .AND. kindic > 0)  ) THEN
+            &   .OR. ( kt == 1 .AND. ninist ==1 )  ) THEN
           ! it is time to make a dump on file 
           ! compute average
@@ -237 +234 @@
        !     IF (abs(adatrj-iwrite*rwrite) < zdtj/2.  &
        IF (  ( MOD (kt-nit000+1,nwrite) ==  0 )          &
-            &   .OR.       kindic <   0            &
-            &   .OR. ( kt == 1 .AND. kindic > 0)  ) THEN
+            &   .OR. ( kt == 1 .AND. ninist == 1 )  ) THEN
           !
           ! transfer wp arrays to sp arrays for dimg files
@@ -274 +270 @@
     !
     IF(  ( MOD (kt-nit000+1,nwrite) ==  0 )          &
-         &   .OR.       kindic <   0            &
-         &   .OR. ( kt == 1 .AND. kindic > 0)  ) THEN
+         &   .OR. ( kt == 1 .AND. ninist == 1 )  ) THEN
 
        IF( lwp) WRITE(numout,*)'Days since the begining of the run :',adatrj
@@ -283 +278 @@
        WRITE(clname,9000) TRIM(cexper),'U',iyear,imon,iday
        cltext=TRIM(cexper)//' U(m/s) '//TRIM(clmode)
-       IF ( kindic < 0 )   cltext=TRIM(cexper)//' U(m/s)  instantaneous (explosion)'
        !
        IF( ll_dia_inst) THEN 
@@ -289 +283 @@
 
        ELSE 
-          IF( kindic ==  -3 ) THEN
-             ! ... in case of explosion on umax, dump instantateous u field instead of mean.
-             CALL dia_wri_dimg(clname, cltext, un, jpk, 'T')
-          ELSE
-             CALL dia_wri_dimg(clname, cltext, um, jpk, 'T')
-          ENDIF
+          CALL dia_wri_dimg(clname, cltext, um, jpk, 'T')
        ENDIF
 
@@ -396 +385 @@
 
   END SUBROUTINE dia_wri
-
-  SUBROUTINE dia_wri_state ( cdfile_name, kt )
-    !!-------------------------------------------------------------------
-    !!        ***     ROUTINE dia_wri_state  ***
-    !!
-    !! ** Purpose :   Dummy routine for compatibility with IOIPSL output
-    !!
-    !! ** History :
-    !!      9.O  ! 03-06  (J.M. Molines ) dimgout
-    !!--------------------------------------------------------------------
-    INTEGER         , INTENT(in) ::   kt            ! ocean time-step index
-    CHARACTER(len=*), INTENT(in) ::   cdfile_name   ! name of the file created 
-    !!--------------------------------------------------------------------
-
-    IF( lwp) WRITE(numout,*) 'dia_wri_state: Dummy call', cdfile_name, kt
-    IF( lwp) WRITE(numout,*) '-------------'
-    IF( lwp) WRITE(numout,*)
-
-  END SUBROUTINE dia_wri_state