--- MITgcm/pkg/dic/dic_surfforcing.F	2007/08/28 02:30:31	1.17
+++ MITgcm/pkg/dic/dic_surfforcing.F	2010/04/12 20:07:57	1.24
@@ -1,21 +1,20 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/dic/dic_surfforcing.F,v 1.17 2007/08/28 02:30:31 dfer Exp $
+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 $Name:  $
 
 #include "DIC_OPTIONS.h"
 #include "PTRACERS_OPTIONS.h"
-#include "GCHEM_OPTIONS.h"
 
 CBOP
 C !ROUTINE: DIC_SURFFORCING
 
 C !INTERFACE: ==========================================================
-      SUBROUTINE DIC_SURFFORCING( PTR_CO2 , PTR_ALK, PTR_PO4, GDC, 
+      SUBROUTINE DIC_SURFFORCING( PTR_CO2 , PTR_ALK, PTR_PO4, GDC,
      I           bi,bj,imin,imax,jmin,jmax,
      I           myIter,myTime,myThid)
 
 C !DESCRIPTION:
-C  Calculate the carbon air-sea flux terms              
-C  following external_forcing_dic.F (OCMIP run) from Mick            
+C  Calculate the carbon air-sea flux terms
+C  following external_forcing_dic.F (OCMIP run) from Mick
 
 C !USES: ===============================================================
       IMPLICIT NONE
@@ -25,7 +24,7 @@
 #include "PARAMS.h"
 #include "GRID.h"
 #include "FFIELDS.h"
-#include "DIC_ABIOTIC.h"
+#include "DIC_VARS.h"
 
 C !INPUT PARAMETERS: ===================================================
 C  myThid               :: thread number
@@ -46,7 +45,7 @@
 #ifdef ALLOW_PTRACERS
 
 C !LOCAL VARIABLES: ====================================================
-       INTEGER I,J, kLev, it
+       INTEGER i,j, kLev
 C Number of iterations for pCO2 solvers...
 C Solubility relation coefficients
       _RL SchmidtNoDIC(1-OLx:sNx+OLx,1-OLy:sNy+OLy)
@@ -66,16 +65,16 @@
 
       kLev=1
 
-c if coupled to atmsopheric model, use the
-c Co2 value passed from the coupler
-#ifndef USE_ATMOSCO2
-C PRE-INDUSTRIAL STEADY STATE pCO2 = 278.0 ppmv
-       DO j=1-OLy,sNy+OLy
-        DO i=1-OLx,sNx+OLx
-           AtmospCO2(i,j,bi,bj)=278.0 _d -6
-        ENDDO
-       ENDDO
-#endif
+cc if coupled to atmsopheric model, use the
+cc Co2 value passed from the coupler
+c#ifndef USE_ATMOSCO2
+cC PRE-INDUSTRIAL STEADY STATE pCO2 = 278.0 ppmv
+c       DO j=1-OLy,sNy+OLy
+c        DO i=1-OLx,sNx+OLx
+c           AtmospCO2(i,j,bi,bj)=278.0 _d -6
+c        ENDDO
+c       ENDDO
+c#endif
 
 
 C =================================================================
@@ -101,7 +100,7 @@
 
          CALL CARBON_COEFFS(
      I                       theta,salt,
-     I                       bi,bj,iMin,iMax,jMin,jMax)
+     I                       bi,bj,iMin,iMax,jMin,jMax,myThid)
 C====================================================================
 
        DO j=jmin,jmax
@@ -132,7 +131,7 @@
 C$TAF LOOP = parallel
         DO i=imin,imax
 
-          IF(maskC(i,j,kLev,bi,bj) .NE. 0.)THEN
+          IF ( maskC(i,j,kLev,bi,bj).NE.0. _d 0 ) THEN
             CALL CALC_PCO2_APPROX(
      I        theta(i,j,kLev,bi,bj),salt(i,j,kLev,bi,bj),
      I        PTR_CO2(i,j,kLev), surfphos(i,j),
@@ -142,28 +141,29 @@
      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        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) )
