Skip to content

Commit 71a60a4

Browse files
committed
hack: disabled perennial and mulch_pruning for now
Doing this to see if Wuestebach CI test passes
1 parent a214d01 commit 71a60a4

1 file changed

Lines changed: 13 additions & 2 deletions

File tree

src/clm5/main/pftconMod.F90

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -768,11 +768,22 @@ subroutine InitRead(this)
768768
call ncd_io('season_decid', this%season_decid, 'read', ncid, readvar=readv, posNOTonfile=.true.)
769769
if ( .not. readv ) call endrun(msg=' ERROR: error in reading in pft data'//errMsg(sourcefile, __LINE__))
770770

771+
772+
!!
773+
!! TODO: Can we make perennial and mulch_pruning optional?
774+
!!
771775
call ncd_io('perennial', this%perennial, 'read', ncid, readvar=readv, posNOTonfile=.true.)
772-
if ( .not. readv ) call endrun(msg=' ERROR: error in reading in pft data'//errMsg(sourcefile, __LINE__))
776+
if ( .not. readv ) then
777+
write(iulog,*) 'WARNING: perennial not present in pft file'
778+
!call endrun(msg=' ERROR: error in reading in pft data'//errMsg(sourcefile, __LINE__))
779+
endif
773780

774781
call ncd_io('mulch_pruning', this%mulch_pruning, 'read', ncid, readvar=readv, posNOTonfile=.true.)
775-
if ( .not. readv ) call endrun(msg=' ERROR: error in reading in pft data'//errMsg(sourcefile, __LINE__))
782+
if ( .not. readv ) then
783+
write(iulog,*) 'WARNING: mulch_pruning is not present in pft file'
784+
!call endrun(msg=' ERROR: error in reading in pft data'//errMsg(sourcefile, __LINE__))
785+
endif
786+
!! ENDTODO
776787

777788
call ncd_io('pftpar20', this%pftpar20, 'read', ncid, readvar=readv, posNOTonfile=.true.)
778789
if ( .not. readv ) call endrun(msg=' ERROR: error in reading in pft data'//errMsg(sourcefile, __LINE__))

0 commit comments

Comments
 (0)