Merge pull request #1344 from JessicaNeedham/new-namelist

Add namelist switches and parameter file changes ahead of upcoming PR on Johnson & Berry electron transport model
NGEET · Feb 27, 2025 · 6903518 · 6903518
2 parents a91cc42 + 57a1961
commit 6903518
Show file tree

Hide file tree

Showing 5 changed files with 1,904 additions and 0 deletions.
diff --git a/main/FatesInterfaceMod.F90 b/main/FatesInterfaceMod.F90
@@ -1502,6 +1502,7 @@ subroutine set_fates_ctrlparms(tag,ival,rval,cval)
          hlm_maintresp_leaf_model = unset_int
          hlm_mort_cstarvation_model = unset_int
          hlm_radiation_model = unset_int
+         hlm_electron_transport_model = unset_int
          hlm_regeneration_model = unset_int
          hlm_use_logging   = unset_int
          hlm_use_ed_st3    = unset_int
@@ -1827,6 +1828,11 @@ subroutine set_fates_ctrlparms(tag,ival,rval,cval)
             call endrun(msg=errMsg(sourcefile, __LINE__))
          end if
 
+         if(hlm_electron_transport_model .eq. unset_int) then
+            write(fates_log(), *) 'electron transport model is unset: hlm_electron_transport_model exiting'
+            call endrun(msg=errMsg(sourcefile, __LINE__))
+         end if
+
          if(hlm_regeneration_model .eq. unset_int) then
             write(fates_log(), *) 'seed regeneration model is unset: hlm_regeneration_model exiting'
             call endrun(msg=errMsg(sourcefile, __LINE__))
@@ -2083,6 +2089,12 @@ subroutine set_fates_ctrlparms(tag,ival,rval,cval)
                   write(fates_log(),*) 'Transfering hlm_radiation_model ',ival,' to FATES'
                end if
 
+            case('electron_transport_model')
+               hlm_electron_transport_model = ival
+               if (fates_global_verbose()) then
+                  write(fates_log(),*) 'Transfering hlm_electron_transport_model ',ival,' to FATES'
+               end if
+
             case('regeneration_model')
                hlm_regeneration_model = ival
                if (fates_global_verbose()) then

diff --git a/main/FatesInterfaceTypesMod.F90 b/main/FatesInterfaceTypesMod.F90
@@ -189,6 +189,11 @@ module FatesInterfaceTypesMod
    integer, public :: hlm_radiation_model         ! Switch for radiation model
                                                   ! Norman (1) and Two-stream (2)
 
+   integer, public :: hlm_electron_transport_model ! Switch for electron transport model
+                                                   ! (1) for Farquhar von Caemmerer & Berry  (FvCB)
+                                                   ! (2) for Johnson & Berry (2021) (JB) 
+
+
    integer, public :: hlm_regeneration_model      ! Switch for choosing between regeneration models:
                                                   ! (1) for Fates default
                                                   ! (2) for the Tree Recruitment Scheme (Hanbury-Brown et al., 2022)