-
Notifications
You must be signed in to change notification settings - Fork 321
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.
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
SUPERSEDED [Fang summer '24 PR 1] Fix bugs and develop crop fire modeling #2576
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -89,7 +89,7 @@ subroutine CNFireArea (this, bounds, num_soilc, filter_soilc, num_soilp, filter_ | |
num_exposedvegp, filter_exposedvegp, num_noexposedvegp, filter_noexposedvegp, & | ||
atm2lnd_inst, energyflux_inst, saturated_excess_runoff_inst, waterdiagnosticbulk_inst, & | ||
wateratm2lndbulk_inst, waterstatebulk_inst, soilstate_inst, soil_water_retention_curve, & | ||
cnveg_state_inst, cnveg_carbonstate_inst, totlitc_col, decomp_cpools_vr_col, t_soi17cm_col) | ||
crop_inst, cnveg_state_inst, cnveg_carbonstate_inst, totlitc_col, decomp_cpools_vr_col, t_soi17cm_col) | ||
! | ||
! !DESCRIPTION: | ||
! Computes column-level burned area | ||
|
@@ -101,6 +101,7 @@ subroutine CNFireArea (this, bounds, num_soilc, filter_soilc, num_soilp, filter_ | |
use pftconMod , only: nc4_grass, nc3crop, ndllf_evr_tmp_tree | ||
use pftconMod , only: nbrdlf_evr_trp_tree, nbrdlf_dcd_trp_tree, nbrdlf_evr_shrub | ||
use dynSubgridControlMod , only : run_has_transient_landcover | ||
use CropType , only: crop_type | ||
! | ||
! !ARGUMENTS: | ||
class(cnfire_li2016_type) :: this | ||
|
@@ -123,6 +124,7 @@ subroutine CNFireArea (this, bounds, num_soilc, filter_soilc, num_soilp, filter_ | |
class(soil_water_retention_curve_type), intent(in) :: soil_water_retention_curve | ||
type(cnveg_state_type) , intent(inout) :: cnveg_state_inst | ||
type(cnveg_carbonstate_type) , intent(inout) :: cnveg_carbonstate_inst | ||
type(crop_type) , intent(in) :: crop_inst | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add comment: This is just used as a dummy in this version. Actually used in CNFireLi2021Mod. |
||
real(r8) , intent(in) :: totlitc_col(bounds%begc:) | ||
real(r8) , intent(in) :: decomp_cpools_vr_col(bounds%begc:,1:,1:) | ||
real(r8) , intent(in) :: t_soi17cm_col(bounds%begc:) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -62,13 +62,14 @@ subroutine CNFireArea (this, bounds, num_soilc, filter_soilc, num_soilp, filter_ | |
atm2lnd_inst, energyflux_inst, saturated_excess_runoff_inst, & | ||
waterdiagnosticbulk_inst, wateratm2lndbulk_inst, & | ||
waterstatebulk_inst, soilstate_inst, soil_water_retention_curve, & | ||
cnveg_state_inst, cnveg_carbonstate_inst, totlitc_col, decomp_cpools_vr_col, t_soi17cm_col) | ||
crop_inst, cnveg_state_inst, cnveg_carbonstate_inst, totlitc_col, decomp_cpools_vr_col, t_soi17cm_col) | ||
! | ||
! !DESCRIPTION: | ||
! Computes column-level burned area | ||
! | ||
! !USES: | ||
use subgridAveMod , only : p2c | ||
use CropType , only : crop_type | ||
! | ||
! !ARGUMENTS: | ||
class(cnfire_nofire_type) :: this | ||
|
@@ -91,6 +92,7 @@ subroutine CNFireArea (this, bounds, num_soilc, filter_soilc, num_soilp, filter_ | |
class(soil_water_retention_curve_type), intent(in) :: soil_water_retention_curve | ||
type(cnveg_state_type) , intent(inout) :: cnveg_state_inst | ||
type(cnveg_carbonstate_type) , intent(inout) :: cnveg_carbonstate_inst | ||
type(crop_type) , intent(in) :: crop_inst | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add comment: This is just used as a dummy in this version. Actually used in CNFireLi2021Mod. |
||
real(r8) , intent(in) :: totlitc_col(bounds%begc:) | ||
real(r8) , intent(in) :: decomp_cpools_vr_col(bounds%begc:,1:,1:) | ||
real(r8) , intent(in) :: t_soi17cm_col(bounds%begc:) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -206,7 +206,7 @@ subroutine CNFireArea (this, bounds, num_soilc, filter_soilc, num_soilp, filter_ | |
atm2lnd_inst, energyflux_inst, saturated_excess_runoff_inst, & | ||
waterdiagnosticbulk_inst, wateratm2lndbulk_inst, & | ||
waterstatebulk_inst, soilstate_inst, soil_water_retention_curve, & | ||
cnveg_state_inst, cnveg_carbonstate_inst, totlitc_col, decomp_cpools_vr_col, t_soi17cm_col) | ||
crop_inst, cnveg_state_inst, cnveg_carbonstate_inst, totlitc_col, decomp_cpools_vr_col, t_soi17cm_col) | ||
! | ||
! !DESCRIPTION: | ||
! Computes column-level burned area (NOT USED FOR FATES) | ||
|
@@ -220,6 +220,7 @@ subroutine CNFireArea (this, bounds, num_soilc, filter_soilc, num_soilp, filter_ | |
use SoilStateType , only : soilstate_type | ||
use SoilWaterRetentionCurveMod , only : soil_water_retention_curve_type | ||
use atm2lndType , only : atm2lnd_type | ||
use CropType , only: crop_type | ||
! | ||
! !ARGUMENTS: | ||
class(fates_fire_base_type) :: this | ||
|
@@ -242,6 +243,8 @@ subroutine CNFireArea (this, bounds, num_soilc, filter_soilc, num_soilp, filter_ | |
class(soil_water_retention_curve_type), intent(in) :: soil_water_retention_curve | ||
type(cnveg_state_type) , intent(inout) :: cnveg_state_inst | ||
type(cnveg_carbonstate_type) , intent(inout) :: cnveg_carbonstate_inst | ||
type(crop_type) , intent(in) :: crop_inst | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add comment: This is just used as a dummy in this version. Actually used in CNFireLi2021Mod. |
||
|
||
real(r8) , intent(in) :: totlitc_col(bounds%begc:) | ||
real(r8) , intent(in) :: decomp_cpools_vr_col(bounds%begc:,1:,1:) | ||
real(r8) , intent(in) :: t_soi17cm_col(bounds%begc:) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -119,7 +119,7 @@ subroutine CNFireArea_interface (this, bounds, num_soilc, filter_soilc, num_soil | |
atm2lnd_inst, energyflux_inst, saturated_excess_runoff_inst, & | ||
waterdiagnosticbulk_inst, wateratm2lndbulk_inst, & | ||
waterstatebulk_inst, soilstate_inst, soil_water_retention_curve, & | ||
cnveg_state_inst, cnveg_carbonstate_inst, totlitc_col, decomp_cpools_vr_col, t_soi17cm_col) | ||
crop_inst, cnveg_state_inst, cnveg_carbonstate_inst, totlitc_col, decomp_cpools_vr_col, t_soi17cm_col) | ||
! | ||
! !DESCRIPTION: | ||
! Computes column-level burned area | ||
|
@@ -137,6 +137,7 @@ subroutine CNFireArea_interface (this, bounds, num_soilc, filter_soilc, num_soil | |
use SoilWaterRetentionCurveMod , only : soil_water_retention_curve_type | ||
use CNVegStateType , only : cnveg_state_type | ||
use CNVegCarbonStateType , only : cnveg_carbonstate_type | ||
use CropType , only : crop_type | ||
import :: fire_method_type | ||
! | ||
! !ARGUMENTS: | ||
|
@@ -160,6 +161,7 @@ subroutine CNFireArea_interface (this, bounds, num_soilc, filter_soilc, num_soil | |
class(soil_water_retention_curve_type), intent(in) :: soil_water_retention_curve | ||
type(cnveg_state_type) , intent(inout) :: cnveg_state_inst | ||
type(cnveg_carbonstate_type) , intent(inout) :: cnveg_carbonstate_inst | ||
type(crop_type) , intent(in) :: crop_inst | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add comment: This is just used as a dummy in this version. Actually used in CNFireLi2021Mod. |
||
real(r8) , intent(in) :: totlitc_col(bounds%begc:) | ||
real(r8) , intent(in) :: decomp_cpools_vr_col(bounds%begc:,1:,1:) | ||
real(r8) , intent(in) :: t_soi17cm_col(bounds%begc:) | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add comment: This is just used as a dummy in this version. Actually used in CNFireLi2021Mod.