Skip to content

Comment out fields failing in #3661 so test may catch future problems #4136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slevis-lmwg merged 5 commits into from
Jul 27, 2026
Merged

Comment out fields failing in #3661 so test may catch future problems #4136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
345eedc
Comment out fields failing in #3661 so test may catch future problems
slevis-lmwg Jul 21, 2026
d46414f
Update failing test's comment in ExpectedTestFails.xml
slevis-lmwg Jul 21, 2026
b46aea6
Comment out two more fields that appear in the newer version of the test
slevis-lmwg Jul 21, 2026
b684019
Revisions to address code review (rm expected fail and add comments)
slevis-lmwg Jul 22, 2026
3a336ed
Merge branch 'b4b-dev' into all_outputs_testpatch
ekluzek Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions cime_config/testdefs/ExpectedTestFails.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,6 @@
<comment>Restart issues with default "inactive" fields added to history by hist_all_fields.</comment>
</phase>
</test>
<test name="ERP_P64x2_D_Ld3.f10_f10_mt232.IHistClm60BgcCropCrujra.derecho_gnu.clm-default--clm-all_outputs">
<phase name="COMPARE_base_rest">
<status>FAIL</status>
<issue>#3661</issue>
<comment>Restart issues with default "inactive" fields added to history by hist_all_fields.</comment>
</phase>
</test>
<test name="SUBSETDATAPOINT_Ld5_D_Mmpi-serial.CLM_USRDAT.I2000Clm60BgcCropCrujra.derecho_intel.clm-default">
<phase name="NLCOMP">
<status>FAIL</status>
Expand Down
7 changes: 4 additions & 3 deletions src/biogeochem/NutrientCompetitionFlexibleCNMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,10 @@ subroutine InitHistory(this, bounds)
avgflag='A', long_name='Leaf CN ratio used for flexible CN', &
ptr_patch=this%actual_leafcn )
this%actual_storage_leafcn(begp:endp) = spval
call hist_addfld1d (fname='LEAFCN_STORAGE', units='gC/gN', &
avgflag='A', long_name='Storage Leaf CN ratio used for flexible CN', &
ptr_patch=this%actual_storage_leafcn, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='LEAFCN_STORAGE', units='gC/gN', &
Comment thread
slevis-lmwg marked this conversation as resolved.
! avgflag='A', long_name='Storage Leaf CN ratio used for flexible CN', &
! ptr_patch=this%actual_storage_leafcn, default='inactive')

end subroutine InitHistory

Expand Down
119 changes: 68 additions & 51 deletions src/biogeochem/VOCEmissionMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,89 +275,106 @@ subroutine InitHistory(this, bounds)
ptr_patch=this%vocflx_tot_patch, set_lake=0._r8, set_urb=0._r8, default='inactive')

this%gamma_out_patch(begp:endp) = spval
call hist_addfld1d (fname='GAMMA', units='non', &
avgflag='A', long_name='total gamma for VOC calc', &
ptr_patch=this%gamma_out_patch, set_lake=0._r8, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='GAMMA', units='non', &
! avgflag='A', long_name='total gamma for VOC calc', &
! ptr_patch=this%gamma_out_patch, set_lake=0._r8, default='inactive')

this%gammaL_out_patch(begp:endp) = spval
call hist_addfld1d (fname='GAMMAL', units='non', &
avgflag='A', long_name='gamma L for VOC calc', &
ptr_patch=this%gammaL_out_patch, set_lake=0._r8, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='GAMMAL', units='non', &
! avgflag='A', long_name='gamma L for VOC calc', &
! ptr_patch=this%gammaL_out_patch, set_lake=0._r8, default='inactive')

this%gammaT_out_patch(begp:endp) = spval
call hist_addfld1d (fname='GAMMAT', units='non', &
avgflag='A', long_name='gamma T for VOC calc', &
ptr_patch=this%gammaT_out_patch, set_lake=0._r8, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='GAMMAT', units='non', &
! avgflag='A', long_name='gamma T for VOC calc', &
! ptr_patch=this%gammaT_out_patch, set_lake=0._r8, default='inactive')

