Changeset 10251 for branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/NEMO/TOP_SRC/trcwri.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/trcwri.F90 (modified) (4 diffs)

branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/NEMO/TOP_SRC/trcwri.F90

@@ -21 +21 @@
    USE trcwri_c14b
    USE trcwri_my_trc
-   ! +++>>> FABM
-   USE trcwri_fabm
-   ! FABM <<<+++
 
    IMPLICIT NONE
@@ -35 +32 @@
 CONTAINS
 
-#if defined key_tracer_budget
-   SUBROUTINE trc_wri( kt , fl)  !slwa
-#else
    SUBROUTINE trc_wri( kt )
-#endif
       !!---------------------------------------------------------------------
       !!                     ***  ROUTINE trc_wri  ***
@@ -46 +39 @@
       !!---------------------------------------------------------------------
       INTEGER, INTENT( in )     :: kt
-      ! +++>>>FABM
-#if defined key_tracer_budget
-      INTEGER, INTENT( in ), OPTIONAL     :: fl  ! slwa
-#endif
-      ! FABM <<<+++
       !
       INTEGER                   :: jn
@@ -71 +59 @@
       IF( lk_cfc     )   CALL trc_wri_cfc        ! surface fluxes of CFC
       IF( lk_c14b    )   CALL trc_wri_c14b       ! surface fluxes of C14
-      ! +++>>>FABM
-#if defined key_tracer_budget
-      IF( PRESENT(fl) ) THEN
-         IF( lk_fabm    )   CALL trc_wri_fabm (kt, fl) ! MY_TRC  tracers for budget
-         IF( lk_my_trc ) CALL trc_wri_my_trc (kt, fl)    ! MY_TRC  tracers for budget
-      ELSE
-         IF( lk_fabm    )   CALL trc_wri_fabm (kt) ! FABM  tracers for budget
-         IF( lk_my_trc  )   CALL trc_wri_my_trc (kt) ! MY_TRC  tracers
-      ENDIF
-#else
-      IF( lk_fabm  )   CALL trc_wri_fabm (kt)     ! FABM  tracers
-      IF( lk_my_trc  )   CALL trc_wri_my_trc(kt)     ! MY_TRC  tracers
-#endif
-      ! FABM <<<+++
+      IF( lk_my_trc  )   CALL trc_wri_my_trc     ! MY_TRC  tracers
       !
-
       IF( nn_timing == 1 )  CALL timing_stop('trc_wri')
       !