Changeset 1007 for trunk/NEMO/TOP_SRC/PISCES/p4zflx.F90

Timestamp:

2008-05-30T11:50:33+02:00 (16 years ago)

Author:

cetlod

Message:

Update PISCES modules to take into account the re-organization of TOP initialization phase, see ticket 170

File:

• trunk/NEMO/TOP_SRC/PISCES/p4zflx.F90 (modified) (3 diffs)

trunk/NEMO/TOP_SRC/PISCES/p4zflx.F90

@@ -33 +33 @@
      atcco2 = 278.           !:
 
-   REAL(wp) ::   &
-     xrhoa  = 1.22   ,   &   !: Air density kg/m3
-     xcd    = 1.5e-3         !: drag coefficient
-
    REAL(wp) :: &
      tco2flx = 0.            !: Total flux of carbon per year
@@ -60 +56 @@
       INTEGER, INTENT(in) :: kt
       INTEGER  ::   ji, jj, jrorr, nspyr
-      REAL(wp) ::   zttc, ztx, zty, ztau, zws, zkgwan
+      REAL(wp) ::   zttc, zws, zkgwan
       REAL(wp) ::   zfld, zflu, zfld16, zflu16, zfact
       REAL(wp) ::   zph, zah2, zbot, zdic, zalk, zschmitto2, zalka, zschmittco2
@@ -131 +127 @@
             zschmitto2  = 1953.4 - 128.0 * zttc + 3.9918 * zttc**2 - 0.050091 * zttc**3
 
-            ! Estimation of wind speed as a function of wind stress
-            ztx  = utau(ji,jj) * umask(ji,jj,1)
-            zty  = vtau(ji,jj) * vmask(ji,jj,1)
-            ztau = SQRT( ztx * ztx + zty * zty )
-            zws  = SQRT ( ztau / ( xrhoa * xcd ) )
+            !  wind speed 
+            zws  = wndm(ji,jj)
 
       ! Compute the piston velocity for O2 and CO2