Changeset 6648

Timestamp:

2016-05-31T16:55:56+02:00 (8 years ago)

Author:

frrh

Message:

Try again

File:

• branches/UKMO/dev_r5518_RH_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_RH_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/trcini.F90

@@ -155 +155 @@
       ELSE
         !
+#if !defined key_medusa
         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
             !
             CALL wrk_alloc( jpi, jpj, jpk, ztrcdta )    ! Memory allocation
@@ -176 +176 @@
             ENDDO
             CALL wrk_dealloc( jpi, jpj, jpk, ztrcdta )
-
+        ENDIF
 #else
+        IF( ln_trcdta .AND. nb_trcdta > 0 ) THEN  ! Initialisation of tracer from a file that may also be used for damping
+
             IF(lwp) WRITE(numout,*) 'AXY: calling wrk_alloc'
             IF(lwp) CALL flush(numout)
@@ -204 +206 @@
             IF(lwp) WRITE(numout,*) 'AXY: calling wrk_dealloc'
             IF(lwp) CALL flush(numout)
-#endif
             CALL wrk_dealloc( jpi, jpj, jpk, ztrcdta )
         ENDIF
+#endif
         !
 # if defined key_debug_medusa