--- MITgcm/pkg/dic/dic_surfforcing.F 2007/08/28 02:30:31 1.17 +++ MITgcm/pkg/dic/dic_surfforcing.F 2008/04/04 21:37:06 1.20 @@ -1,4 +1,4 @@ -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.20 2008/04/04 21:37:06 dfer Exp $ C $Name: $ #include "DIC_OPTIONS.h" @@ -25,7 +25,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 @@ -66,16 +66,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 ================================================================= @@ -132,7 +132,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), @@ -144,15 +144,15 @@ 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) ) 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 @@ -179,14 +179,14 @@ & 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 + 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!