Changeset 3680 for branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/trcini.F90

Timestamp:

2012-11-27T15:42:24+01:00 (11 years ago)

Author:

rblod

Message:

First commit of the final branch for 2012 (future nemo_3_5), see ticket #1028

File:

• branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/trcini.F90 (modified) (3 diffs)

branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/trcini.F90

@@ -21 +21 @@
    USE trcnam          ! Namelist read
    USE trcini_cfc      ! CFC      initialisation
-   USE trcini_lobster  ! LOBSTER  initialisation
    USE trcini_pisces   ! PISCES   initialisation
    USE trcini_c14b     ! C14 bomb initialisation
@@ -70 +69 @@
       CALL top_alloc()              ! allocate TOP arrays
 
-      IF( ln_dm2dc .AND. ( lk_pisces .OR. lk_lobster ) )    &
-         &  CALL ctl_stop( ' The diurnal cycle is not compatible with PISCES or LOBSTER  ' )
+      IF( ln_dm2dc .AND. lk_pisces )    &
+         &  CALL ctl_stop( ' The diurnal cycle is not compatible with PISCES ' )
 
       IF( nn_cla == 1 )   &
@@ -101 +100 @@
       areatot = glob_sum( cvol(:,:,:) )
 
-      IF( lk_lobster )       CALL trc_ini_lobster      ! LOBSTER bio-model
       IF( lk_pisces  )       CALL trc_ini_pisces       ! PISCES  bio-model
       IF( lk_cfc     )       CALL trc_ini_cfc          ! CFC     tracers