Maritsandstad fix unit confusion comment

biogeochem/EDCanopyStructureMod.F90

@@ -1968,6 +1968,7 @@ subroutine update_hlm_dynamics(nsites,sites,fcolumn,bc_out)
                 bc_out(s)%z0m_pa(ifp)    = EDPftvarcon_inst%z0mr(1) * bc_out(s)%htop_pa(ifp)
                 bc_out(s)%displa_pa(ifp) = EDPftvarcon_inst%displar(1) * bc_out(s)%htop_pa(ifp)
                 bc_out(s)%dleaf_pa(ifp)  = EDPftvarcon_inst%dleaf(1)
+                bc_out(s)%nocomp_MEGAN_pft_label_pa(ifp) = 1
              endif
              ! -----------------------------------------------------------------------------
 
@@ -1993,6 +1994,12 @@ subroutine update_hlm_dynamics(nsites,sites,fcolumn,bc_out)
 
              bc_out(s)%nocomp_pft_label_pa(ifp) = currentPatch%nocomp_pft_label
 
+             if(currentPatch%nocomp_pft_label.gt.0)then
+                bc_out(s)%nocomp_MEGAN_pft_label_pa(ifp) = EDPftvarcon_inst%voc_pftindex(currentPatch%nocomp_pft_label)
+             else
+                bc_out(s)%nocomp_MEGAN_pft_label_pa(ifp) = 1 ! dummy for bare ground. 
+             endif
+
              ! Calculate area indices for output boundary to HLM
              ! It is assumed that cpatch%canopy_area_profile and cpat%xai_profiles
              ! have been updated (ie ed_leaf_area_profile has been called since dynamics has been called)

biogeochem/EDPatchDynamicsMod.F90

@@ -48,6 +48,7 @@ module EDPatchDynamicsMod
   use FatesConstantsMod    , only : nocomp_bareground
   use FatesInterfaceTypesMod    , only : hlm_use_planthydro
   use FatesInterfaceTypesMod    , only : bc_in_type
+  use FatesInterfaceTypesMod    , only : bc_out_type
   use FatesInterfaceTypesMod    , only : numpft
   use FatesInterfaceTypesMod    , only : hlm_stepsize
   use FatesInterfaceTypesMod    , only : hlm_use_sp
@@ -482,7 +483,7 @@ end subroutine disturbance_rates
 
     ! ============================================================================
 
-  subroutine spawn_patches( currentSite, bc_in)
+  subroutine spawn_patches( currentSite, bc_in, bc_out)
     !
     ! !DESCRIPTION:
     ! In this subroutine, the following happens,
@@ -509,6 +510,7 @@ subroutine spawn_patches( currentSite, bc_in)
     ! !ARGUMENTS:
     type (ed_site_type), intent(inout) :: currentSite
     type (bc_in_type), intent(in)      :: bc_in
+    type (bc_out_type), intent(inout)  :: bc_out
     !
     ! !LOCAL VARIABLES:
     type (fates_patch_type) , pointer :: newPatch
@@ -753,7 +755,9 @@ subroutine spawn_patches( currentSite, bc_in)
 
                             call CopyPatchMeansTimers(currentPatch, newPatch)
 
-                            call TransLitterNewPatch( currentSite, currentPatch, newPatch, patch_site_areadis, i_disturbance_type)
+
+                            call TransLitterNewPatch( currentSite, currentPatch, newPatch, patch_site_areadis, bc_out, i_disturbance_type)
+
 
                             ! Transfer in litter fluxes from plants in various contexts of death and destruction
                             select case(i_disturbance_type)
@@ -768,13 +772,13 @@ subroutine spawn_patches( currentSite, bc_in)
                                end if
                             case (dtype_ifire)
                                call fire_litter_fluxes(currentSite, currentPatch, &
-                                    newPatch, patch_site_areadis,bc_in)
+                                    newPatch, patch_site_areadis,bc_in, bc_out)
                             case (dtype_ifall)
                                call mortality_litter_fluxes(currentSite, currentPatch, &
                                     newPatch, patch_site_areadis,bc_in)
                             case (dtype_ilandusechange)
                                call landusechange_litter_fluxes(currentSite, currentPatch, &
-                                    newPatch, patch_site_areadis,bc_in, &
+                                    newPatch, patch_site_areadis,bc_in, bc_out, &
                                     clearing_matrix(i_donorpatch_landuse_type,i_landusechange_receiverpatchlabel))
 
                                ! if land use change, then may need to change nocomp pft, so tag as having transitioned LU
@@ -1068,11 +1072,8 @@ subroutine spawn_patches( currentSite, bc_in)
                                           currentSite%mass_balance(el)%burn_flux_to_atm + &
                                           leaf_burn_frac * leaf_m * nc%n
 
