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

Timestamp:

2007-12-17T17:55:32+01:00 (16 years ago)

Author:

gm

Message:

dev_001_GM - small changes : compilation OK

File:

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

branches/dev_001_GM/NEMO/TOP_SRC/trcdtr.F90

@@ -41 +41 @@
       !! ** Method  : 
       !!---------------------------------------------------------------------
-      INTEGER :: ji,jj,jk,jn 
-#if defined key_pisces
+      INTEGER ::   jn 
+# if defined key_pisces
+      INTEGER ::   ji, jj, jk 
       REAL(wp) ::   alka0, oxyg0, calc0, bioma0
       REAL(wp) ::   silic1, po4, no3, caralk, bicarb, co3
-#endif
+# endif
       !!---------------------------------------------------------------------
 
@@ -52 +53 @@
       IF(lwp) WRITE(numout,*) '~~~~~~~'
 
-#if defined key_cfc
-      ! CFC initialisation
-      trn(:,:,:,:) = 0.e0
+      IF( lk_cfc ) THEN
+         DO jn = jp_cfc0,jp_cfc1
+            trn(:,:,:,jn) = 0.e0      ! CFC initialisation to zera
+         END DO
+      ENDIF
       
-#elif defined key_pisces
+# if defined key_pisces
       ! PISCES initialisation
       ! ---------------------
@@ -75 +78 @@
       trn(:,:,:,jppo4) = po4
       trn(:,:,:,jppoc) = bioma0
-#if ! defined key_kriest
+#  if ! defined key_kriest
       trn(:,:,:,jpgoc) = bioma0
       trn(:,:,:,jpbfe) = bioma0 * 5.e-6
-#else
+#  else
       trn(:,:,:,jpnum) = bioma0 / ( 6. *xkr_massp )
-#endif
+#  endif
       trn(:,:,:,jpsil) = silic1
       trn(:,:,:,jpbsi) = bioma0 * 0.15
@@ -119 +122 @@
       IF(lwp) WRITE(numout,*) ' '
 
-#elif defined key_lobster && ( 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 +198 @@
       trn(:,:,30,jpno3) = 20.01 * tmask(:,:,30)
 
-#elif defined key_lobster && defined key_gyre
+# elif defined key_lobster && defined key_gyre
       ! LOBSTER initialisation for GYRE
       ! ----------------------
@@ -216 +219 @@
       END DO
 
-#else
+# else
       ! Default case 
       ! ------------
@@ -223 +226 @@
       END DO
 
-#endif
-
-#if defined key_dtatrc
+# endif
+
+# if defined key_dtatrc
      ! Initialization of tracer from a file that may also be used for damping
       CALL dta_trc( nittrc000 )
@@ -231 +234 @@
         IF( lutini(jn) )   trn(:,:,:,jk) = trdta(:,:,:,jn) * tmask(:,:,:)   ! initialisation from file if required
       END DO
-#endif
+# endif
 
       ! before field :
@@ -237 +240 @@
       trb(:,:,:,:) = trn(:,:,:,:)
 
-#if defined key_lobster
+# if defined key_lobster
       !  initialize the POC in sediments
       sedpocb(:,:) = 0.e0
       sedpocn(:,:) = 0.e0
       sedpoca(:,:) = 0.e0
-#endif
+# endif
       !
    END SUBROUTINE trc_dtr