--- MITgcm_contrib/jscott/igsm/src/atmosphere.F	2007/04/23 21:20:17	1.4
+++ MITgcm_contrib/jscott/igsm/src/atmosphere.F	2007/08/24 19:26:15	1.8
@@ -1,4 +1,4 @@
-c source sokolov users  76203 Apr  7 12:46 atmosphere.F
+c source 2007 sokolov users  76203 Apr 25 15:29 atmosphere.F
 
 #include "ctrparam.h"
 
@@ -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
@@ -544,7 +545,6 @@
 #if ( defined CLM )
       NOCLM=.false.
 #endif
-      co2mmavd=0.0
       print *,' atmosphere DTATM=',DTATM
       print *,' It is running'
       print *,'End of atmospheric model initialization'
@@ -587,7 +587,7 @@
            solarnet_ice(j)=0.
            solarinc_ocean(j)=0.
            solarnet_ocean(j)=0.
-Cjrs why?           surfpr(j)=0.
+Cjrs not used anymore (?)           surfpr(j)=0.
            naveo(j)=0.
            navei(j)=0.
            navrad(j)=0.
@@ -601,24 +601,20 @@
 c
          enddo
 #endif
-#if ( defined OCEAN_3D && defined CPL_OCEANCO2 )
-!      SECDAY=24.*3600.
-       SECDAY=DTATM*3600.
-       co2mmav=0.0
-       do j=1,jmocean
-         co2mmav=co2mmav+mmco2flux(j)
-       enddo
-       print *,'CO2F form ocean TAU=',TAU,co2mmav*12.e-15
-Cjrs *** this block needs attention?? ***
-Cjrs       fluxco2(1)=fluxco2(1)+SECDAY*mmco2flux(1)
-       fluxco2(1)=fluxco2(1) + SECDAY*mmco2flux(2)   
-       do j=2,jm-1
-        fluxco2(j)=fluxco2(j)+SECDAY*mmco2flux(j-1)
+#ifdef OCEAN_3D
+C get data from atm-ocean common block
+       do j=1,jm0
+         ODATA(1,j,1)=mmsst(j)
+         ODATA(1,j,2)=mmfice(j)
+         GDATA(1,j,3)=mmtice(j)
+         GDATA(1,j,1)=mmsnowm(j)
+         ODATA(1,j,3)=mmicem(j)
+         GDATA(1,j,7)=0.5*(mmtice2(j)+mmtice1(j))
+#  ifdef CPL_OCEANCO2 
+         fluxco2(j)=fluxco2(j) + dtatm*3600.*mmco2flux(j)
+#  endif
        enddo
-Cjrs       fluxco2(JM)=fluxco2(JM)+SECDAY*mmco2flux(JMOCEAN)
-       fluxco2(JM)=fluxco2(JM) + SECDAY*mmco2flux(JM-1)
-# endif
-
+#endif
       WLMMAX=0.0
 C
   100 IF(.NOT.EVENT(TAUT)) GO TO 200                                      46.   
@@ -1261,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.   
@@ -1454,7 +1451,7 @@
        do j=1,jm
          OCUPT=OCUPT+fluxco2(j)
        enddo
-      print *,' OCUPT=',OCUPT*12.e-15
+!      print *,' OCUPT=',OCUPT*12.e-15
 
 #if ( defined CPL_CHEM )
 !
@@ -1883,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