Merge pull request #316 from ckoven/pftagevars

Adding new age*pft and size*age*pft hist dims and a few new vars for them

Author: rgknox

biogeochem/EDCanopyStructureMod.F90

@@ -465,7 +465,7 @@ subroutine DemoteFromLayer(currentSite,currentPatch,i_lyr)
                         call carea_allom(currentCohort%dbh,currentCohort%n, &
                               currentSite%spread,currentCohort%pft,currentCohort%c_area)
                      endif
-                     
+
                      call carea_allom(copyc%dbh,copyc%n,currentSite%spread,copyc%pft,copyc%c_area)
 
 
@@ -540,7 +540,8 @@ subroutine DemoteFromLayer(currentSite,currentPatch,i_lyr)
                         currentCohort%c_area = 0._r8
 
                      else  
-                        call carea_allom(currentCohort%dbh,currentCohort%n,currentSite%spread,currentCohort%pft,currentCohort%c_area)
+                        call carea_allom(currentCohort%dbh,currentCohort%n,currentSite%spread, &
+                                         currentCohort%pft,currentCohort%c_area)
                      endif
 
                   endif ! matches: if (cc_loss < currentCohort%c_area)then

biogeochem/EDPatchDynamicsMod.F90

@@ -1104,14 +1104,17 @@ subroutine mortality_litter_fluxes(currentSite, cp_target, new_patch_target, pat
 
           new_patch%cwd_ag(c)    = new_patch%cwd_ag(c)    + EDPftvarcon_inst%allom_agb_frac(p) * cwd_litter_density * np_mult
           currentPatch%cwd_ag(c) = currentPatch%cwd_ag(c) + EDPftvarcon_inst%allom_agb_frac(p) * cwd_litter_density
-          new_patch%cwd_bg(c)    = new_patch%cwd_bg(c)    + (1._r8-EDPftvarcon_inst%allom_agb_frac(p)) * cwd_litter_density * np_mult 
+          new_patch%cwd_bg(c)    = new_patch%cwd_bg(c)    + (1._r8-EDPftvarcon_inst%allom_agb_frac(p)) * cwd_litter_density &
+                                                            * np_mult 
           currentPatch%cwd_bg(c) = currentPatch%cwd_bg(c) + (1._r8-EDPftvarcon_inst%allom_agb_frac(p)) * cwd_litter_density 
 
           ! track as diagnostic fluxes
           currentSite%CWD_AG_diagnostic_input_carbonflux(c) = currentSite%CWD_AG_diagnostic_input_carbonflux(c) + &
-                SF_val_CWD_frac(c) * canopy_mortality_woody_litter(p) * hlm_days_per_year * EDPftvarcon_inst%allom_agb_frac(p)/ AREA 
+                SF_val_CWD_frac(c) * canopy_mortality_woody_litter(p) * hlm_days_per_year * EDPftvarcon_inst%allom_agb_frac(p) &
+                / AREA 
           currentSite%CWD_BG_diagnostic_input_carbonflux(c) = currentSite%CWD_BG_diagnostic_input_carbonflux(c) + &
-                SF_val_CWD_frac(c) * canopy_mortality_woody_litter(p) * hlm_days_per_year * (1.0_r8 - EDPftvarcon_inst%allom_agb_frac(p)) / AREA
+                SF_val_CWD_frac(c) * canopy_mortality_woody_litter(p) * hlm_days_per_year * (1.0_r8 &
+                - EDPftvarcon_inst%allom_agb_frac(p)) / AREA
        enddo
 
        new_patch%leaf_litter(p) = new_patch%leaf_litter(p) + canopy_mortality_leaf_litter(p) / litter_area * np_mult

main/EDParamsMod.F90

@@ -46,6 +46,7 @@ module EDParamsMod
    ! two special parameters whose size is defined in the parameter file
    real(r8),protected,allocatable :: ED_val_history_sizeclass_bin_edges(:)
    real(r8),protected,allocatable :: ED_val_history_ageclass_bin_edges(:)
+   real(r8),protected,allocatable :: ED_val_history_height_bin_edges(:)
 
    character(len=param_string_length),parameter :: ED_name_mort_disturb_frac = "fates_mort_disturb_frac"
    character(len=param_string_length),parameter :: ED_name_comp_excln = "fates_comp_excln"
@@ -73,6 +74,7 @@ module EDParamsMod
    ! non-scalar parameter names
    character(len=param_string_length),parameter :: ED_name_history_sizeclass_bin_edges= "fates_history_sizeclass_bin_edges"      
    character(len=param_string_length),parameter :: ED_name_history_ageclass_bin_edges= "fates_history_ageclass_bin_edges"      
+   character(len=param_string_length),parameter :: ED_name_history_height_bin_edges= "fates_history_height_bin_edges"
 
    ! Hydraulics Control Parameters (ONLY RELEVANT WHEN USE_FATES_HYDR = TRUE)
    ! ----------------------------------------------------------------------------------------------
@@ -171,6 +173,7 @@ subroutine FatesRegisterParams(fates_params)
 
     use FatesParametersInterface, only : fates_parameters_type, dimension_name_scalar1d, dimension_shape_1d
     use FatesParametersInterface, only : dimension_name_history_size_bins, dimension_name_history_age_bins
+    use FatesParametersInterface, only : dimension_name_history_height_bins
 
     implicit none
 
@@ -179,6 +182,7 @@ subroutine FatesRegisterParams(fates_params)
     character(len=param_string_length), parameter :: dim_names(1) = (/dimension_name_scalar1d/)
     character(len=param_string_length), parameter :: dim_names_sizeclass(1) = (/dimension_name_history_size_bins/)
     character(len=param_string_length), parameter :: dim_names_ageclass(1) = (/dimension_name_history_age_bins/)
+    character(len=param_string_length), parameter :: dim_names_height(1) = (/dimension_name_history_height_bins/)
 
     call FatesParamsInit()
 
@@ -285,6 +289,9 @@ subroutine FatesRegisterParams(fates_params)
     call fates_params%RegisterParameter(name=ED_name_history_ageclass_bin_edges, dimension_shape=dimension_shape_1d, &
          dimension_names=dim_names_ageclass)
 
+    call fates_params%RegisterParameter(name=ED_name_history_height_bin_edges, dimension_shape=dimension_shape_1d, &
+         dimension_names=dim_names_height)
+
   end subroutine FatesRegisterParams
 
 
@@ -400,6 +407,9 @@ subroutine FatesReceiveParams(fates_params)
     call fates_params%RetreiveParameterAllocate(name=ED_name_history_ageclass_bin_edges, &
           data=ED_val_history_ageclass_bin_edges)
 
+    call fates_params%RetreiveParameterAllocate(name=ED_name_history_height_bin_edges, &
+          data=ED_val_history_height_bin_edges)
+
 
   end subroutine FatesReceiveParams