Rename GRAINC_AT hist vars to HARVORGANC_AT to fix LREPRSTRUCT tests.

Author: samsrabin

cime_config/testdefs/testmods_dirs/clm/crop/user_nl_clm

@@ -18,7 +18,7 @@ hist_fincl3 += 'FROOTC_AT_EMERGENCE_PERHARV', 'FROOTC_AT_ANTHESIS_PERHARV', 'FRO
 hist_fincl3 += 'LIVECROOTC_AT_EMERGENCE_PERHARV', 'LIVECROOTC_AT_ANTHESIS_PERHARV', 'LIVECROOTC_AT_MATURITY_PERHARV'
 hist_fincl3 += 'LIVESTEMC_AT_EMERGENCE_PERHARV', 'LIVESTEMC_AT_ANTHESIS_PERHARV', 'LIVESTEMC_AT_MATURITY_PERHARV'
 hist_fincl3 += 'LEAFC_AT_EMERGENCE_PERHARV', 'LEAFC_AT_ANTHESIS_PERHARV', 'LEAFC_AT_MATURITY_PERHARV'
-hist_fincl3 += 'GRAINC_AT_EMERGENCE_PERHARV', 'GRAINC_AT_ANTHESIS_PERHARV', 'GRAINC_AT_MATURITY_PERHARV'
+hist_fincl3 += 'HARVORGANC_AT_EMERGENCE_PERHARV', 'HARVORGANC_AT_ANTHESIS_PERHARV', 'HARVORGANC_AT_MATURITY_PERHARV'
 hist_nhtfrq = -24,-8,-24
 hist_mfilt  = 1,1,1
 hist_type1d_pertape(3) = 'PFTS'

src/biogeochem/CropType.F90

@@ -481,18 +481,18 @@ subroutine InitHistory(this, bounds)
          ptr_patch=this%leafc_maturity_thisyr_patch, default='inactive')
 
     this%grainc_emergence_thisyr_patch(begp:endp,:) = spval
-    call hist_addfld2d (fname='GRAINC_AT_EMERGENCE_PERHARV', units='gC/m^2', type2d='mxharvests', &
-         avgflag='I', long_name='Grain C at emergence for each harvest this year; should only be output annually', &
+    call hist_addfld2d (fname='HARVORGANC_AT_EMERGENCE_PERHARV', units='gC/m^2', type2d='mxharvests', &
+         avgflag='I', long_name='Harvestable organ (grain) C at emergence for each harvest this year; should only be output annually', &
          ptr_patch=this%grainc_emergence_thisyr_patch, default='inactive')
 
     this%grainc_anthesis_thisyr_patch(begp:endp,:) = spval
-    call hist_addfld2d (fname='GRAINC_AT_ANTHESIS_PERHARV', units='gC/m^2', type2d='mxharvests', &
-         avgflag='I', long_name='Grain C at anthesis for each harvest this year; should only be output annually', &
+    call hist_addfld2d (fname='HARVORGANC_AT_ANTHESIS_PERHARV', units='gC/m^2', type2d='mxharvests', &
+         avgflag='I', long_name='Harvestable organ (grain) C at anthesis for each harvest this year; should only be output annually', &
          ptr_patch=this%grainc_anthesis_thisyr_patch, default='inactive')
 
     this%grainc_maturity_thisyr_patch(begp:endp,:) = spval
-    call hist_addfld2d (fname='GRAINC_AT_MATURITY_PERHARV', units='gC/m^2', type2d='mxharvests', &
-         avgflag='I', long_name='Grain C at maturity for each harvest this year; should only be output annually', &
+    call hist_addfld2d (fname='HARVORGANC_AT_MATURITY_PERHARV', units='gC/m^2', type2d='mxharvests', &
+         avgflag='I', long_name='Harvestable organ (grain) C at maturity for each harvest this year; should only be output annually', &
          ptr_patch=this%grainc_maturity_thisyr_patch, default='inactive')
 
     this%sowing_reason_thisyr_patch(begp:endp,:) = spval