Changeset 433 for trunk/NEMO/TOP_SRC/trcdtr.F90

Timestamp:

2006-04-10T17:40:29+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_044 : CT : update the passive tracers TOP component and the standard GYRE configuration

File:

• trunk/NEMO/TOP_SRC/trcdtr.F90 (modified) (4 diffs)

trunk/NEMO/TOP_SRC/trcdtr.F90

@@ -109 +109 @@
       trn(:,:,:,jpdfe) = bioma0*5.E-6
       trn(:,:,:,jpnfe) = bioma0*5.E-6
-      trn(:,:,:,jpdsi) = bioma0*0.15
+      trn(:,:,:,jpdsi) = bioma0*5.E-6
       trn(:,:,:,jpnch) = bioma0*12./55.
       trn(:,:,:,jpdch) = bioma0*12./55.
@@ -235 +235 @@
                   trn(ji,jj,jk,jpno3)=2.*tmask(ji,jj,jk)
                ELSE
-                  trn(ji,jj,jk,jpno3)=(13.24*(rhd(ji,jj,jk)*1000)-324.4)*tmask(ji,jj,jk)
+                  trn(ji,jj,jk,jpno3)=(15.55*(rhd(ji,jj,jk)*1000)-380.11)*tmask(ji,jj,jk)
                ENDIF
             END DO
@@ -244 +244 @@
  
 !! general case
-
-      trn(:,:,:,:)=0.1
+      do jn = 1, jptra
+         trn(:,:,:,jn)=0.1*tmask(:,:,:)
+      enddo
 
 #endif
@@ -252 +253 @@
 !!   Initialization of tracer from a file
 !!   that may also be used for damping
- 
       CALL dta_trc( nit000 )
-      DO  jn = 1, jptra
-        IF( lutini(jn) ) THEN 
+      DO  jk = 1, jptra
+        IF( lutini(jk) ) THEN 
 !! initialisation from file
-           trn(:,:,:,jn) = trdta(:,:,:,jn)
+           trn(:,:,:,jk) = trdta(:,:,:,jk)*tmask(:,:,:)
         ENDIF
       END DO