Changeset 772 for branches/dev_001_GM/NEMO/TOP_SRC/trcdta.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/trcdta.F90 (modified) (3 diffs)

branches/dev_001_GM/NEMO/TOP_SRC/trcdta.F90

@@ -8 +8 @@
    !!              -   !  2005-03  (O. Aumont, A. El Moussaoui) F90
    !!----------------------------------------------------------------------
-#if  defined key_passivetrc  &&  defined key_dtatrc
-   !!----------------------------------------------------------------------
-   !!   'key_passivetrc'  and  'key_dtatrc'          3D passive tracer data
+#if  defined key_top  &&  defined key_dtatrc
+   !!----------------------------------------------------------------------
+   !!   'key_top'  and  'key_dtatrc'        TOP model + passive tracer data
    !!----------------------------------------------------------------------
    !!   dta_trc      : read ocean passive tracer data
@@ -94 +94 @@
                IF(lwp) WRITE(numout,*) ' trc_dta : Levitus tracer data monthly fields'
                ! open file 
-# if defined key_trc_pisces
+# if defined key_pisces
                clname(jn) = 'LEVITUS_'//ctrcnm(jn)
 # else
@@ -103 +103 @@
             ENDIF
 
-# if defined key_trc_pisces
+# if defined key_pisces
             ! Read montly file
             IF( ( kt == nittrc000 .AND. nlectr(jn) == 0)  .OR. imois /= ntrc1(jn) ) THEN