Changeset 7198 for branches/2016/dev_r7012_ROBUST5_CNRS/NEMOGCM/NEMO/TOP_SRC/trcini.F90

Timestamp:

2016-11-04T18:58:24+01:00 (8 years ago)

Author:

lovato

Message:

New top interface : merge with dev_r7012_ROBUST5_CMCC (#1783) and update sette.sh

File:

• branches/2016/dev_r7012_ROBUST5_CNRS/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) (3 diffs)

branches/2016/dev_r7012_ROBUST5_CNRS/NEMOGCM/NEMO/TOP_SRC/trcini.F90

@@ -25 +25 @@
    USE lib_mpp         ! distribued memory computing library
    USE trcice          ! tracers in sea ice
-   USE trcbc,   only : trc_bc_init ! generalized Boundary Conditions
+   USE trcbc,   only : trc_bc_ini ! generalized Boundary Conditions
  
    IMPLICIT NONE
@@ -224 +224 @@
       !
       ! Initialisation of tracers Initial Conditions
-      IF( ln_trcdta )      CALL trc_dta_init(jptra)
+      IF( ln_trcdta )      CALL trc_dta_ini(jptra)
 
       ! Initialisation of tracers Boundary Conditions
-      IF( ln_my_trc )     CALL trc_bc_init(jptra)
+      IF( ln_my_trc )     CALL trc_bc_ini(jptra)
 
       IF( ln_rsttr ) THEN
@@ -234 +234 @@
         !
       ELSE
-        !
-        IF( ln_trcdta .AND. nb_trcdta > 0 ) THEN  ! Initialisation of tracer from a file that may also be used for damping
-            !
+        ! Initialisation of tracer from a file that may also be used for damping
+        IF( ln_trcdta .AND. nb_trcdta > 0 ) THEN
+            ! update passive tracers arrays with input data read from file
             DO jn = 1, jptra
-               IF( ln_trc_ini(jn) ) THEN      ! update passive tracers arrays with input data read from file
+               IF( ln_trc_ini(jn) ) THEN
                   jl = n_trc_index(jn) 
-                  CALL trc_dta( nit000, sf_trcdta(jl), rf_trfac(jl) )   ! read tracer data at nit000
-                  trn(:,:,:,jn) = sf_trcdta(jl)%fnow(:,:,:) 
+                  CALL trc_dta( nit000, sf_trcdta(jl), rf_trfac(jl), trn(:,:,:,jn) )
                   !
-                  IF( .NOT.ln_trcdmp .AND. .NOT.ln_trcdmp_clo ) THEN      !== deallocate data structure   ==!
-                     !                                                    (data used only for initialisation)
+                  ! 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_dta: deallocate data arrays as they are only used to initialize the run'
-                                                  DEALLOCATE( sf_trcdta(jl)%fnow )     !  arrays in the structure
+                                                  DEALLOCATE( sf_trcdta(jl)%fnow )
                      IF( sf_trcdta(jl)%ln_tint )  DEALLOCATE( sf_trcdta(jl)%fdta )
                      !