-                                     ! This diagnostic only tracks
-                                     currentSite%flux_diags%elem(el)%burned_liveveg = &
-                                          currentSite%flux_diags%elem(el)%burned_liveveg + & 
-                                          leaf_burn_frac * leaf_m * nc%n * area_inv
-
+                                     bc_out%fire_closs_to_atm_si = bc_out%fire_closs_to_atm_si + &
+                                          leaf_burn_frac * leaf_m * nc%n * ha_per_m2 * days_per_sec
                                   end do
 
                                   ! Here the mass is removed from the plant
@@ -1421,7 +1422,7 @@ subroutine spawn_patches( currentSite, bc_in)
 
                          allocate(temp_patch)
 
-                         call split_patch(currentSite, currentPatch, temp_patch, fraction_to_keep, newp_area)
+                         call split_patch(currentSite, currentPatch, temp_patch, fraction_to_keep, newp_area, bc_out)
                          !
                          temp_patch%nocomp_pft_label = 0
 
@@ -1524,7 +1525,7 @@ subroutine spawn_patches( currentSite, bc_in)
                                ! split buffer patch in two, keeping the smaller buffer patch to put into new patches
                                allocate(temp_patch)
 
-                               call split_patch(currentSite, buffer_patch, temp_patch, fraction_to_keep, newp_area)
+                               call split_patch(currentSite, buffer_patch, temp_patch, fraction_to_keep, newp_area, bc_out)
 
                                ! give the new patch the intended nocomp PFT label
                                temp_patch%nocomp_pft_label = i_pft
@@ -1633,7 +1634,7 @@ end subroutine spawn_patches
 
   ! -----------------------------------------------------------------------------------------
 
-  subroutine split_patch(currentSite, currentPatch, new_patch, fraction_to_keep, area_to_remove)
+  subroutine split_patch(currentSite, currentPatch, new_patch, fraction_to_keep, area_to_remove, bc_out)
     !
     ! !DESCRIPTION:
     !  Split a patch into two patches that are identical except in their areas
