--- MITgcm_contrib/jscott/igsm/src/atmosphere.F 2007/05/08 15:55:36 1.5 +++ MITgcm_contrib/jscott/igsm/src/atmosphere.F 2007/08/24 19:26:15 1.8 @@ -117,7 +117,7 @@ #endif #if ( defined CPL_OCEANCO2 ) -#include "OCM.COM" +#include "OCM.h" common /Garyflux/pC_atm(jm0),wind_amp,fluxco2(jm0) # if ( defined ML_2D ) common/Garyclim/tggary(jm0),wsgary(jm0),areaml(jm0),arsrf(jm0) @@ -365,7 +365,8 @@ NSTEP2=NSTEP 29.6 MRCHT=0. 29.7 ITAU=(NSTEP+NSTEP0)*IDTHR 30. - TAU=FLOAT(ITAU)/XINT 31. +cjrs changed to dfloat 8/2/07 + TAU=DFLOAT(ITAU)/XINT 31. IDAY=1+ITAU/I24 32. TOFDAY=(ITAU-(IDAY-1)*I24)/XINT 33. ! if(ISTART.eq.2.or.ISTRT1.eq.0.and..not.CONTRR)then @@ -1256,7 +1257,8 @@ C**** 189. 500 NSTEP=NSTEP+NDYN 190. ITAU=(NSTEP+NSTEP0)*IDTHR 191. - TAU=FLOAT(ITAU)/XINT 192. +cJRS fix to DFLOAT 8/2/07 + TAU=DFLOAT(ITAU)/XINT 192. IDAY=1+ITAU/I24 193. TOFDAYPR=TOFDAY+1.00 TOFDAY=(ITAU-(IDAY-1)*I24)/XINT 194. @@ -1878,13 +1880,16 @@ C DTATM time step of atm model in hours C precip and evap in mm/day or kg/m**2/day do j=1,jm0 -#if ( defined OCEAN_3D && defined CPL_OCEANCO2 ) - ncallatm=ncallatm+1 +Cjrs #if ( defined OCEAN_3D && defined CPL_OCEANCO2 ) +#ifdef OCEAN_3D +!jrs ncallatm=ncallatm+1 ! 020107 ! co24ocean(j)=pC_atm(j)*1.e6 +! jrs give CO2 even if ocn carbon off co24ocean(j)=atm_co2(j) -! 020107 +# ifdef CPL_OCEANCO2 co24ocnan(j)=co24ocnan(j)+co24ocean(j) +# endif #endif #ifdef ML_2D cjrs block only MD_2D