this%gammaP_out_patch(begp:endp) = spval
call hist_addfld1d (fname='GAMMAP', units='non', &
avgflag='A', long_name='gamma P for VOC calc', &
ptr_patch=this%gammaP_out_patch, set_lake=0._r8, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='GAMMAP', units='non', &
! avgflag='A', long_name='gamma P for VOC calc', &
! ptr_patch=this%gammaP_out_patch, set_lake=0._r8, default='inactive')

this%gammaA_out_patch(begp:endp) = spval
call hist_addfld1d (fname='GAMMAA', units='non', &
avgflag='A', long_name='gamma A for VOC calc', &
ptr_patch=this%gammaA_out_patch, set_lake=0._r8, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='GAMMAA', units='non', &
! avgflag='A', long_name='gamma A for VOC calc', &
! ptr_patch=this%gammaA_out_patch, set_lake=0._r8, default='inactive')

this%gammaS_out_patch(begp:endp) = spval
call hist_addfld1d (fname='GAMMAS', units='non', &
avgflag='A', long_name='gamma S for VOC calc', &
ptr_patch=this%gammaS_out_patch, set_lake=0._r8, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='GAMMAS', units='non', &
! avgflag='A', long_name='gamma S for VOC calc', &
! ptr_patch=this%gammaS_out_patch, set_lake=0._r8, default='inactive')

this%gammaC_out_patch(begp:endp) = spval
call hist_addfld1d (fname='GAMMAC', units='non', &
avgflag='A', long_name='gamma C for VOC calc', &
ptr_patch=this%gammaC_out_patch, set_lake=0._r8, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='GAMMAC', units='non', &
! avgflag='A', long_name='gamma C for VOC calc', &
! ptr_patch=this%gammaC_out_patch, set_lake=0._r8, default='inactive')

this%EOPT_out_patch(begp:endp) = spval
call hist_addfld1d (fname='EOPT', units='non', &
avgflag='A', long_name='Eopt coefficient for VOC calc', &
ptr_patch=this%Eopt_out_patch, set_lake=0._r8, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='EOPT', units='non', &
! avgflag='A', long_name='Eopt coefficient for VOC calc', &
! ptr_patch=this%Eopt_out_patch, set_lake=0._r8, default='inactive')

this%topt_out_patch(begp:endp) = spval
call hist_addfld1d (fname='TOPT', units='non', &
avgflag='A', long_name='topt coefficient for VOC calc', &
ptr_patch=this%topt_out_patch, set_lake=0._r8, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='TOPT', units='non', &
! avgflag='A', long_name='topt coefficient for VOC calc', &
! ptr_patch=this%topt_out_patch, set_lake=0._r8, default='inactive')

this%alpha_out_patch(begp:endp) = spval
call hist_addfld1d (fname='ALPHA', units='non', &
avgflag='A', long_name='alpha coefficient for VOC calc', &
ptr_patch=this%alpha_out_patch, set_lake=0._r8, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='ALPHA', units='non', &
! avgflag='A', long_name='alpha coefficient for VOC calc', &
! ptr_patch=this%alpha_out_patch, set_lake=0._r8, default='inactive')

this%cp_out_patch(begp:endp) = spval
call hist_addfld1d (fname='currentPatch', units='non', &
avgflag='A', long_name='currentPatch coefficient for VOC calc', &
ptr_patch=this%cp_out_patch, set_lake=0._r8, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='currentPatch', units='non', &
! avgflag='A', long_name='currentPatch coefficient for VOC calc', &
! ptr_patch=this%cp_out_patch, set_lake=0._r8, default='inactive')

this%paru_out_patch(begp:endp) = spval
call hist_addfld1d (fname='PAR_sun', units='umol/m2/s', &
avgflag='A', long_name='sunlit PAR', &
ptr_patch=this%paru_out_patch, set_lake=0._r8, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='PAR_sun', units='umol/m2/s', &
! avgflag='A', long_name='sunlit PAR', &
! ptr_patch=this%paru_out_patch, set_lake=0._r8, default='inactive')

