Changeset 6649

Timestamp:

2016-06-01T10:31:19+02:00 (8 years ago)

Author:

frrh

Message:

Update with JP's latest clash avoiding version of trcini.F90

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
             !
@@ -165 +164 @@
                   CALL trc_dta( nit000, sf_trcdta(jl),rf_trfac(jl) )   ! read tracer data at nit000
                   ztrcdta(:,:,:) = sf_trcdta(jl)%fnow(:,:,:)
-                  trn(:,:,:,jn) = ztrcdta(:,:,:) * tmask(:,:,:) 
+                  trn(:,:,:,jn) = ztrcdta(:,:,:) * tmask(:,:,:)  
                   IF( .NOT.ln_trcdmp .AND. .NOT.ln_trcdmp_clo ) THEN      !== deallocate data structure   ==!
                      !                                                    (data used only for initialisation)
@@ -177 +176 @@
             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)
-
-            CALL wrk_alloc( jpi, jpj, jpk, ztrcdta )    ! Memory allocation
-               !
-            IF(lwp) WRITE(numout,*) 'AXY: calling trc_dta'
-            IF(lwp) CALL flush(numout)
-
-            DO jn = 1, jptra
-               IF( ln_trc_ini(jn) ) THEN      ! update passive tracers arrays with input data read from file
-                  jl = n_trc_index(jn)
-                  CALL trc_dta( nit000, sf_trcdta(jl),rf_trfac(jl) )   ! read tracer data at nit000
-                  ztrcdta(:,:,:) = sf_trcdta(jl)%fnow(:,:,:)
-                  trn(:,:,:,jn) = ztrcdta(:,:,:) * tmask(:,:,:) 
-                  IF( .NOT.ln_trcdmp .AND. .NOT. ln_trcdmp_clo ) THEN      !== deallocate data structure   ==!
-                     !                                                    (data used only for initialisation)
-                     IF(lwp) WRITE(numout,*) 'trc_dta: deallocate data arrays as they are only used to initialize the run'
-                                                  DEALLOCATE( sf_trcdta(jl)%fnow )     !  arrays in the structure
-                     IF( sf_trcdta(jl)%ln_tint )  DEALLOCATE( sf_trcdta(jl)%fdta )
-                     !
-                  ENDIF
-               ENDIF
-            ENDDO
-
-            IF(lwp) WRITE(numout,*) 'AXY: calling wrk_dealloc'
-            IF(lwp) CALL flush(numout)
-            CALL wrk_dealloc( jpi, jpj, jpk, ztrcdta )
-        ENDIF
-#endif
         !
 # if defined key_debug_medusa