Skip to content

Commit

Permalink
minor edit for isav_icm
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolecx122 committed Jul 4, 2020
1 parent 7d99eff commit 14de31d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/ICM/icm.F90
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,7 @@ subroutine photosynthesis(id,hour,nv,it)
write(errmsg,*)'check PB growth rKTGP22, xT:',xT,rKTGP22(id),rval,TGP2(id),Temp(k),ielg(id)
call parallel_abort(errmsg)
endif
GPT0(2) =GPM2(id)*exp(-rval)
GPT0(2)=GPM2(id)*exp(-rval)
endif !xT
if(iof_icm(43)==1) GPT(klev,id,2)=GPT0(2)

Expand Down
4 changes: 2 additions & 2 deletions src/ICM/read_icm_input.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1031,14 +1031,14 @@ subroutine read_icm_param
call get_param('icm.in','iCheck',1,iCheck,rtmp,stmp)
call get_param('icm.in','iout_icm',1,iout_icm,rtmp,stmp)
call get_param('icm.in','nspool_icm',1,nspool_icm,rtmp,stmp)
call get_param('icm.in','isav_icm',1,isav_icm,rtmp,stmp)
!call get_param('icm.in','isav_icm',1,isav_icm,rtmp,stmp)

!ncai
!check iLight
if(jLight>2) call parallel_abort('read_icm: jLight>2')
if(iRea>1) call parallel_abort('read_icm: iRea>1')
if(max(iAtm,iSed,iBen,iRad)>2) call parallel_abort('read_icm: iAtm,iSed,iBen,iRad')
if(isav_icm/=0.and.isav_icm/=1) call parallel_abort('read_icm: illegal isav_icm')
!if(isav_icm/=0.and.isav_icm/=1) call parallel_abort('read_icm: illegal isav_icm')
if(iRad==1.and.(ihconsv==0.or.nws/=2)) call parallel_abort('read_icm: iRad=1 needs heat exchange')
if(jLight==1.and.(iRad/=2)) call parallel_abort('read_icm: iRad=2 is required for jLight=1')
! if(iReg/=0.and.iReg/=1) call parallel_abort('read_icm: invalid iReg')
Expand Down

0 comments on commit 14de31d

Please sign in to comment.