Changeset 772 for branches/dev_001_GM/NEMO/TOP_SRC/trcdtr.F90

Timestamp:

2007-12-17T12:59:33+01:00 (16 years ago)

Author:

gm

Message:

dev_001_GM - change the name of cpp key to key_top, key_lobster, key_pisces, key_kriest and the corresponding lk_

File:

• branches/dev_001_GM/NEMO/TOP_SRC/trcdtr.F90 (modified) (7 diffs)

branches/dev_001_GM/NEMO/TOP_SRC/trcdtr.F90

@@ -8 +8 @@
    !!             1.0  !  2005-12  (O. Aumont, A. El Moussaoui) F90
    !!----------------------------------------------------------------------
-#if defined key_passivetrc
-   !!----------------------------------------------------------------------
-   !!   'key_passivetrc'                                    Passive tracers
+#if defined key_top
+   !!----------------------------------------------------------------------
+   !!   'key_top'                                                TOP models
    !!----------------------------------------------------------------------
    !!   trc_dtr    :  computes or READ initial DATA for passive tracer
@@ -42 +42 @@
       !!---------------------------------------------------------------------
       INTEGER :: ji,jj,jk,jn 
-#if defined key_trc_pisces
+#if defined key_pisces
       REAL(wp) ::   alka0, oxyg0, calc0, bioma0
       REAL(wp) ::   silic1, po4, no3, caralk, bicarb, co3
@@ -56 +56 @@
       trn(:,:,:,:) = 0.e0
       
-#elif defined key_trc_pisces
+#elif defined key_pisces
       ! PISCES initialisation
       ! ---------------------
@@ -75 +75 @@
       trn(:,:,:,jppo4) = po4
       trn(:,:,:,jppoc) = bioma0
-#if ! defined key_trc_kriest
+#if ! defined key_kriest
       trn(:,:,:,jpgoc) = bioma0
       trn(:,:,:,jpbfe) = bioma0 * 5.e-6
@@ -119 +119 @@
       IF(lwp) WRITE(numout,*) ' '
 
-#elif defined key_trc_lobster1 && ( defined key_eel_r6 || defined key_eel_r2 )
+#elif defined key_lobster && ( defined key_eel_r6 || defined key_eel_r2 )
       ! LOBSTER initialisation for EEL
       ! ----------------------
@@ -195 +195 @@
       trn(:,:,30,jpno3) = 20.01 * tmask(:,:,30)
 
-#elif defined key_trc_lobster1 && defined key_gyre
+#elif defined key_lobster && defined key_gyre
       ! LOBSTER initialisation for GYRE
       ! ----------------------
@@ -237 +237 @@
       trb(:,:,:,:) = trn(:,:,:,:)
 
-#if defined key_trc_lobster1
+#if defined key_lobster
       !  initialize the POC in sediments
       sedpocb(:,:) = 0.e0