--- MITgcm_contrib/jscott/igsm/src/atmosphere.F 2007/08/02 15:48:07 1.7 +++ MITgcm_contrib/jscott/igsm/src/atmosphere.F 2009/09/01 21:56:40 1.11 @@ -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.11 2009/09/01 21:56:40 jscott Exp $ +C $Name: $ #include "ctrparam.h" @@ -335,8 +336,6 @@ READ (546) 245 continue endif - WRITE(503) OFFSSW 17.1 - REWIND 503 17.2 c CALL FRTR0(IO) 18. KBGN=KINC+1 18.5 KM2=KM*2-1 18.51 @@ -452,20 +451,17 @@ c New run c Reading from flin_nep read(537)adupt,temco2 - else + else c Restart of the run c Reading from last_nep - read(367)adupt,temco2 -! & ,temch4,temn2o - rewind 367 - endif -! -! adupt= 1.459814341652516 -! adupt= 0.9078891180588442 -! adupt= 0.25 -! adupt= -0.1123070421398009 -! -! adupt= adupt+0.9 ! for vs23 +cjrs file previously opened in input.F + read(876)adupt,temco2 +C CLOSE(876) + rewind 876 + endif + +cjrs next line per Andrei instruction 10/12/07 + adupt= 0.0 aduptd=adupt/(365.*JM) temnepgl=0.0 @@ -663,13 +659,10 @@ PERCNT=100.*MELSE/(MSTART-MNOW+1.E-5) 56. MLAST=MNOW 59. C**** TEST FOR TERMINATION OF RUN 60. - 200 READ (503,END=210) LABSSW 61. + 200 continue c HPRNT=TAU.gt.45.0.and.TAU.lt.60.0 c HPRNT=TAU.gt.470.0.and.TAU.lt.550.0 NCOMP=0 - 210 REWIND 503 61.1 - IF(LABSSW.EQ.LABEL1) KSS6=1 61.2 - IF(KSS6.EQ.1) GO TO 800 62. IF(TAU+.06125.GE.TAUE) GO TO 820 63. JDAY00=JDAY C**** IF TIME TO ZERO OUT DIAGNOSTIC ACCUMULATING ARRAYS, DO SO 64. @@ -928,7 +921,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: @@ -1089,7 +1083,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, @@ -1880,13 +1876,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 @@ -2079,7 +2078,6 @@ return C CALL ENQJOB 309. C CALL ENQJOB 310. - IF(KSS6.EQ.1) STOP 12 310.1 IF(IPFLAG.EQ.0) STOP 13 311. STOP 1 312. C**** 313.