Changeset 6644 for branches/NERC

Timestamp:

2016-05-31T13:57:05+02:00 (9 years ago)

Author:

jpalmier

Message:

JPALM -- 31-05-2016 -- modif trcini to avoid merge conflict with GO6_package branch

File:

• branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) (2 diffs)

branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/trcini.F90

@@ -157 +157 @@
         IF( ln_trcdta .AND. nb_trcdta > 0 ) THEN  ! Initialisation of tracer from a file that may also be used for damping
             !
-#if defined key_medusa
-            IF(lwp) WRITE(numout,*) 'AXY: calling wrk_alloc'
-            IF(lwp) CALL flush(numout)
-#endif
             CALL wrk_alloc( jpi, jpj, jpk, ztrcdta )    ! Memory allocation
             !
@@ -182 +178 @@
                ENDIF
             ENDDO
-#if defined key_medusa
-            IF(lwp) WRITE(numout,*) 'AXY: calling wrk_dealloc'
-            IF(lwp) CALL flush(numout)
-#endif
             CALL wrk_dealloc( jpi, jpj, jpk, ztrcdta )
         ENDIF