diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdMeganSatPhen/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdMeganSatPhen/user_nl_clm deleted file mode 100644 index e95192bd18..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdMeganSatPhen/user_nl_clm +++ /dev/null @@ -1,5 +0,0 @@ - -hist_mfilt = 365 -hist_nhtfrq = -24 - -hist_fincl1 += 'GAMMA' 'GAMMAC' 'GAMMAA' 'GAMMAL' 'GAMMAT' 'GAMMAP' 'GAMMAS' 'CISHA' 'CISUN' 'FSUN24' 'FSUN' 'FSUN240' 'PCO2' \ No newline at end of file diff --git a/src/biogeophys/BalanceCheckMod.F90 b/src/biogeophys/BalanceCheckMod.F90 index b3efe6e525..20fde6938b 100644 --- a/src/biogeophys/BalanceCheckMod.F90 +++ b/src/biogeophys/BalanceCheckMod.F90 @@ -12,7 +12,7 @@ module BalanceCheckMod use decompMod , only : subgrid_level_gridcell, subgrid_level_column, subgrid_level_patch use abortutils , only : endrun use clm_varctl , only : iulog - use clm_varctl , only : use_fates_planthydro + use clm_varctl , only : use_fates_planthydro, use_fates use clm_varpar , only : nlevsoi use atm2lndType , only : atm2lnd_type use EnergyFluxType , only : energyflux_type @@ -952,14 +952,15 @@ subroutine BalanceCheck( bounds, & errsol_max_val = maxval( abs(errsol(bounds%begp:bounds%endp)), mask = (errsol(bounds%begp:bounds%endp) /= spval) ) - if ((errsol_max_val > energy_warning_thresh) .and. (DAnstep > skip_steps)) then + if ((errsol_max_val > energy_warning_thresh) .and. (DAnstep > skip_steps) ) then indexp = maxloc( abs(errsol(bounds%begp:bounds%endp)), 1 , mask = (errsol(bounds%begp:bounds%endp) /= spval) ) + bounds%begp -1 indexg = patch%gridcell(indexp) - write(iulog,*)'WARNING:: BalanceCheck, solar radiation balance error (W/m2)' - write(iulog,*)'nstep = ',nstep - write(iulog,*)'errsol = ',errsol(indexp) - + if (.not. use_fates) then + write(iulog,*)'WARNING:: BalanceCheck, solar radiation balance error (W/m2)' + write(iulog,*)'nstep = ',nstep + write(iulog,*)'errsol = ',errsol(indexp) + endif if (errsol_max_val > error_thresh) then write(iulog,*)'CTSM is stopping because errsol > ', error_thresh, ' W/m2' write(iulog,*)'fsa = ',fsa(indexp)