Merge pull request #279 from ashiklom/crown-mod-fix

Allow finite canopy radius with new two-stream model
EDmodel · Feb 2, 2020 · e40cef1 · e40cef1
2 parents 566439e + 77e3fe6
commit e40cef1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ED/src/io/ed_opspec.F90 b/ED/src/io/ed_opspec.F90
@@ -2451,8 +2451,8 @@ subroutine ed_opspec_misc
                     ,icanrad,'...'
       ifaterr = ifaterr +1
       call opspec_fatal(reason,'opspec_misc')
-   elseif (icanrad /= 0 .and. crown_mod == 1) then
-      write(reason,fmt='(a)') 'CROWN_MOD must be turned off when ICANRAD is 1 or 2...'
+   elseif (icanrad == 2 .and. crown_mod == 1) then
+      write(reason,fmt='(a)') 'CROWN_MOD must be turned off when ICANRAD is 2...'
       ifaterr = ifaterr +1
       call opspec_fatal(reason,'opspec_misc')
    end if