--- MITgcm_contrib/jscott/igsm/src/atmosphere.F	2007/10/17 21:07:21	1.10
+++ MITgcm_contrib/jscott/igsm/src/atmosphere.F	2009/09/17 15:48:38	1.12
@@ -1,4 +1,5 @@
-c source 2007 sokolov users  76203 Apr 25 15:29 atmosphere.F
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/jscott/igsm/src/atmosphere.F,v 1.12 2009/09/17 15:48:38 jscott Exp $
+C $Name:  $
 
 #include "ctrparam.h"
 
@@ -89,7 +90,7 @@
       common/SURRAD/TRSURF(JM0,4),SRSURF(JM0,4)
       dimension RTGOAV(JM0,lmo)
       common/tprmtg/tprmg(JM0),ntprmg(JM0)
-      common/aexpc/AEXP,ISTRT1,ISTRTCHEM,LYEAREM
+      common/aexpc/AEXP,ISTRT1,ISTRTCHEM
       common/mixlr/Z1OAV(JM0),NZ1OAV(JM0)
       common/flxio/FLIO(JM0),NFLIO(JM0)
       common/surps/srps(JM0+3),nsrps
@@ -215,13 +216,7 @@
 ! --- Set year and month index:
 !
       myyear  = 1       !year from starting point
-      myyear  = JYEAR-1976       !year from starting point
-!     myyear  = JYEAR-1891       !year from starting point
-      print *,'Emissioms for ',nchemyr,' year'
-      myyearlast  = min(LYEAREM-1976,nchemyr)  !last year of emission
-!     myyearlast  = min(LYEAREM-1891,nchemyr)  !last year of emission
-!     myyear = min(myyear,nchemyr)
-      myyear = min(myyear,myyearlast)
+      iyearchem  = 1       !year from starting point
       mymonth = 1       !month
 
       ihaha = 1
@@ -235,10 +230,6 @@
       do k=1,nlev
         cfcnsf(k) = 0.0
       enddo
-      print *,'First year of emissions ', myyear
-!     print *,'Emission will be fixed at year ',LYEAREM
-      print *,'Emission will be fixed at year ',1976+myyearlast
-!     print *,'Emission will be fixed at year ',1891+myyearlast
 !
 #endif
  
@@ -450,11 +441,13 @@
 c      New run
 c      Reading from flin_nep
         read(537)adupt,temco2
+     &     ,temch4,temn2o
       else
 c      Restart of the run
 c      Reading from last_nep
 cjrs   file previously opened in input.F
        read(876)adupt,temco2
+     &    ,temch4,temn2o
 C       CLOSE(876) 
        rewind 876
       endif
@@ -920,7 +913,8 @@
 
 	call chemmass66(1.0, 1.0,zco2,zco2mass)
 
-	call chemmass6(150.0,1.0,xn2o,xn2omass)
+!call chemmass6(150.0,1.0,xn2o,xn2omass)
+        call chemmass6(120.0,1.0,xn2o,xn2omass)
 	call chemmass2(1.0,ch4, ch4mass )
 
         ! === if hfc, pfc, and sf6 are included:
@@ -1081,7 +1075,9 @@
       i=1
       do j=1,jm
          pcpl4clm(i,j)=pcpl4clm(i,j)*prlnd2total(j,mndriver)
+     &     *3600./(NDYN*DT)
          pcpc4clm(i,j)=pcpc4clm(i,j)*prlnd2total(j,mndriver)
+     &     *3600./(NDYN*DT)
       enddo
 !     print *,' main after surf4clm',' TAU=',TAU
 !       print  ('2(12f7.2,/,11f7.2,/)'),ps4clm,pcpl4clm,
@@ -1583,9 +1579,7 @@
 !
       mymonth = mymonth + 1
       if(mymonth.gt.12)then
-        myyear  = myyear +1
-!       myyear = min(myyear,nchemyr)
-        myyear = min(myyear,myyearlast)
+        iyearchem  = iyearchem +1
         mymonth = 1
 !     endif ! 27/8/2005
 
@@ -1595,8 +1589,8 @@
 ! ===   at end of each year: 27/8/2005
 !
         rewind 178
-        print *,'For chem restart ',myyear,mymonth
-        write(178)myyear,mymonth,airmass,
+        print *,'For chem restart ',iyearchem,mymonth
+        write(178)iyearchem,mymonth,airmass,
      &              cfc11,cfc110,
      &              cfc11m,
      &              cfc11sd,