Changeset 13987 for NEMO/branches/2020/dev_r13312_AGRIF-03-04_jchanut_vinterp_tstep/src/TOP/trcini.F90

Timestamp:

2020-12-02T13:22:58+01:00 (3 years ago)

Author:

cetlod

Message:

Merging dev_r13333_TOP-05_Ethe_Agrif into dev_r13312_AGRIF-03-04_jchanut_vinterp_tstep

File:

• NEMO/branches/2020/dev_r13312_AGRIF-03-04_jchanut_vinterp_tstep/src/TOP/trcini.F90 (modified) (5 diffs)

NEMO/branches/2020/dev_r13312_AGRIF-03-04_jchanut_vinterp_tstep/src/TOP/trcini.F90

@@ -16 +16 @@
    !!   top_alloc :   allocate the TOP arrays
    !!----------------------------------------------------------------------
+   USE par_trc         ! need jptra, number of passive tracers
    USE oce_trc         ! shared variables between ocean and passive tracers
    USE trc             ! passive tracers common variables
@@ -95 +96 @@
       CHARACTER (len=25) :: charout
       REAL(wp), DIMENSION(jpi,jpj,jpk,jptra) :: zzmsk
-      CHARACTER (len=25), DIMENSION(jptra) :: clseb  
       !!----------------------------------------------------------------------
       !
@@ -131 +131 @@
          CALL prt_ctl_info( charout, cdcomp = 'top' )
          CALL prt_ctl( tab4d_1=tr(:,:,:,:,Kmm), mask1=tmask, clinfo=ctrcnm )
-         DO jn = 1, jptra
-            zzmsk(:,:,:,jn) = tmask(:,:,:)
-            WRITE(clseb(jn),'(a,i2.2)') 'seb ', jn
-         END DO
-         CALL prt_ctl( tab4d_1=zzmsk, mask1=tmask, clinfo=clseb )
       ENDIF
 9000  FORMAT('      tracer nb : ',i2,'      name :',a10,'      initial content :',e18.10)
@@ -254 +249 @@
         !
       ELSE                             ! Initialisation of tracer from a file that may also be used for damping
-!!gm BUG ?   if damping and restart, what's happening ?
         IF( ln_trcdta .AND. nb_trcdta > 0 ) THEN
             ! update passive tracers arrays with input data read from file
@@ -260 +254 @@
                IF( ln_trc_ini(jn) ) THEN
                   jl = n_trc_index(jn) 
-                  CALL trc_dta( nit000, Kmm, sf_trcdta(jl), rf_trfac(jl), tr(:,:,:,jn,Kmm) )
-                  !
-                  ! deallocate data structure if data are not used for damping
-                  IF( .NOT.ln_trcdmp .AND. .NOT.ln_trcdmp_clo ) THEN
-                     IF(lwp) WRITE(numout,*) 'trc_ini_state: deallocate data arrays as they are only used to initialize the run'
-                                                  DEALLOCATE( sf_trcdta(jl)%fnow )
-                     IF( sf_trcdta(jl)%ln_tint )  DEALLOCATE( sf_trcdta(jl)%fdta )
-                     !
-                  ENDIF
+                  CALL trc_dta( nit000, jl, tr(:,:,:,jn,Kmm) )
                ENDIF
             END DO