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

Timestamp:

2016-10-21T17:38:13+02:00 (8 years ago)

Author:

cetlod

Message:

ROBUST5_CNRS : implementation of part I of new TOP interface - 1st step -, see ticket #1782

File:

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

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

@@ -59 +59 @@
       IF(lwp) WRITE(numout,*) '~~~~~~~'
 
-      IF( .NOT.lk_offline )   CALL trc_nam_run     ! Parameters of the run 
-      !
-      CALL top_alloc()   ! allocate TOP arrays
+      !
       !
       CALL trc_ini_ctl   ! control 
       CALL trc_nam       ! read passive tracers namelists
+      CALL top_alloc()   ! allocate TOP arrays
       !
       !
@@ -152 +151 @@
       !! ** Purpose :   SMS initialisation
       !!----------------------------------------------------------------------
-      USE par_trc
       USE trcini_pisces  ! PISCES   initialisation
       USE trcini_cfc     ! CFC      initialisation
@@ -159 +157 @@
       USE trcini_my_trc  ! MY_TRC   initialisation
       !!----------------------------------------------------------------------
-      jp_lc = 0
-      IF( lk_pisces  )  THEN       ! PISCES bio-model
-         CALL trc_ini_pisces    
-         jp_lc       = jp_pisces 
-      ELSE
-         jp_pisces   = 0
-         jp_pcs0     = 0              
-         jp_pcs1     = 0         
-      ENDIF
-      IF( lk_my_trc )  THEN      ! MY_TRC
-         CALL trc_ini_my_trc
-         jp_lc       = jp_lc + jp_my_trc  
-      ELSE
-         jp_my_trc   = 0
-         jp_myt0     = 0       
-         jp_myt1     = 0      
-      ENDIF
-      IF( ll_cfc    )  THEN          ! CFC
-         CALL trc_ini_cfc    
-         jp_lc       = jp_lc + jp_cfc
-      ELSE
-         jp_cfc      = 0
-         jp_cfc0     = 0       
-         jp_cfc1     = 0      
-      ENDIF
-      IF( ln_c14    )  THEN      ! C14
-         CALL trc_ini_c14
-         jp_lc       = jp_lc + jp_c14
-      ELSE
-         jp_c14      = 0
-         jp_c140     = 0       
-      ENDIF
-      IF( ln_age    )  THEN      ! AGE
-         CALL trc_ini_age
-         jp_lc       = jp_lc + jp_age
-      ELSE
-         jp_age      = 0
-         jp_age0     = 0       
-      ENDIF
-      !
-      IF( jp_lc /= jptra ) THEN
-        IF( lwp ) WRITE(numout,*) ' The total number of tracers in namelist_top jptra = ', jptra
-        IF( lwp ) WRITE(numout,*) ' The total number of tracers to be used by the model is jp_lc = ', jp_lc
-        CALL ctl_stop( " Change the value of total number of tracers in namelist " )
-      ENDIF
+      !    
+      IF( ln_pisces  )   CALL trc_ini_pisces     !  PISCES model
+      IF( ln_my_trc  )   CALL trc_ini_my_trc     !  MY_TRC model
+      IF( ll_cfc     )   CALL trc_ini_cfc        !  CFC's
+      IF( ln_c14     )   CALL trc_ini_c14        !  C14 model
+      IF( ln_age     )   CALL trc_ini_age        !  AGE
       !
    END SUBROUTINE trc_ini_sms
@@ -247 +206 @@
 
       ! Initialisation of tracers Boundary Conditions
-      IF( lk_my_trc )     CALL trc_bc_init(jptra)
+      IF( ln_my_trc )     CALL trc_bc_init(jptra)
 
       IF( ln_rsttr ) THEN