ESCOMP · adrifoster · May 9, 2025 · Apr 9, 2025 · Apr 22, 2025 · Apr 28, 2025
diff --git a/.gitmodules b/.gitmodules
@@ -28,7 +28,7 @@
 [submodule "fates"]
 path = src/fates
 url = https://github.com/NGEET/fates
-fxtag = sci.1.82.3_api.39.0.0
+fxtag = sci.1.83.0_api.39.0.0
 fxrequired = AlwaysRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/NGEET/fates

diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml
@@ -781,10 +781,9 @@ This option is older than the luhdata options and may be depricated at some poin
 </entry>
 
 <entry id="fates_electron_transport_model" type="char*256" category="physics"
-        group="elm_inparm" valid_values="FvCB1980,JohnsonBerry2021" value="FvCB1980">
+        group="clm_inparm" valid_values="FvCB1980,JohnsonBerry2021" value="FvCB1980">
 Set the FATES electron transport model to either Johnson-Berry 2021 or
   Farquhar von Caemmerer and Berry 1980 (FvCB1980).
-
 </entry>
 
 <entry id="fates_radiation_model" type="char*256" category="physics"

diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml
@@ -245,10 +245,10 @@
     </phase>
   </test>
 
-  <test name="PEM_D_Ld20.f10_f10_mg37.I2000Clm50FatesRs.derecho_gnu.clm-FatesColdSeedDisp">
-    <phase name="COMPARE_base_modpes">
+  <test name="PEM_D_Ld20.5x5_amazon.I2000Clm50FatesRs.derecho_gnu.clm-FatesColdSeedDisp">
+    <phase name="RUN">
       <status>FAIL</status>
-      <issue>FATES#1089</issue>
+      <issue>#3097</issue>
     </phase>
   </test>
 

diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
@@ -3236,6 +3236,15 @@
       <option name="comment">Ensure functionality of the tree damage option in FATES</option>
     </options>
   </test>
+  <test name="ERS_D_Ld20" grid="f45_f45_mg37" compset="I2000Clm60FatesRs" testmods="clm/FatesColdElecTransJB">
+    <machines>
+      <machine name="derecho" compiler="gnu" category="fates"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment">Ensure functionality of the JohnsonBerry2021 option in FATES</option>
+    </options>
+  </test>
   <test name="ERI_D_Ld20" grid="f45_f45_mg37" compset="I2000Clm50FatesRs" testmods="clm/FatesColdTwoStream">
     <machines>
       <machine name="derecho" compiler="intel" category="fates"/>

diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm
@@ -8,7 +8,7 @@ use_fates_tree_damage = .true.
 hist_ndens = 1
 hist_fincl1       = 'FATES_TLONGTERM',
 'FATES_TGROWTH','FATES_SEEDS_IN_GRIDCELL_PF','FATES_SEEDS_OUT_GRIDCELL_PF','FATES_NCL_AP',
-'FATES_NPATCH_AP','FATES_VEGC_AP','FATES_SECONDARY_ANTHRODISTAGE_AP','FATES_SECONDARY_AREA_AP',
+'FATES_NPATCH_AP','FATES_VEGC_AP','FATES_SECONDARY_AREA_ANTHRO_AP','FATES_SECONDARY_AREA_AP',
 'FATES_FUEL_AMOUNT_APFC','FATES_STOREC_TF_USTORY_SZPF','FATES_STOREC_TF_CANOPY_SZPF',
 'FATES_CROWNAREA_CLLL','FATES_ABOVEGROUND_MORT_SZPF',
 'FATES_ABOVEGROUND_PROD_SZPF','FATES_NPLANT_SZAP','FATES_NPLANT_CANOPY_SZAP',
@@ -56,5 +56,7 @@ hist_fincl1       = 'FATES_TLONGTERM',
 'FATES_PARSUN_CL','FATES_PARSHA_CL','FATES_LAISUN_CLLL','FATES_LAISHA_CLLL','FATES_LAISUN_CLLLPF',
 'FATES_LAISHA_CLLLPF','FATES_PARPROF_DIR_CLLLPF','FATES_PARPROF_DIF_CLLLPF','FATES_LAISUN_CL','FATES_LAISHA_CL',
 'FATES_PARPROF_DIR_CLLL','FATES_PARPROF_DIF_CLLL','FATES_NET_C_UPTAKE_CLLL','FATES_CROWNFRAC_CLLLPF',
-'FATES_LBLAYER_COND_AP','FATES_STOMATAL_COND_AP','FATES_TLONGTERM','FATES_PRIMARY_AREA_AP','FATES_NPP_LU',
-'FATES_GPP_LU'
+'FATES_LBLAYER_COND_AP','FATES_STOMATAL_COND_AP','FATES_TLONGTERM','FATES_PRIMARY_AREA_AP','FATES_NPP_LU','FATES_GPP_LU',
+'FATES_SEED_BANK_PF','FATES_UNGERM_SEED_BANK_PF','FATES_SEEDLING_POOL_PF','FATES_SEEDS_IN_PF','FATES_SEEDS_IN_LOCAL_PF',
+'FATES_SAPWOOD_AREA_SZPF','FATES_CANOPYAREA','FATES_NCL','FATES_PATCHAREA','FATES_PRIMARY_AREA','FATES_SCORCH_HEIGHT_PF',
+'FATES_SECONDARY_AREA_ANTHRO','FATES_SECONDARY_AREA','FATES_ZSTAR'
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdElecTransJB/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdElecTransJB/include_user_mods
@@ -0,0 +1 @@
+../FatesCold
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdElecTransJB/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdElecTransJB/user_nl_clm
@@ -0,0 +1 @@
+fates_electron_transport_model='JohnsonBerry2021'
diff --git a/src/fates b/src/fates
diff --git a/src/utils/clmfates_interfaceMod.F90 b/src/utils/clmfates_interfaceMod.F90
@@ -612,9 +612,9 @@ subroutine CLMFatesGlobals2()
         call set_fates_ctrlparms('radiation_model',ival=pass_radiation_model)
 
         if (trim(fates_electron_transport_model) == 'FvCB1980') then
-           pass_radiation_model = 1
+           pass_electron_transport_model = 1
         else if (trim(fates_electron_transport_model) == 'JohnsonBerry2021') then
-           pass_radiation_model = 2
+           pass_electron_transport_model = 2
         end if
         call set_fates_ctrlparms('electron_transport_model',ival=pass_electron_transport_model)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fates_electron_transport_model='JohnsonBerry2021'
+6 −23		biogeochem/EDCanopyStructureMod.F90
+17 −26		biogeochem/EDPhysiologyMod.F90
+18 −14		biogeochem/FatesAllometryMod.F90
+1 −1		biogeochem/FatesCohortMod.F90
+15 −17		biogeophys/FatesPlantRespPhotosynthMod.F90
+19 −16		main/EDMainMod.F90
+65 −48		main/EDParamsMod.F90
+70 −6		main/FatesHistoryInterfaceMod.F90
+9 −8		main/FatesInterfaceMod.F90
+1 −1		main/FatesRestartInterfaceMod.F90
+18 −9		radiation/FatesRadiationDriveMod.F90
+9 −21		radiation/TwoStreamMLPEMod.F90
+6 −4		testing/testing_shr/FatesFactoryMod.F90