elm-side bugfixes for lupft-dimensioned hist vars

Author: ckoven

components/elm/src/main/elmfates_interfaceMod.F90

@@ -3337,7 +3337,7 @@ subroutine init_history_io(this,bounds_proc)
    use FatesIOVariableKindMod, only : site_coage_r8, site_coage_pft_r8
    use FatesIOVariableKindMod, only : site_can_r8, site_cnlf_r8, site_cnlfpft_r8
    use FatesIOVariableKindMod, only : site_cdpf_r8, site_cdsc_r8, site_cdam_r8
-   use FatesIOVariableKindMod, only : site_landuse_r8, site_lulu_r8
+   use FatesIOVariableKindMod, only : site_landuse_r8, site_lulu_r8, site_lupft_r8
    use FatesIODimensionsMod, only : fates_bounds_type
 
 
@@ -3439,7 +3439,7 @@ subroutine init_history_io(this,bounds_proc)
              site_scagpft_r8, site_agepft_r8, site_elem_r8, site_elpft_r8, &
              site_elcwd_r8, site_elage_r8, site_coage_r8, site_coage_pft_r8, &
              site_agefuel_r8,site_cdsc_r8, site_cdpf_r8, site_cdam_r8, &
-             site_landuse_r8, site_lulu_r8)
+             site_landuse_r8, site_lulu_r8, site_lupft_r8)
 
            d_index = fates_hist%dim_kinds(dk_index)%dim2_index
            dim2name = fates_hist%dim_bounds(d_index)%name
@@ -3797,6 +3797,9 @@ subroutine hlm_bounds_to_fates_bounds(hlm, fates)
    fates%lulu_begin = 1
    fates%lulu_end   = n_landuse_cats * n_landuse_cats
 
+   fates%lupft_begin = 1
+   fates%lupft_end   = n_landuse_cats * numpft_fates
+
  end subroutine hlm_bounds_to_fates_bounds
 
 ! ======================================================================================

components/elm/src/main/histFileMod.F90

@@ -1958,6 +1958,7 @@ subroutine htape_create (t, histrest)
        call ncd_defdim(lnfid, 'fates_levagefuel', nlevage_fates * nfc_fates, dimid)
        call ncd_defdim(lnfid, 'fates_levlanduse', n_landuse_cats, dimid)
        call ncd_defdim(lnfid, 'fates_levlulu', n_landuse_cats * n_landuse_cats, dimid)
+       call ncd_defdim(lnfid, 'fates_levlupft', n_landuse_cats * numpft_fates, dimid)
     end if
 
     if ( .not. lhistrest )then
@@ -4856,6 +4857,8 @@ subroutine hist_addfld2d (fname, type2d, units, avgflag, long_name, type1d_out,
        num2d = n_landuse_cats
     case ('fates_levlulu')
        num2d = n_landuse_cats * n_landuse_cats
+    case ('fates_levlupft')
+       num2d = n_landuse_cats * numpft_fates
     case ('fates_levage')
        num2d = nlevage_fates
     case ('fates_levfuel')