Changeset 10251 for branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcwri_my_trc.F90

Timestamp:

2018-10-29T15:20:26+01:00 (5 years ago)

Author:

kingr

Message:

Rolled back to r10247 - i.e., undid merge of pkg br and 3.6_stable br

File:

• branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcwri_my_trc.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcwri_my_trc.F90

@@ -19 +19 @@
 
    PUBLIC trc_wri_my_trc 
-#if defined key_tracer_budget
-   REAL(wp), ALLOCATABLE, DIMENSION(:,:,:,:), SAVE :: trb_temp ! slwa
-#endif
-
 
 #  include "top_substitute.h90"
 CONTAINS
 
-#if defined key_tracer_budget
-   SUBROUTINE trc_wri_my_trc (kt, fl) ! slwa
-#else
    SUBROUTINE trc_wri_my_trc
-#endif
       !!---------------------------------------------------------------------
       !!                     ***  ROUTINE trc_wri_trc  ***
@@ -37 +29 @@
       !! ** Purpose :   output passive tracers fields 
       !!---------------------------------------------------------------------
-#if defined key_tracer_budget
-      INTEGER, INTENT( in ), OPTIONAL     :: fl 
-      INTEGER, INTENT( in )               :: kt
-      REAL(wp), DIMENSION(jpi,jpj,jpk)    :: trpool !tracer pool temporary output
-#else
-      INTEGER, INTENT( in )               :: kt
-#endif
       CHARACTER (len=20)   :: cltra
-      INTEGER              :: jn,jk ! JC TODO jk defined here but may not be used
+      INTEGER              :: jn
       !!---------------------------------------------------------------------
  
       ! write the tracer concentrations in the file
       ! ---------------------------------------
-
-
-#if defined key_tracer_budget
-      IF( PRESENT(fl)) THEN
-! depth integrated
-! for strict budgetting write this out at end of timestep as an average between 'now' and 'after' at kt
-         DO jn = jp_myt0, jp_myt1 
-          IF(ln_trdtrc (jn))THEN
-            trpool(:,:,:) = 0.5 * ( trn(:,:,:,jn) * fse3t_a(:,:,:) +  &
-                                        trb_temp(:,:,:,jn) * fse3t(:,:,:) )
-            cltra = TRIM( ctrcnm(jn) )//"e3t"     ! depth integrated output
-            IF( kt == nittrc000 ) write(6,*)'output pool ',cltra
-            DO jk = 1, jpk
-               trpool(:,:,jk) = trpool(:,:,jk)
-            END DO
-            CALL iom_put( cltra, trpool)
-
-          END IF
-         END DO
-
-      ELSE
-
-         IF( kt == nittrc000 ) THEN
-           ALLOCATE(trb_temp(jpi,jpj,jpk,jp_my_trc))  ! slwa
-         ENDIF
-         trb_temp(:,:,:,:)=trn(:,:,:,:) ! slwa save for tracer budget (unfiltered trn)
-
-
-      END IF
-#else
       DO jn = jp_myt0, jp_myt1
          cltra = TRIM( ctrcnm(jn) )                  ! short title for tracer
          CALL iom_put( cltra, trn(:,:,:,jn) )
       END DO
-#endif
       !
    END SUBROUTINE trc_wri_my_trc
@@ -94 +48 @@
    PUBLIC trc_wri_my_trc
 CONTAINS
-#if defined key_tracer_budget
-   SUBROUTINE trc_wri_my_trc (kt, fl) ! slwa
-      INTEGER, INTENT( in ), OPTIONAL     :: fl 
-      INTEGER, INTENT( in )               :: kt
-#else
-   ! JC TODO Subroutine arguments (kt) inconsistent with earlier definition
-   SUBROUTINE trc_wri_my_trc (kt)
-      INTEGER, INTENT( in )               :: kt
-#endif
+   SUBROUTINE trc_wri_my_trc                     ! Empty routine  
    END SUBROUTINE trc_wri_my_trc
 #endif