From 2e9f067f8a202141458568dbd5966b05cc987f71 Mon Sep 17 00:00:00 2001
From: Ryan Knox <rgknox@lbl.gov>
Date: Wed, 29 Jan 2025 15:37:50 -0700
Subject: [PATCH] two-stream updates and fixes

---
 cime_config/testdefs/ExpectedTestFails.xml | 14 --------------
 src/utils/clmfates_interfaceMod.F90        | 13 ++++++-------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml
index 9735c02f4c..f5a9e3dce4 100644
--- a/cime_config/testdefs/ExpectedTestFails.xml
+++ b/cime_config/testdefs/ExpectedTestFails.xml
@@ -308,20 +308,6 @@
     </phase>
   </test>
 
-  <test name="ERS_D_Ld20.f45_f45_mg37.I2000Clm50FatesRs.derecho_intel.clm-FatesColdTwoStream">
-    <phase name="COMPARE_base_rest">
-      <status>FAIL</status>
-      <issue>#2325</issue>
-    </phase>
-  </test>
-
-  <test name="ERS_D_Ld20.f45_f45_mg37.I2000Clm50FatesRs.derecho_gnu.clm-FatesColdTwoStreamNoCompFixedBioGeo">
-    <phase name="COMPARE_base_rest">
-      <status>FAIL</status>
-      <issue>#2325</issue>
-    </phase>
-  </test>
-  
   <test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Fates.derecho_intel.clm-FatesFireLightningPopDens--clm-NEON-FATES-NIWO">
     <phase name="SHAREDLIB_BUILD">
       <status>FAIL</status>
diff --git a/src/utils/clmfates_interfaceMod.F90 b/src/utils/clmfates_interfaceMod.F90
index 2f74a2c990..2a492bcb4c 100644
--- a/src/utils/clmfates_interfaceMod.F90
+++ b/src/utils/clmfates_interfaceMod.F90
@@ -2790,23 +2790,22 @@ subroutine wrap_canopy_radiation(this, bounds_clump, nc, &
        ! the zenith angle is positive. In the future, FATES
        ! may perform calculations on diffuse radiation during
        ! dawn and dusk when the sun is below the horizon, but not yet
+
+       do ifp = 1,this%fates(nc)%sites(s)%youngest_patch%patchno
+          p = ifp+col%patchi(c)
+          this%fates(nc)%bc_in(s)%fcansno_pa(ifp) = fcansno(p)
+       end do
+
        
        if(coszen_col(c) > 0._r8) then
 
           this%fates(nc)%bc_in(s)%albgr_dir_rb(:) = albgrd_col(c,:)
           this%fates(nc)%bc_in(s)%albgr_dif_rb(:) = albgri_col(c,:)
-          
-          do ifp = 1,this%fates(nc)%sites(s)%youngest_patch%patchno
-             p = ifp+col%patchi(c)
-             this%fates(nc)%bc_in(s)%fcansno_pa(ifp) = fcansno(p)
-          end do
-          
        else
 
           ! This will ensure a crash in FATES if it tries
           this%fates(nc)%bc_in(s)%albgr_dir_rb(:) = spval
           this%fates(nc)%bc_in(s)%albgr_dif_rb(:) = spval
-          this%fates(nc)%bc_in(s)%fcansno_pa(:)   = spval
           
        end if