Changeset 6606 for branches/2015/nemo_v3_6_STABLE/NEMOGCM/NEMO/TOP_SRC/trcini.F90

Timestamp:

2016-05-23T17:06:46+02:00 (8 years ago)

Author:

cetlod

Message:

Bugfix on passive tracers restoring ; the previous one was not properly done, see ticket 16677

File:

• branches/2015/nemo_v3_6_STABLE/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) (3 diffs)

branches/2015/nemo_v3_6_STABLE/NEMOGCM/NEMO/TOP_SRC/trcini.F90

@@ -30 +30 @@
    USE trcsub          ! variables to substep passive tracers
    USE lib_mpp         ! distribued memory computing library
+   USE wrk_nemo
    USE sbc_oce
    USE trcice          ! tracers in sea ice
@@ -61 +62 @@
       INTEGER ::   jk, jn, jl    ! dummy loop indices
       CHARACTER (len=25) :: charout
+      REAL(wp), POINTER, DIMENSION(:,:,:,:) :: ztrcdta
       !!---------------------------------------------------------------------
       !
@@ -120 +122 @@
         IF( ln_trcdta .AND. nb_trcdta > 0 ) THEN  ! Initialisation of tracer from a file that may also be used for damping
             !
+            CALL wrk_alloc( jpi, jpj, jpk, nb_trcdta, ztrcdta )
+            !
+            CALL trc_dta( nit000, ztrcdta )   ! read tracer data at nit000
+            !
             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) )   ! read tracer data at nit000
-                  trn(:,:,:,jn) = sf_trcdta(jl)%fnow(:,:,:) * tmask(:,:,:) * rf_trfac(jl)
-                  !
-                  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
+                  trn(:,:,:,jn) = ztrcdta(:,:,:,jl) * rf_trfac(jl)
                ENDIF
             ENDDO
             !
+            CALL wrk_dealloc( jpi, jpj, jpk, nb_trcdta, ztrcdta )
+            ! 
         ENDIF
         !