reformat and clean up the code

fix a typo

add error message

Author: daleihao

components/elm/src/biogeophys/SurfaceAlbedoMod.F90

@@ -242,27 +242,27 @@ subroutine SurfaceAlbedo(bounds,     &
     ! Cosine solar zenith angle for next time step
 
     deg2rad = SHR_CONST_PI/180._r8
-    do g = bounds%begg,bounds%endg
-       coszen_gcell(g) = shr_orb_cosz (nextsw_cday, grc_pp%lat(g), grc_pp%lon(g), declinp1)
+    if (.not. use_finetop_rad) then
+       do g = bounds%begg,bounds%endg
+          coszen_gcell(g) = shr_orb_cosz (nextsw_cday, grc_pp%lat(g), grc_pp%lon(g), declinp1)
+          cosinc_gcell(g) = coszen_gcell(g)
+       end do
+    else
+       do g = bounds%begg,bounds%endg
+          coszen_gcell(g) = shr_orb_cosz (nextsw_cday, grc_pp%lat(g), grc_pp%lon(g), declinp1)
+          sza = acos(coszen_gcell(g)) ! solar zenith angle
+          saa = shr_orb_azimuth(nextsw_cday, grc_pp%lat(g), grc_pp%lon(g), declinp1, sza) ! solar azimuth angle
+
+          slope_rad = grc_pp%slope_deg(g) * deg2rad
+          aspect_rad = grc_pp%aspect_deg(g) * deg2rad
+
+          cosinc_gcell(g) = cos(slope_rad) * coszen_gcell(g) + sin(slope_rad) * sin(sza) * cos(aspect_rad - saa)
+          cosinc_gcell(g) = max(-1._r8, min(cosinc_gcell(g), 1._r8))
+         
+          if (cosinc_gcell(g) <= 0._r8) cosinc_gcell(g) = 0.1_r8 ! although direct solar radiation is zero, we need to calculate diffuse albedo in this case
+       end do
+    endif
 
-       if (use_finetop_rad) then
-         ! solar zenith angle
-         sza = acos(coszen_gcell(g))
-         ! solar azimuth angle
-         saa = shr_orb_azimuth(nextsw_cday, grc_pp%lat(g), grc_pp%lon(g), declinp1, sza)
-
-         slope_rad = grc_pp%slope_deg(g) * deg2rad
-         aspect_rad = grc_pp%aspect_deg(g) * deg2rad
-
-         cosinc_gcell(g) = cos(slope_rad) * coszen_gcell(g) + sin(slope_rad) * sin(sza) * cos(aspect_rad - saa)
-         cosinc_gcell(g) = max(-1._r8, min(cosinc_gcell(g), 1._r8))
-         !write(iulog,*) 'cosinc_gcell',cosinc_gcell(g)
-         !write(iulog,*) 'coszen_gcell',coszen_gcell(g)
-         if (cosinc_gcell(g) <= 0._r8) cosinc_gcell(g) = 0.1_r8 ! although direct solar radiation is zero, we need to calculate diffuse albedo in this case
-       else
-         cosinc_gcell(g) = coszen_gcell(g)
-       endif
-    end do
     do c = bounds%begc,bounds%endc
        g = col_pp%gridcell(c)
        coszen_col(c) = coszen_gcell(g)

components/elm/src/main/atm2lndMod.F90

@@ -540,9 +540,9 @@ subroutine topographic_effects_on_radiation(bounds, atm2lnd_vars, nextsw_cday, d
          f_short_dir(g) = 1._r8
          f_short_dif(g) = 1._r8
          f_short_refl(g,:) = 0._r8
-         sza(g) = nan
-         saa(g) = nan
-         cosinc(g) = nan
+         sza(g) = spval
+         saa(g) = spval
+         cosinc(g) = spval
          ! scale shortwave radiation
          if (cossza > 0.0872_r8) then ! just modify when SZA > 85 degree 0.0872_r8
 

components/elm/src/main/atm2lndType.F90

@@ -331,14 +331,14 @@ subroutine InitAllocate(this, bounds)
     allocate(this%forc_uovern                   (begg:endg))        ; this%forc_uovern                        (:)   = ival
 
     if ( use_finetop_rad ) then
-       allocate(this%f_short_dir                (begg:endg))        ; this%f_short_dir                   (:)   = nan
-       allocate(this%f_short_dif                (begg:endg))        ; this%f_short_dif                   (:)   = nan
-       allocate(this%f_short_refl               (begg:endg,numrad)) ; this%f_short_refl                  (:,:) = nan
-       allocate(this%f_long_dif                 (begg:endg))        ; this%f_long_dif                    (:)   = nan
-       allocate(this%f_long_refl                (begg:endg))        ; this%f_long_refl                   (:)   = nan
-       allocate(this%sza                        (begg:endg))        ; this%sza                           (:)   = nan
-       allocate(this%saa                        (begg:endg))        ; this%saa                           (:)   = nan
-       allocate(this%cosinc                     (begg:endg))        ; this%cosinc                        (:)   = nan
+       allocate(this%f_short_dir                (begg:endg))        ; this%f_short_dir                   (:)   = spval
+       allocate(this%f_short_dif                (begg:endg))        ; this%f_short_dif                   (:)   = spval
+       allocate(this%f_short_refl               (begg:endg,numrad)) ; this%f_short_refl                  (:,:) = spval
+       allocate(this%f_long_dif                 (begg:endg))        ; this%f_long_dif                    (:)   = spval
+       allocate(this%f_long_refl                (begg:endg))        ; this%f_long_refl                   (:)   = spval
+       allocate(this%sza                        (begg:endg))        ; this%sza                           (:)   = spval
+       allocate(this%saa                        (begg:endg))        ; this%saa                           (:)   = spval
+       allocate(this%cosinc                     (begg:endg))        ; this%cosinc                        (:)   = spval
        allocate(this%forc_solad_pp_grc          (begg:endg,numrad)) ; this%forc_solad_pp_grc             (:,:) = ival
        allocate(this%forc_solai_pp_grc          (begg:endg,numrad)) ; this%forc_solai_pp_grc             (:,:) = ival
        allocate(this%forc_solar_pp_grc          (begg:endg))        ; this%forc_solar_pp_grc             (:)   = ival
@@ -578,11 +578,9 @@ subroutine InitHistory(this, bounds)
        call hist_addfld1d (fname='LWdown_PP', units='W/m^2',  &
             avgflag='A', long_name='atmospheric longwave radiation (PP)', &
             ptr_gcell=this%forc_lwrad_not_downscaled_pp_grc, default='inactive')
-    endif
 
-    if ( use_finetop_rad ) then
-        this%forc_solad_pp_grc(begg:endg, :) = 0._r8
-        this%forc_solai_pp_grc(begg:endg, :) = 0._r8
+       this%forc_solad_pp_grc(begg:endg, :) = 0._r8
+       this%forc_solai_pp_grc(begg:endg, :) = 0._r8
     endif
 
   end subroutine InitHistory

components/elm/src/main/controlMod.F90

@@ -1122,13 +1122,17 @@ subroutine control_print ()
     if (use_top_solar_rad) then
         write(iulog,*) '  use TOP solar radiation parameterization instead of PP'
     else
-        write(iulog,*) '   use_top_solar_rad is False, so do not run TOP solar radiation parameterization'
+        write(iulog,*) '  use_top_solar_rad is False, so do not run TOP solar radiation parameterization'
     end if
 
-    if (use_finetop_rad) then
+    if (use_finetop_rad .and. use_top_solar_rad) then
+        write(iulog,*) '  cannot use both TOP and fineTOP radiation parameterizations simultaneously'
+        call endrun(msg=' ERROR: use_finetop_rad and use_top_solar_rad cannot both be set to true.'//&
+             errMsg(__FILE__, __LINE__))
+    else if (use_finetop_rad .and. (.not. use_top_solar_rad)) then
         write(iulog,*) '  use fineTOP radiation parameterization instead of PP'
     else
-        write(iulog,*) '   use_finetop_rad is False, so do not run fineTOP radiation parameterization'
+        write(iulog,*) '  use_finetop_rad is False, so do not run fineTOP radiation parameterization'
     end if
 
     if (use_cn) then