--- MITgcm/pkg/dic/dic_surfforcing.F	2010/04/12 20:07:57	1.24
+++ MITgcm/pkg/dic/dic_surfforcing.F	2011/04/19 21:34:32	1.25
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/dic/dic_surfforcing.F,v 1.24 2010/04/12 20:07:57 jmc Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/dic/dic_surfforcing.F,v 1.25 2011/04/19 21:34:32 stephd Exp $
 C $Name:  $
 
 #include "DIC_OPTIONS.h"
@@ -139,7 +139,9 @@
      I        ak1(i,j,bi,bj),ak2(i,j,bi,bj),
      I        ak1p(i,j,bi,bj),ak2p(i,j,bi,bj),ak3p(i,j,bi,bj),
      I        aks(i,j,bi,bj),akb(i,j,bi,bj),akw(i,j,bi,bj),
-     I        aksi(i,j,bi,bj),akf(i,j,bi,bj),ff(i,j,bi,bj),
+     I        aksi(i,j,bi,bj),akf(i,j,bi,bj),
+     I        ak0(i,j,bi,bj), fugf(i,j,bi,bj),
+     I        ff(i,j,bi,bj),
      I        bt(i,j,bi,bj),st(i,j,bi,bj),ft(i,j,bi,bj),
      U        pH(i,j,bi,bj),pCO2(i,j,bi,bj),
      I        i,j,kLev,bi,bj,myIter,myThid )
@@ -170,6 +172,7 @@
               Kwexch(i,j) = Kwexch_Pre(i,j,bi,bj)
      &                    / sqrt(SchmidtNoDIC(i,j)/660.0 _d 0)
 
+#ifdef WATERVAP_BUG
 C Calculate flux in terms of DIC units using K0, solubility
 C Flux = Vp * ([CO2sat] - [CO2])
 C CO2sat = K0*pCO2atmos*P/P0
@@ -179,6 +182,17 @@
      &         ak0(i,j,bi,bj)*pCO2sat(i,j) -
      &         ff(i,j,bi,bj)*pCO2(i,j,bi,bj)
      &         )
+#else
+C Corrected by Val Bennington Nov 2010 per G.A. McKinley's finding
+C of error in application of water vapor correction
+c Flux = kw*rho*(ff*pCO2atm-k0*FugFac*pCO2ocean)
+               FluxCO2(i,j,bi,bj) =
+     &          Kwexch(i,j)*(
+     &            ff(i,j,bi,bj)*pCO2sat(i,j) -
+     &            pCO2(i,j,bi,bj)*fugf(i,j,bi,bj)
+     &            *ak0(i,j,bi,bj) )
+     &
+#endif
           ELSE
               FluxCO2(i,j,bi,bj) = 0. _d 0
           ENDIF