--- MITgcm/pkg/dic/dic_surfforcing.F 2007/10/26 21:08:13 1.18 +++ MITgcm/pkg/dic/dic_surfforcing.F 2010/04/11 22:03:53 1.23 @@ -1,9 +1,8 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/dic/dic_surfforcing.F,v 1.18 2007/10/26 21:08:13 dfer Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/dic/dic_surfforcing.F,v 1.23 2010/04/11 22:03:53 jmc Exp $ C $Name: $ #include "DIC_OPTIONS.h" #include "PTRACERS_OPTIONS.h" -#include "GCHEM_OPTIONS.h" CBOP C !ROUTINE: DIC_SURFFORCING @@ -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 @@ -142,7 +141,8 @@ 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 myThid ) ELSE pCO2(i,j,bi,bj)=0. _d 0 ENDIF