--- MITgcm/pkg/dic/dic_surfforcing.F	2004/08/06 19:50:52	1.8
+++ MITgcm/pkg/dic/dic_surfforcing.F	2006/11/28 21:16:03	1.12
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/dic/dic_surfforcing.F,v 1.8 2004/08/06 19:50:52 stephd Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/dic/dic_surfforcing.F,v 1.12 2006/11/28 21:16:03 stephd Exp $
 C $Name:  $
 
 #include "DIC_OPTIONS.h"
@@ -9,7 +9,7 @@
 C !ROUTINE: DIC_SURFFORCING
 
 C !INTERFACE: ==========================================================
-      SUBROUTINE DIC_SURFFORCING( PTR_CO2 , GDC, 
+      SUBROUTINE DIC_SURFFORCING( PTR_CO2 , PTR_ALK, PTR_PO4, GDC, 
      I           bi,bj,imin,imax,jmin,jmax,
      I           myIter,myTime,myThid)
 
@@ -26,10 +26,6 @@
 #include "GRID.h"
 #include "FFIELDS.h"
 #include "DIC_ABIOTIC.h"
-#ifdef DIC_BIOTIC
-#include "PTRACERS_SIZE.h"
-#include "PTRACERS.h"
-#endif
 
 C !INPUT PARAMETERS: ===================================================
 C  myThid               :: thread number
@@ -39,6 +35,8 @@
       INTEGER myIter, myThid
       _RL myTime
       _RL  PTR_CO2(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)
+      _RL  PTR_ALK(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)
+      _RL  PTR_PO4(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)
       INTEGER iMin,iMax,jMin,jMax, bi, bj
 
 C !OUTPUT PARAMETERS: ===================================================
@@ -75,14 +73,14 @@
 
 C =================================================================
 C determine inorganic carbon chem coefficients
-        DO j=1-OLy,sNy+OLy
-         DO i=1-OLx,sNx+OLx
+        DO j=jmin,jmax
+         DO i=imin,imax
 
 #ifdef DIC_BIOTIC
 cQQQQ check ptracer numbers
-             surfalk(i,j) = PTRACER(i,j,klev,bi,bj,2)
+             surfalk(i,j) = PTR_ALK(i,j,klev)
      &                          * maskC(i,j,kLev,bi,bj)
-             surfphos(i,j)  = PTRACER(i,j,klev,bi,bj,3)
+             surfphos(i,j)  = PTR_PO4(i,j,klev)
      &                          * maskC(i,j,kLev,bi,bj)
 #else
              surfalk(i,j) = 2.366595 * salt(i,j,kLev,bi,bj)/gsm_s
@@ -101,9 +99,9 @@
 
 c pCO2 solver...
 C$TAF LOOP = parallel
-       DO j=1-OLy,sNy+OLy
+       DO j=jmin,jmax
 C$TAF LOOP = parallel
-        DO i=1-OLx,sNx+OLx
+        DO i=imin,imax
 
           IF(maskC(i,j,kLev,bi,bj) .NE. 0.)THEN
             CALL CALC_PCO2_APPROX(
@@ -122,8 +120,8 @@
         ENDDO
        ENDDO
 
-       DO j=1-OLy,sNy+OLy
-        DO i=1-OLx,sNx+OLx
+       DO j=jmin,jmax
+        DO i=imin,imax
 
             IF (maskC(i,j,kLev,bi,bj).NE.0.) THEN
 C calculate SCHMIDT NO. for CO2
@@ -140,13 +138,14 @@
      &          AtmosP(i,j,bi,bj)*AtmospCO2(i,j,bi,bj)
 c find exchange coefficient
 c  account for schmidt number and and varible piston velocity
+              pisvel(i,j,bi,bj)  =0.337*wind(i,j,bi,bj)**2/3.6d5
               Kwexch(i,j) =
      &             pisvel(i,j,bi,bj)
      &             / sqrt(SchmidtNoDIC(i,j)/660.0)
 c OR use a constant  coeff
 c             Kwexch(i,j) = 5e-5
 c ice influence
-cQQ           Kwexch(i,j)  =(1.d0-Fice(i,j,bi,bj))*Kwexch(i,j)
+              Kwexch(i,j)  =(1.d0-Fice(i,j,bi,bj))*Kwexch(i,j)
 
 
 C Calculate flux in terms of DIC units using K0, solubility
@@ -184,9 +183,10 @@
          ENDDO
 
 C update tendency      
-         DO j=1-OLy,sNy+OLy
-          DO i=1-OLx,sNx+OLx
-           GDC(i,j)= maskC(i,j,kLev,bi,bj)*recip_drF(kLev)*(
+         DO j=jmin,jmax
+          DO i=imin,imax
+           GDC(i,j)= maskC(i,j,kLev,bi,bj)*recip_drF(kLev)*
+     &                     recip_hFacC(i,j,kLev,bi,bj)*(
      &                    FluxCO2(i,j,bi,bj) + VirtualFlux(i,j)
      &                                              )
           ENDDO