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

Timestamp:

2007-02-21T14:03:10+01:00 (17 years ago)

Author:

opalod

Message:

* empty log message *

File:

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

trunk/NEMO/TOP_SRC/trcdtr.F90

@@ -63 +63 @@
 #if defined key_trc_pisces
       REAL(wp) :: alka0,oxyg0,calc0,bioma0,    &
-                  silic1,po4,no3,caralk,bicarb
+                  silic1,po4,no3,caralk,bicarb,co3
 #endif
 !!---------------------------------------------------------------------
@@ -91 +91 @@
 
       trn(:,:,:,jpdic) = sco2
+      trn(:,:,:,jpdoc) = bioma0
       trn(:,:,:,jptal) = alka0
       trn(:,:,:,jpoxy) = oxyg0
+      trn(:,:,:,jpcal) = calc0
       trn(:,:,:,jppo4) = po4
       trn(:,:,:,jppoc) = bioma0
+#if ! defined key_trc_kriest
+      trn(:,:,:,jpgoc) = bioma0
+      trn(:,:,:,jpbfe) = bioma0*5E-6
+#else
+      trn(:,:,:,jpnum) = bioma0/(6.*xkr_massp)
+#endif
       trn(:,:,:,jpsil) = silic1
-      trn(:,:,:,jpcal) = calc0
+      trn(:,:,:,jpbsi) = bioma0*0.15
+      trn(:,:,:,jpdsi) = bioma0*5.E-6
       trn(:,:,:,jpphy) = bioma0
+      trn(:,:,:,jpdia) = bioma0
       trn(:,:,:,jpzoo) = bioma0
-      trn(:,:,:,jpdoc) = bioma0
-      trn(:,:,:,jpdia) = bioma0
       trn(:,:,:,jpmes) = bioma0
-      trn(:,:,:,jpbsi) = bioma0*0.15
       trn(:,:,:,jpfer) = 0.6E-9
-      trn(:,:,:,jpbfe) = bioma0*5E-6
-      trn(:,:,:,jpgoc) = bioma0
       trn(:,:,:,jpsfe) = bioma0*5.E-6
       trn(:,:,:,jpdfe) = bioma0*5.E-6
       trn(:,:,:,jpnfe) = bioma0*5.E-6
-      trn(:,:,:,jpdsi) = bioma0*5.E-6
       trn(:,:,:,jpnch) = bioma0*12./55.
       trn(:,:,:,jpdch) = bioma0*12./55.
-      trn(:,:,:,jpno3) = no3 
+      trn(:,:,:,jpno3) = no3
       trn(:,:,:,jpnh4) = bioma0
+
 
 !!  Initialization of chemical variables of the carbon cycle
@@ -123 +128 @@
               caralk = trn(ji,jj,jk,jptal)-         & 
                       borat(ji,jj,jk)/(1.+1.E-8/(rtrn+akb3(ji,jj,jk)))
-              co3(ji,jj,jk)=(caralk-trn(ji,jj,jk,jpdic))*tmask(ji,jj,jk)       & 
-                     +(1.-tmask(ji,jj,jk))*.5e-3
+               co3 = (caralk-trn(ji,jj,jk,jpdic))*tmask(ji,jj,jk)   &
+                  &        +(1.-tmask(ji,jj,jk))*.5e-3
               bicarb = (2.*trn(ji,jj,jk,jpdic)-caralk)
-              hi(ji,jj,jk) = (ak23(ji,jj,jk)*bicarb/co3(ji,jj,jk))             &  
+              hi(ji,jj,jk) = (ak23(ji,jj,jk)*bicarb/co3)             &  
                 *tmask(ji,jj,jk)+(1.-tmask(ji,jj,jk))*1.e-9
           ENDDO
@@ -132 +137 @@
       ENDDO
 
-      h2co3(:,:) = 1.e-5
 
 !!  initialize the half saturation constant for silicate