Changeset 9019 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trcini.F90

Timestamp:

2017-12-13T15:58:53+01:00 (6 years ago)

Author:

timgraham

Message:

Merge of dev_CNRS_2017 into branch

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) (5 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/trcini.F90

@@ -197 +197 @@
       USE trcadv , ONLY:  trc_adv_ini
       USE trcldf , ONLY:  trc_ldf_ini
-      USE trczdf , ONLY:  trc_zdf_ini
       USE trcrad , ONLY:  trc_rad_ini
       !
@@ -206 +205 @@
                        CALL  trc_adv_ini          ! advection
                        CALL  trc_ldf_ini          ! lateral diffusion
-                       CALL  trc_zdf_ini          ! vertical diffusion
+                       !                          ! vertical diffusion: always implicit time stepping scheme
                        CALL  trc_rad_ini          ! positivity of passive tracers 
       !
@@ -224 +223 @@
       !!----------------------------------------------------------------------
       !
-      ! Initialisation of tracers Initial Conditions
-      IF( ln_trcdta )      CALL trc_dta_ini(jptra)
-
-      ! Initialisation of tracers Boundary Conditions
-      IF( ln_my_trc )     CALL trc_bc_ini(jptra)
-
-      IF( ln_rsttr ) THEN
+
+      IF( ln_trcdta )   CALL trc_dta_ini( jptra )      ! set initial tracers values
+
+      IF( ln_my_trc )   CALL trc_bc_ini ( jptra )      ! set tracers Boundary Conditions
+
+
+      IF( ln_rsttr ) THEN              ! restart from a file
         !
-        CALL trc_rst_read              ! restart from a file
+        CALL trc_rst_read
         !
-      ELSE
-        ! Initialisation of tracer from a file that may also be used for damping
+      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
@@ -251 +250 @@
                   ENDIF
                ENDIF
-            ENDDO
+            END DO
             !
         ENDIF
@@ -263 +262 @@
    END SUBROUTINE trc_ini_state
 
+
    SUBROUTINE top_alloc
       !!----------------------------------------------------------------------