Merge branch 'fix_clm51_fire_btran' into btran2incnfire_movecall

Resolved Conflicts: src/biogeochem/CNFireLi2021Mod.F90
ESCOMP · Oct 2, 2020 · f7a98bf · f7a98bf
2 parents acb90bf + fe48181
commit f7a98bf
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/biogeochem/CNFireLi2021Mod.F90 b/src/biogeochem/CNFireLi2021Mod.F90
@@ -59,6 +59,7 @@ module CNFireLi2021Mod
      ! !PUBLIC MEMBER FUNCTIONS:
      procedure, public :: need_lightning_and_popdens
      procedure, public :: CNFireArea    ! Calculate fire area
+     procedure, public :: CNFire_calc_fire_root_wetness ! Calculate the root wetness term that will be used by the fire model
   end type cnfire_li2021_type
 
   !
@@ -680,7 +681,7 @@ subroutine CNFire_calc_fire_root_wetness( this, bounds, num_exposedvegp, filter_
     !
     use pftconMod                 , only : pftcon
     use PatchType                 , only : patch
-    class(cnfire_base_type) :: this
+    class(cnfire_li2021_type) :: this
     type(bounds_type)      , intent(in)   :: bounds                         !bounds
     integer                , intent(in)   :: num_exposedvegp                !number of filters
     integer                , intent(in)   :: filter_exposedvegp(:)          !filter array