Skip to content
This repository has been archived by the owner on Sep 14, 2018. It is now read-only.

Commit

Permalink
Merge pull request #6 from ckoven/ckoven-parameter-updates
Browse files Browse the repository at this point in the history
parameter updates: deleted two, added prefixes on a bunch, made sorting script, ran sorting script
  • Loading branch information
rgknox authored Mar 23, 2018
2 parents 0e9cfec + 39354b8 commit eccb753
Show file tree
Hide file tree
Showing 4 changed files with 970 additions and 921 deletions.
15 changes: 2 additions & 13 deletions main/EDParamsMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ module EDParamsMod
! this is what the user can use for the actual values
!

real(r8),protected :: ED_size_diagnostic_scale ! Flag to switch between a linear and exponential
! scale on the plant size axis in diagnostics (NOT USED YET)
real(r8),protected :: fates_mortality_disturbance_fraction ! the fraction of canopy mortality that results in disturbance
real(r8),protected :: ED_val_comp_excln
real(r8),protected :: ED_val_stress_mort
Expand Down Expand Up @@ -50,13 +48,12 @@ module EDParamsMod
real(r8),protected,allocatable :: ED_val_history_sizeclass_bin_edges(:)
real(r8),protected,allocatable :: ED_val_history_ageclass_bin_edges(:)

character(len=param_string_length),parameter :: ED_name_size_diagnostic_scale = "fates_size_diagnostic_scale"
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"
character(len=param_string_length),parameter :: ED_name_stress_mort = "fates_stress_mort"
character(len=param_string_length),parameter :: ED_name_init_litter = "fates_init_litter"
character(len=param_string_length),parameter :: ED_name_nignitions = "fates_nignitions"
character(len=param_string_length),parameter :: ED_name_understorey_death = "fates_understorey_death"
character(len=param_string_length),parameter :: ED_name_nignitions = "fates_fire_nignitions"
character(len=param_string_length),parameter :: ED_name_understorey_death = "fates_mort_understorey_death"
character(len=param_string_length),parameter :: ED_name_cwd_fcel= "fates_cwd_fcel"
character(len=param_string_length),parameter :: ED_name_cwd_flig= "fates_cwd_flig"
character(len=param_string_length),parameter :: ED_name_bbopt_c3= "fates_bbopt_c3"
Expand Down Expand Up @@ -129,7 +126,6 @@ subroutine FatesParamsInit()

implicit none

ED_size_diagnostic_scale = nan
fates_mortality_disturbance_fraction = nan
ED_val_comp_excln = nan
ED_val_stress_mort = nan
Expand Down Expand Up @@ -185,9 +181,6 @@ subroutine FatesRegisterParams(fates_params)

call FatesParamsInit()

call fates_params%RegisterParameter(name=ED_name_size_diagnostic_scale, dimension_shape=dimension_shape_1d, &
dimension_names=dim_names)

call fates_params%RegisterParameter(name=ED_name_mort_disturb_frac, dimension_shape=dimension_shape_1d, &
dimension_names=dim_names)

Expand Down Expand Up @@ -303,9 +296,6 @@ subroutine FatesReceiveParams(fates_params)

class(fates_parameters_type), intent(inout) :: fates_params

call fates_params%RetreiveParameter(name=ED_name_size_diagnostic_scale, &
data=ED_size_diagnostic_scale)

call fates_params%RetreiveParameter(name=ED_name_mort_disturb_frac, &
data=fates_mortality_disturbance_fraction)

Expand Down Expand Up @@ -424,7 +414,6 @@ subroutine FatesReportParams(is_master)
if(debug_report .and. is_master) then

write(fates_log(),*) '----------- FATES Scalar Parameters -----------------'
write(fates_log(),fmt0) 'ED_size_diagnostic_scale = ',ED_size_diagnostic_scale
write(fates_log(),fmt0) 'fates_mortality_disturbance_fraction = ',fates_mortality_disturbance_fraction
write(fates_log(),fmt0) 'ED_val_comp_excln = ',ED_val_comp_excln
write(fates_log(),fmt0) 'ED_val_stress_mort = ',ED_val_stress_mort
Expand Down
Loading

0 comments on commit eccb753

Please sign in to comment.