+     U        pH(i,j,bi,bj),pCO2(i,j,bi,bj),
+     I        i,j,kLev,bi,bj,myIter,myThid )
           ELSE
-             pCO2(i,j,bi,bj)=0. _d 0
-          END IF
+            pCO2(i,j,bi,bj)=0. _d 0
+          ENDIF
         ENDDO
        ENDDO
 
        DO j=jmin,jmax
         DO i=imin,imax
 
-            IF (maskC(i,j,kLev,bi,bj).NE.0.) THEN
+          IF ( maskC(i,j,kLev,bi,bj).NE.0. _d 0 ) THEN
 C calculate SCHMIDT NO. for CO2
-              SchmidtNoDIC(i,j) = 
-     &            sca1 
+              SchmidtNoDIC(i,j) =
+     &            sca1
      &          + sca2 * theta(i,j,kLev,bi,bj)
-     &          + sca3 * theta(i,j,kLev,bi,bj)*theta(i,j,kLev,bi,bj)  
-     &          + sca4 * theta(i,j,kLev,bi,bj)*theta(i,j,kLev,bi,bj) 
+     &          + sca3 * theta(i,j,kLev,bi,bj)*theta(i,j,kLev,bi,bj)
+     &          + sca4 * theta(i,j,kLev,bi,bj)*theta(i,j,kLev,bi,bj)
      &                *theta(i,j,kLev,bi,bj)
 
 C Determine surface flux (FDIC)
 C first correct pCO2at for surface atmos pressure
-              pCO2sat(i,j) = 
+              pCO2sat(i,j) =
      &          AtmosP(i,j,bi,bj)*AtmospCO2(i,j,bi,bj)
 
 C then account for Schmidt number
@@ -174,19 +174,19 @@
 C Flux = Vp * ([CO2sat] - [CO2])
 C CO2sat = K0*pCO2atmos*P/P0
 C Converting pCO2 to [CO2] using ff, as in CALC_PCO2
-              FluxCO2(i,j,bi,bj) = 
-     &         Kwexch(i,j)*( 
-     &         ak0(i,j,bi,bj)*pCO2sat(i,j) - 
-     &         ff(i,j,bi,bj)*pCO2(i,j,bi,bj) 
-     &         ) 
-            ELSE
-               FluxCO2(i,j,bi,bj) = 0. _d 0
-            ENDIF
+              FluxCO2(i,j,bi,bj) =
+     &         Kwexch(i,j)*(
+     &         ak0(i,j,bi,bj)*pCO2sat(i,j) -
+     &         ff(i,j,bi,bj)*pCO2(i,j,bi,bj)
+     &         )
+          ELSE
+              FluxCO2(i,j,bi,bj) = 0. _d 0
+          ENDIF
 C convert flux (mol kg-1 m s-1) to (mol m-2 s-1)
             FluxCO2(i,j,bi,bj) = FluxCO2(i,j,bi,bj)/permil
 
 #ifdef ALLOW_OLD_VIRTUALFLUX
-            IF (maskC(i,j,kLev,bi,bj).NE.0.) THEN
+            IF (maskC(i,j,kLev,bi,bj).NE.0. _d 0) THEN
 c calculate virtual flux
 c EminusPforV = dS/dt*(1/Sglob)
 C NOTE: Be very careful with signs here!
@@ -206,11 +206,11 @@
           ENDDO
          ENDDO
 
-C update tendency      
+C update tendency
          DO j=jmin,jmax
           DO i=imin,imax
            GDC(i,j)= recip_drF(kLev)*recip_hFacC(i,j,kLev,bi,bj)
-     &              *(FluxCO2(i,j,bi,bj) 
+     &              *(FluxCO2(i,j,bi,bj)
 #ifdef ALLOW_OLD_VIRTUALFLUX
      &              + VirtualFlux(i,j)
 #endif