Merge pull request ESCOMP#138 from mvdebolskiy/bug-fix-eri-towstream

Bug fix eri towstream

Author: mvdebolskiy

.gitmodules

@@ -92,7 +92,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
 [submodule "cdeps"]
 path = components/cdeps
 url = https://github.com/NorESMhub/CDEPS.git
-fxtag = cdeps1.0.70_noresm_v0
+fxtag = cdeps1.0.70_noresm_v5
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/NorESMhub/CDEPS.git

cime_config/testdefs/testlist_clm.xml

@@ -4371,7 +4371,7 @@
       <option name="comment">""</option>
     </options>
   </test>
-  <test name="ERP_D_Ld5" grid="f45_f45_mg37" compset="I1850Clm60FatesSp" testmods="clm/FatesColdClm60Cam7LndTuningMode">
+  <test name="ERI_D_Ld30" grid="f45_f45_mg37" compset="I1850Clm60FatesSp" testmods="clm/FatesColdClm60Cam7LndTuningMode">
     <machines>
       <machine name="betzy" compiler="gnu" category="aux_clm_noresm"/>
     </machines>
@@ -4410,7 +4410,7 @@
       <option name="comment">""</option>
     </options>
   </test>
-  <test name="ERS_D_Ln11" grid="ne30pg3_ne30pg3_mtn14" compset="I1850Clm60FatesNocompSpinup" testmods="clm/FatesColdSpinup">
+  <test name="ERS_D_Ld11" grid="ne30pg3_ne30pg3_mtn14" compset="I1850Clm60FatesNocompSpinup" testmods="clm/FatesColdSpinup">
     <machines>
       <machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
     </machines>
@@ -4419,6 +4419,24 @@
       <option name="comment">""</option>
     </options>
   </test>
+  <test name="ERI_D_Ld11" grid="ne30pg3_ne30pg3_mtn14" compset="I1850Clm60FatesNocompSpinup" testmods="clm/FatesColdSpinup">
+    <machines>
+      <machine name="betzy" compiler="intel" category="aux_clm_noresm"/>
+    </machines>
+    <options>
+      <option name="wallclock">01:50:00</option>
+      <option name="comment">""</option>
+    </options>
+  </test>
+  <test name="ERI_D_Ld30" grid="f45_f45_mg37" compset="I1850Clm60FatesNocomp" testmods="clm/FatesColdClm60Cam7LndTuningMode">
+    <machines>
+      <machine name="betzy" compiler="gnu" category="aux_clm_noresm"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:30:00</option>
+      <option name="comment">""</option>
+    </options>
+  </test>
   <test name="ERS_D_Ld5" grid="f45_f45_mg37" compset="I2000Clm60Fates" testmods="clm/FatesColdMeganNoComp">
     <machines>
       <machine name="betzy" compiler="intel" category="aux_clm_noresm"/>

components/cdeps

@@ -13,8 +13,8 @@ module clm_driver
   use clm_varctl             , only : use_cn, use_lch4, use_noio, use_c13, use_c14
   use CNSharedParamsMod      , only : use_matrixcn
   use clm_varctl             , only : use_crop, irrigate, ndep_from_cpl
-  use clm_varctl             , only : use_soil_moisture_streams
-  use clm_varctl             , only : use_cropcal_streams
+  use clm_varctl             , only : use_soil_moisture_streams, fates_radiation_model
+  use clm_varctl             , only : use_cropcal_streams, is_cold_start, nsrest, nsrStartup
   use clm_time_manager       , only : get_nstep, is_beg_curr_day, is_beg_curr_year
   use clm_time_manager       , only : get_prev_date, is_first_step
   use clm_varpar             , only : nlevsno, nlevgrnd
@@ -606,6 +606,7 @@ subroutine clm_drv(doalb, nextsw_cday, declinp1, declin, rstwr, nlend, rdate, ro
        ! over the patch index range defined by bounds_clump%begp:bounds_proc%endp
 
        if(use_fates) then
+          if (masterproc)  write(iulog,*),"MVD wrapsun ", get_nstep(), nextsw_cday, declinp1, doalb
           call clm_fates%wrap_sunfrac(nc,atm2lnd_inst, canopystate_inst)
        else
           call CanopySunShadeFracs(filter(nc)%nourbanp,filter(nc)%num_nourbanp,     &
@@ -1226,9 +1227,22 @@ subroutine clm_drv(doalb, nextsw_cday, declinp1, declin, rstwr, nlend, rdate, ro
        ! ============================================================================
        ! Determine albedos for next time step
        ! ============================================================================
-       
-       if (doalb) then
 
+       ! This is only relevant to  fates two stream to not break sun fraction calculations
+       ! on the second timestep after start from finidat or for hybrid run.
+       if (use_fates .and. .not. use_fates_sp .and. fates_radiation_model == 'twostream') then
+          if (.not. doalb .and. get_nstep() == 1) then
+             if (.not. is_cold_start .and. nsrest == nsrStartup) then
+                call UpdateZenithAngles(bounds_clump, surfalb_inst, nextsw_cday, declinp1)
+                call clm_fates%wrap_canopy_radiation(bounds_clump, nc, &
+                  water_inst%waterdiagnosticbulk_inst%fcansno_patch(bounds_clump%begp:bounds_clump%endp), &
+                  surfalb_inst)
+             endif
+          endif
+       endif
+
+       if (doalb) then
+          if (masterproc) write(iulog,*) "Step alb: ", get_nstep()
           ! Albedos for non-urban columns
           call t_startf('surfalb')
           call SurfaceAlbedo(bounds_clump,                      &