Skip to content

Commit

Permalink
Merge pull request #43 from rffscghg/normalization
Browse files Browse the repository at this point in the history
Remove SF6 for clarity
  • Loading branch information
lrennels authored Jun 11, 2021
2 parents 9eaf0d4 + a4ceeee commit 6bfc8d7
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions src/core/FUND_main.jl
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ function set_fund_all_scenario_params!(m::Model; comp_name::Symbol = :IWGScenari
end
end

# Function from original MimiFUND code, modified for IWG CH4 and N2O
# Function from original MimiFUND code, modified for IWG CH4 and N2O and removing
# :SF6 for now as we validate that gas
function add_fund_marginal_emissions!(m, year = nothing; gas = :CO2, pulse_size = 1e7)

# Add additional emissions to m
Expand All @@ -83,9 +84,6 @@ function add_fund_marginal_emissions!(m, year = nothing; gas = :CO2, pulse_size
elseif gas == :N2O
connect_param!(m, :emissionspulse, :input, :IWGScenarioChoice, :globn2o)
connect_param!(m, :climaten2ocycle, :globn2o, :emissionspulse, :output)
elseif gas == :SF6
connect_param!(m, :emissionspulse, :input, :emissions, :globsf6)
connect_param!(m, :climatesf6cycle, :globsf6, :emissionspulse, :output)
else
error("Unknown gas: $gas")
end
Expand Down

0 comments on commit 6bfc8d7

Please sign in to comment.