Changeset 3271 for branches/2011/dev_NEMO_MERGE_2011

Timestamp:

2012-01-23T10:07:59+01:00 (12 years ago)

Author:

cetlod

Message:

dev_NEMO_MERGE_2011:suppress useless variable kindic in trcdia.F90, see ticket #916

File:

• branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcdia.F90 (modified) (12 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcdia.F90

@@ -66 +66 @@
       !! ** Purpose :   output passive tracers fields 
       !!---------------------------------------------------------------------
-      INTEGER, INTENT(in) ::   kt             ! ocean time-step
-      !
-      INTEGER             ::  ierr,  kindic   ! local integer
+      INTEGER, INTENT(in) ::   kt    ! ocean time-step
+      !
+      INTEGER             ::  ierr   ! local integer
       !!---------------------------------------------------------------------
       !
@@ -79 +79 @@
       !
       IF( .NOT.lk_iomput ) THEN
-                          CALL trcdit_wr( kt, kindic )      ! outputs for tracer concentration
-         IF( ln_diatrc )  CALL trcdii_wr( kt, kindic )      ! outputs for additional arrays
-         IF( ln_diabio )  CALL trcdib_wr( kt, kindic )      ! outputs for biological trends
+                          CALL trcdit_wr( kt )      ! outputs for tracer concentration
+         IF( ln_diatrc )  CALL trcdii_wr( kt )      ! outputs for additional arrays
+         IF( ln_diabio )  CALL trcdib_wr( kt )      ! outputs for biological trends
       ENDIF
       !
@@ -87 +87 @@
 
 
-   SUBROUTINE trcdit_wr( kt, kindic )
+   SUBROUTINE trcdit_wr( kt )
       !!----------------------------------------------------------------------
       !!                     ***  ROUTINE trcdit_wr  ***
@@ -99 +99 @@
       !!        Each nwritetrc 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
       !!----------------------------------------------------------------------
       INTEGER, INTENT(in) ::   kt       ! ocean time-step
-      INTEGER, INTENT(in) ::   kindic   ! indicator of abnormal termination
       !
       INTEGER ::   jn
@@ -150 +146 @@
       ! --------------------------------------------------------------
 
-      IF(ll_print)WRITE(numout,*)'trcdit_wr kt=',kt,' kindic ',kindic
+      IF(ll_print)WRITE(numout,*)'trcdit_wr kt=',kt
       
       IF( kt == nittrc000 ) THEN
@@ -231 +227 @@
       ! close the file 
       ! --------------
-      IF( kt == nitend .OR. kindic < 0 )   CALL histclo( nit5 )
+      IF( kt == nitend )   CALL histclo( nit5 )
       !
    END SUBROUTINE trcdit_wr
 
-   SUBROUTINE trcdii_wr( kt, kindic )
+   SUBROUTINE trcdii_wr( kt )
       !!----------------------------------------------------------------------
       !!                     ***  ROUTINE trcdii_wr  ***
@@ -247 +243 @@
       !!        Each nn_writedia 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
       !!----------------------------------------------------------------------
       INTEGER, INTENT(in) ::   kt       ! ocean time-step
-      INTEGER, INTENT(in) ::   kindic   ! indicator of abnormal termination
       !!
       LOGICAL ::   ll_print = .FALSE.
@@ -297 +289 @@
       ! -----------------------------------------------------------------
 
-      IF( ll_print ) WRITE(numout,*) 'trcdii_wr kt=', kt, ' kindic ', kindic
+      IF( ll_print ) WRITE(numout,*) 'trcdii_wr kt=', kt
 
       IF( kt == nittrc000 ) THEN
@@ -371 +363 @@
       ! Closing all files
       ! -----------------
-      IF( kt == nitend .OR. kindic < 0 )   CALL histclo(nitd)
+      IF( kt == nitend )   CALL histclo(nitd)
       !
 
    END SUBROUTINE trcdii_wr
 
-   SUBROUTINE trcdib_wr( kt, kindic )
+   SUBROUTINE trcdib_wr( kt )
       !!----------------------------------------------------------------------
       !!                     ***  ROUTINE trcdib_wr  ***
@@ -388 +380 @@
       !!        Each nn_writebio 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
       !!----------------------------------------------------------------------
       INTEGER, INTENT( in ) ::   kt          ! ocean time-step
-      INTEGER, INTENT( in ) ::   kindic      ! indicator of abnormal termination
       !!
       LOGICAL ::   ll_print = .FALSE.
@@ -438 +426 @@
       ! --------------------------------------------------------------
 
-      IF(ll_print) WRITE(numout,*)'trcdib_wr kt=',kt,' kindic ',kindic
+      IF(ll_print) WRITE(numout,*)'trcdib_wr kt=',kt
 
       IF( kt == nittrc000 ) THEN
@@ -488 +476 @@
       ! Closing all files
       ! -----------------
-      IF( kt == nitend .OR. kindic < 0 )   CALL histclo( nitb )
+      IF( kt == nitend )   CALL histclo( nitb )
       !
    END SUBROUTINE trcdib_wr