cleanup of moving zenith updates

rgknox · Jan 24, 2025 · 2c751e9 · 2c751e9
1 parent fc8e1f0
commit 2c751e9
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 11 deletions.
diff --git a/src/biogeophys/BalanceCheckMod.F90 b/src/biogeophys/BalanceCheckMod.F90
@@ -969,7 +969,18 @@ subroutine BalanceCheck( bounds, &
                write(iulog,*)'forc_solai(1) = ',forc_solai(indexg,1)
                write(iulog,*)'forc_solai(2) = ',forc_solai(indexg,2)
                write(iulog,*)'forc_tot      = ',forc_solad(indexg,1)+forc_solad(indexg,2) &
-                  +forc_solai(indexg,1)+forc_solai(indexg,2)
+                    +forc_solai(indexg,1)+forc_solai(indexg,2)
+
+               write(iulog,*)'coszen_col:',surfalb_inst%coszen_col(indexc)
+               write(iulog,*)'fabd:',fabd(indexp,:)
+               write(iulog,*)'fabi:',fabi(indexp,:)
+               write(iulog,*)'albd:',albd(indexp,:)
+               write(iulog,*)'albi:',albi(indexp,:)
+               write(iulog,*)'ftdd:',ftdd(indexp,:)
+               write(iulog,*)'ftid:',ftid(indexp,:)
+               write(iulog,*)'ftii:',ftii(indexp,:)
+
+
                write(iulog,*)'CTSM is stopping'
                call endrun(subgrid_index=indexp, subgrid_level=subgrid_level_patch, msg=errmsg(sourcefile, __LINE__))
            end if

diff --git a/src/biogeophys/SurfaceAlbedoMod.F90 b/src/biogeophys/SurfaceAlbedoMod.F90
@@ -35,7 +35,7 @@ module SurfaceAlbedoMod
   public :: SurfaceAlbedo_readnl
   public :: SurfaceAlbedoInitTimeConst
   public :: SurfaceAlbedo  ! Surface albedo and two-stream fluxes
-  public :: DownscaleGeogZenithAngle
+  public :: UpdateZenithAngles
 
   !
   ! !PRIVATE MEMBER FUNCTIONS:
@@ -228,12 +228,13 @@ end subroutine SurfaceAlbedoInitTimeConst
 
   ! -----------------------------------------------------------------------
 
-  subroutine UpdateZenithAngles(bounds,nc, surfalb_inst, nextsw_cday, declinp1)
+  subroutine UpdateZenithAngles(bounds, surfalb_inst, nextsw_cday, declinp1)
 
     ! Incorporate surface slopes to generate column level zenith angles
 
     use clm_varctl          , only : downscale_hillslope_meteorology
-
+    use shr_orb_mod
+
     type(bounds_type)      , intent(in)            :: bounds             ! bounds
     type(surfalb_type)     , intent(inout)         :: surfalb_inst
     real(r8)               , intent(in)            :: nextsw_cday        ! calendar day at Greenwich (1.00, ..., days/year)
@@ -266,6 +267,8 @@ subroutine UpdateZenithAngles(bounds,nc, surfalb_inst, nextsw_cday, declinp1)
          else
             coszen_col(c) = coszen_grc(g)
          endif
+
+         print*,"COSZEN_COL:",c,coszen_col(c)
 
       end do
 
@@ -307,7 +310,7 @@ subroutine SurfaceAlbedo(bounds,nc,  &
     ! only computed over active points.
     !
     ! !USES:
-    use shr_orb_mod
+    !use shr_orb_mod
     use clm_time_manager   , only : get_nstep
     use abortutils         , only : endrun
     use clm_varctl         , only : use_subgrid_fluxes, use_snicar_frc, use_fates
@@ -478,7 +481,9 @@ subroutine SurfaceAlbedo(bounds,nc,  &
           fabi_sha_z    =>    surfalb_inst%fabi_sha_z_patch         & ! Output:  [real(r8) (:,:) ]  absorbed shaded leaf diffuse PAR (per unit lai+sai) for each canopy layer
           )
 
-
+
+     print*,"PEFORMING ALBEDO"
+
     ! Apply column level zenith angles to the patch level
     do fp = 1,num_nourbanp
        p = filter_nourbanp(fp)

diff --git a/src/main/clm_driver.F90 b/src/main/clm_driver.F90
@@ -52,6 +52,7 @@ module clm_driver
   use AerosolMod             , only : AerosolMasses
   use SnowSnicarMod          , only : SnowAge_grain
   use SurfaceAlbedoMod       , only : SurfaceAlbedo
+  use SurfaceAlbedoMod       , only : UpdateZenithAngles
   use UrbanAlbedoMod         , only : UrbanAlbedo
   !
   use SurfaceRadiationMod    , only : SurfaceRadiation, CanopySunShadeFracs
@@ -1225,7 +1226,7 @@ subroutine clm_drv(doalb, nextsw_cday, declinp1, declin, rstwr, nlend, rdate, ro
        ! ============================================================================
 
 
-       call UpdateZenithAngles(bounds_clump,surfalb_inst)
+       call UpdateZenithAngles(bounds_clump,surfalb_inst, nextsw_cday, declinp1)
 
        if (doalb ) then
 

diff --git a/src/utils/clmfates_interfaceMod.F90 b/src/utils/clmfates_interfaceMod.F90
@@ -2813,9 +2813,9 @@ subroutine wrap_canopy_radiation(this, bounds_clump, nc, &
     end do
 
     call FatesNormalizedCanopyRadiation( &
-            this%fates(nc)%sites(s), &
-            this%fates(nc)%bc_in(s),  &
-            this%fates(nc)%bc_out(s))
+            this%fates(nc)%sites, &
+            this%fates(nc)%bc_in,  &
+            this%fates(nc)%bc_out)
 
 
     ! Pass FATES BC's back to HLM
@@ -2826,7 +2826,7 @@ subroutine wrap_canopy_radiation(this, bounds_clump, nc, &
 
        do ifp = 1, this%fates(nc)%sites(s)%youngest_patch%patchno
 
-          p = ifp+col_pp%pfti(c)
+          p = ifp+col%patchi(c)
 
           albd(p,:) = this%fates(nc)%bc_out(s)%albd_parb(ifp,:)
           albi(p,:) = this%fates(nc)%bc_out(s)%albi_parb(ifp,:)