this%par24u_out_patch(begp:endp) = spval
call hist_addfld1d (fname='PAR24_sun', units='umol/m2/s', &
avgflag='A', long_name='sunlit PAR (24 hrs)', &
ptr_patch=this%par24u_out_patch, set_lake=0._r8, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='PAR24_sun', units='umol/m2/s', &
! avgflag='A', long_name='sunlit PAR (24 hrs)', &
! ptr_patch=this%par24u_out_patch, set_lake=0._r8, default='inactive')

this%par240u_out_patch(begp:endp) = spval
call hist_addfld1d (fname='PAR240_sun', units='umol/m2/s', &
avgflag='A', long_name='sunlit PAR (240 hrs)', &
ptr_patch=this%par240u_out_patch, set_lake=0._r8, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='PAR240_sun', units='umol/m2/s', &
! avgflag='A', long_name='sunlit PAR (240 hrs)', &
! ptr_patch=this%par240u_out_patch, set_lake=0._r8, default='inactive')

this%para_out_patch(begp:endp) = spval
call hist_addfld1d (fname='PAR_shade', units='umol/m2/s', &
avgflag='A', long_name='shade PAR', &
ptr_patch=this%para_out_patch, set_lake=0._r8, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='PAR_shade', units='umol/m2/s', &
! avgflag='A', long_name='shade PAR', &
! ptr_patch=this%para_out_patch, set_lake=0._r8, default='inactive')

this%par24a_out_patch(begp:endp) = spval
call hist_addfld1d (fname='PAR24_shade', units='umol/m2/s', &
avgflag='A', long_name='shade PAR (24 hrs)', &
ptr_patch=this%par24a_out_patch, set_lake=0._r8, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='PAR24_shade', units='umol/m2/s', &
! avgflag='A', long_name='shade PAR (24 hrs)', &
! ptr_patch=this%par24a_out_patch, set_lake=0._r8, default='inactive')

this%par240a_out_patch(begp:endp) = spval
call hist_addfld1d (fname='PAR240_shade', units='umol/m2/s', &
avgflag='A', long_name='shade PAR (240 hrs)', &
ptr_patch=this%par240a_out_patch, set_lake=0._r8, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='PAR240_shade', units='umol/m2/s', &
! avgflag='A', long_name='shade PAR (240 hrs)', &
! ptr_patch=this%par240a_out_patch, set_lake=0._r8, default='inactive')

end if

Expand Down
7 changes: 4 additions & 3 deletions src/biogeophys/EnergyFluxType.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,9 +670,10 @@ subroutine InitHistory(this, bounds, is_simple_buildtemp, is_prog_buildtemp)

if (use_cn) then
this%rresis_patch(begp:endp,:) = spval
call hist_addfld2d (fname='RRESIS', units='proportion', type2d='levgrnd', &
avgflag='A', long_name='root resistance in each soil layer', &
ptr_patch=this%rresis_patch, l2g_scale_type='veg', default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld2d (fname='RRESIS', units='proportion', type2d='levgrnd', &
! avgflag='A', long_name='root resistance in each soil layer', &
! ptr_patch=this%rresis_patch, l2g_scale_type='veg', default='inactive')
end if

this%errsoi_col(begc:endc) = spval
Expand Down
70 changes: 40 additions & 30 deletions src/biogeophys/FrictionVelocityMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,41 +268,50 @@ subroutine InitHistory(this, bounds)
ptr_patch=this%fv_patch, default='inactive')

