--- MITgcm_contrib/jscott/igsm/src/atmosphere.F 2009/09/01 21:56:40 1.11 +++ MITgcm_contrib/jscott/igsm/src/atmosphere.F 2009/09/17 15:48:38 1.12 @@ -1,4 +1,4 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/jscott/igsm/src/atmosphere.F,v 1.11 2009/09/01 21:56:40 jscott Exp $ +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" @@ -90,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 @@ -216,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 @@ -236,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 @@ -451,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 @@ -1587,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 @@ -1599,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,