@@ -1644,6 +1645,7 @@ subroutine split_patch(currentSite, currentPatch, new_patch, fraction_to_keep, a
     type(fates_patch_type) , intent(inout), pointer :: new_patch         ! New Patch
     real(r8), intent(in)                            :: fraction_to_keep  ! fraction of currentPatch to keep, the rest goes to newpatch
     real(r8), intent(in), optional                  :: area_to_remove     ! area of currentPatch to remove, the rest goes to newpatch
+    type(bc_out_type)   , intent(inout)             :: bc_out
     !
     ! !LOCAL VARIABLES:
     integer  :: el                           ! element loop index
@@ -1680,7 +1682,8 @@ subroutine split_patch(currentSite, currentPatch, new_patch, fraction_to_keep, a
 
     call CopyPatchMeansTimers(currentPatch, new_patch)
 
-    call TransLitterNewPatch( currentSite, currentPatch, new_patch, temp_area, 0)
+    call TransLitterNewPatch( currentSite, currentPatch, new_patch, temp_area, bc_out, 0)
+
 
     ! Next, we loop through the cohorts in the donor patch, copy them with
     ! area modified number density into the new-patch, and apply survivorship.
@@ -1814,8 +1817,7 @@ end subroutine check_patch_area
   subroutine TransLitterNewPatch(currentSite,        &
                                  currentPatch,       &
                                  newPatch,           &
-                                 patch_site_areadis, &
-                                 dist_type)
+                                 patch_site_areadis, bc_out, dist_type)
 
     ! -----------------------------------------------------------------------------------
     ! 
@@ -1864,8 +1866,8 @@ subroutine TransLitterNewPatch(currentSite,        &
     type(fates_patch_type) , intent(inout) :: newPatch           ! New patch
     real(r8)            , intent(in)    :: patch_site_areadis ! Area being donated
                                                               ! by current patch
+    type(bc_out_type)   , intent(inout)         :: bc_out
     integer,              intent(in)    :: dist_type          ! disturbance type
-
 
     ! locals
     type(site_massbal_type), pointer :: site_mass
@@ -1989,7 +1991,9 @@ subroutine TransLitterNewPatch(currentSite,        &
           curr_litt%ag_cwd(c) = curr_litt%ag_cwd(c) + donatable_mass*retain_m2
 
           site_mass%burn_flux_to_atm = site_mass%burn_flux_to_atm + burned_mass
-
+
+          bc_out%fire_closs_to_atm_si = bc_out%fire_closs_to_atm_si + burned_mass * ha_per_m2 * days_per_sec
+
           ! Transfer below ground CWD (none burns)
 
           do sl = 1,currentSite%nlevsoil
@@ -2018,7 +2022,9 @@ subroutine TransLitterNewPatch(currentSite,        &
            curr_litt%leaf_fines(dcmpy) = curr_litt%leaf_fines(dcmpy) + donatable_mass*retain_m2
 
            site_mass%burn_flux_to_atm = site_mass%burn_flux_to_atm + burned_mass
-
+
+           bc_out%fire_closs_to_atm_si = bc_out%fire_closs_to_atm_si + burned_mass * ha_per_m2 * days_per_sec
+
            ! Transfer root fines (none burns)
            do sl = 1,currentSite%nlevsoil
                donatable_mass = curr_litt%root_fines(dcmpy,sl) * patch_site_areadis             
@@ -2068,7 +2074,7 @@ end subroutine TransLitterNewPatch
   ! ============================================================================
 
   subroutine fire_litter_fluxes(currentSite, currentPatch, &
-       newPatch, patch_site_areadis, bc_in)
+       newPatch, patch_site_areadis, bc_in, bc_out)
     !
     ! !DESCRIPTION:
     !  CWD pool burned by a fire. 
@@ -2088,6 +2094,7 @@ subroutine fire_litter_fluxes(currentSite, currentPatch, &
     type(fates_patch_type) , intent(inout), target :: newPatch   ! New Patch
     real(r8)            , intent(in)            :: patch_site_areadis ! Area being donated
     type(bc_in_type)    , intent(in)            :: bc_in
+    type(bc_out_type)   , intent(inout)         :: bc_out
 
     !
     ! !LOCAL VARIABLES:
@@ -2229,8 +2236,8 @@ subroutine fire_litter_fluxes(currentSite, currentPatch, &
 
              site_mass%burn_flux_to_atm = site_mass%burn_flux_to_atm + burned_mass
 
-
-             
+             bc_out%fire_closs_to_atm_si = bc_out%fire_closs_to_atm_si + burned_mass * ha_per_m2 * days_per_sec
+
              call set_root_fraction(currentSite%rootfrac_scr, pft, currentSite%zi_soil, &
                   bc_in%max_rooting_depth_index_col)
 
@@ -2292,6 +2299,7 @@ subroutine fire_litter_fluxes(currentSite, currentPatch, &
                       burned_mass = num_dead_trees * SF_val_CWD_frac_adj(c) * bstem * &
                       currentCohort%fraction_crown_burned
                       site_mass%burn_flux_to_atm = site_mass%burn_flux_to_atm + burned_mass
+                      bc_out%fire_closs_to_atm_si = bc_out%fire_closs_to_atm_si + burned_mass * ha_per_m2 * days_per_sec
                 endif
                 new_litt%ag_cwd(c) = new_litt%ag_cwd(c) + donatable_mass * donate_m2
                 curr_litt%ag_cwd(c) = curr_litt%ag_cwd(c) + donatable_mass * retain_m2
@@ -2542,7 +2550,7 @@ end subroutine mortality_litter_fluxes
     ! ============================================================================
 
   subroutine landusechange_litter_fluxes(currentSite, currentPatch, &
-       newPatch, patch_site_areadis, bc_in, &
+       newPatch, patch_site_areadis, bc_in, bc_out, &
        clearing_matrix_element)
     !
     ! !DESCRIPTION:
@@ -2559,6 +2567,7 @@ subroutine landusechange_litter_fluxes(currentSite, currentPatch, &
     type(fates_patch_type) , intent(inout), target :: newPatch   ! New Patch
     real(r8)               , intent(in)            :: patch_site_areadis ! Area being donated
     type(bc_in_type)       , intent(in)            :: bc_in
+    type(bc_out_type)      , intent(inout)         :: bc_out
     logical                , intent(in)            :: clearing_matrix_element ! whether or not to clear vegetation
 
     !
@@ -2702,7 +2711,9 @@ subroutine landusechange_litter_fluxes(currentSite, currentPatch, &
              end do
 
              site_mass%burn_flux_to_atm = site_mass%burn_flux_to_atm + burned_mass
-
+
+             bc_out%fire_closs_to_atm_si = bc_out%fire_closs_to_atm_si + burned_mass * ha_per_m2 * days_per_sec
+
              call set_root_fraction(currentSite%rootfrac_scr, pft, currentSite%zi_soil, &
                   bc_in%max_rooting_depth_index_col)
 
@@ -2762,6 +2773,7 @@ subroutine landusechange_litter_fluxes(currentSite, currentPatch, &
                         EDPftvarcon_inst%landusechange_frac_burned(pft)
 
                    site_mass%burn_flux_to_atm = site_mass%burn_flux_to_atm + burned_mass
+                   bc_out%fire_closs_to_atm_si = bc_out%fire_closs_to_atm_si + burned_mass * ha_per_m2 * days_per_sec
                 else ! all other pools can end up as timber products or burn or go to litter
                    donatable_mass = donatable_mass * (1.0_r8-EDPftvarcon_inst%landusechange_frac_exported(pft)) * &
                         (1.0_r8-EDPftvarcon_inst%landusechange_frac_burned(pft))
@@ -2775,6 +2787,8 @@ subroutine landusechange_litter_fluxes(currentSite, currentPatch, &
 
                    site_mass%burn_flux_to_atm = site_mass%burn_flux_to_atm + burned_mass
 
+                   bc_out%fire_closs_to_atm_si = bc_out%fire_closs_to_atm_si + burned_mass * ha_per_m2 * days_per_sec
+
                    trunk_product_site = trunk_product_site + &
                         woodproduct_mass