this%rah1_patch(begp:endp) = spval
call hist_addfld1d (fname='RAH1', units='s/m', &
avgflag='A', long_name='aerodynamical resistance ', &
ptr_patch=this%rah1_patch, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='RAH1', units='s/m', &
! avgflag='A', long_name='aerodynamical resistance ', &
! ptr_patch=this%rah1_patch, default='inactive')
this%rah2_patch(begp:endp) = spval
call hist_addfld1d (fname='RAH2', units='s/m', &
avgflag='A', long_name='aerodynamical resistance ', &
ptr_patch=this%rah2_patch, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='RAH2', units='s/m', &
! avgflag='A', long_name='aerodynamical resistance ', &
! ptr_patch=this%rah2_patch, default='inactive')
this%raw1_patch(begp:endp) = spval
call hist_addfld1d (fname='RAW1', units='s/m', &
avgflag='A', long_name='aerodynamical resistance ', &
ptr_patch=this%raw1_patch, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='RAW1', units='s/m', &
! avgflag='A', long_name='aerodynamical resistance ', &
! ptr_patch=this%raw1_patch, default='inactive')
this%raw2_patch(begp:endp) = spval
call hist_addfld1d (fname='RAW2', units='s/m', &
avgflag='A', long_name='aerodynamical resistance ', &
ptr_patch=this%raw2_patch, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='RAW2', units='s/m', &
! avgflag='A', long_name='aerodynamical resistance ', &
! ptr_patch=this%raw2_patch, default='inactive')
this%ustar_patch(begp:endp) = spval
call hist_addfld1d (fname='USTAR', units='m/s', &
avgflag='A', long_name='friction velocity ', &
ptr_patch=this%ustar_patch, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='USTAR', units='m/s', &
! avgflag='A', long_name='friction velocity ', &
! ptr_patch=this%ustar_patch, default='inactive')
this%um_patch(begp:endp) = spval
call hist_addfld1d (fname='UM', units='m/s', &
avgflag='A', long_name='wind speed plus stability effect', &
ptr_patch=this%um_patch, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='UM', units='m/s', &
! avgflag='A', long_name='wind speed plus stability effect', &
! ptr_patch=this%um_patch, default='inactive')
this%uaf_patch(begp:endp) = spval
call hist_addfld1d (fname='UAF', units='m/s', &
avgflag='A', long_name='canopy air speed ', &
ptr_patch=this%uaf_patch, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='UAF', units='m/s', &
! avgflag='A', long_name='canopy air speed ', &
! ptr_patch=this%uaf_patch, default='inactive')
this%taf_patch(begp:endp) = spval
call hist_addfld1d (fname='TAF', units='K', &
avgflag='A', long_name='canopy air temperature', &
ptr_patch=this%taf_patch, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='TAF', units='K', &
! avgflag='A', long_name='canopy air temperature', &
! ptr_patch=this%taf_patch, default='inactive')
this%qaf_patch(begp:endp) = spval
call hist_addfld1d (fname='QAF', units='kg/kg', &
avgflag='A', long_name='canopy air humidity', &
ptr_patch=this%qaf_patch, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='QAF', units='kg/kg', &
! avgflag='A', long_name='canopy air humidity', &
! ptr_patch=this%qaf_patch, default='inactive')
this%obu_patch(begp:endp) = spval
call hist_addfld1d (fname='OBU', units='m', &
avgflag='A', long_name='Obukhov length scale', &
Expand All @@ -312,9 +321,10 @@ subroutine InitHistory(this, bounds)
avgflag='A', long_name='dimensionless stability parameter', &
ptr_patch=this%zeta_patch, default='inactive')
this%vpd_patch(begp:endp) = spval
call hist_addfld1d (fname='VPD', units='kPa', &
avgflag='A', long_name='vapor pressure deficit', &
ptr_patch=this%vpd_patch, default='inactive')
! Commented out failing fields (see https://github.com/ESCOMP/CTSM/issues/3661) to allow all_outputs test to catch new problems as they arise
! call hist_addfld1d (fname='VPD', units='kPa', &
! avgflag='A', long_name='vapor pressure deficit', &
! ptr_patch=this%vpd_patch, default='inactive')
this%num_iter_patch(begp:endp) = spval
call hist_addfld1d (fname='num_iter', units='unitless', &
avgflag='A', long_name='number of iterations', &
Expand Down
Loading
Loading