Skip to content
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.

Sign up for GitHub

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

Getting Hector set up for H2 emissions #751

Merged
merged 6 commits into from
Oct 15, 2024
Merged

Getting Hector set up for H2 emissions #751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d4d9f45
Expose oh lifetime or oh tau to R bindings so it is easy to fetch outout
kdorheim Jul 30, 2024
590f73d
Add H2 emissions to Hector C++ core, R wrapper, and input materials
kdorheim Aug 6, 2024
a104c22
Add H2 emission unit information to the units table
kdorheim Aug 6, 2024
b9c76ac
H2 specific unit testing to be used during the dev process
kdorheim Aug 6, 2024
78ad20b
add H2 emissions to the input table
kdorheim Aug 6, 2024
af45bee
correct the h2 test bug
kdorheim Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NAMESPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ export(HFC32_CONSTRAIN)
export(HFC4310_CONSTRAIN)
export(HL_OCEAN_UPTAKE)
export(LAND_TAS)
export(LIFETIME_OH)
export(LIFETIME_SOIL)
export(LIFETIME_STRAT)
export(LL_DEBUG)
Expand Down
13 changes: 13 additions & 0 deletions R/RcppExports.R
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Generated by using Rcpp::compileAttributes() -> do not edit by hand
# Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393

#' @describeIn emissions Emissions hydrogen gas (\code{"Tg H2"})
NULL

#' @describeIn msgtype Message type for retrieving data from a component
#' @keywords internal
GETDATA <- function() {
Expand Down Expand Up @@ -1082,6 +1085,16 @@ EMISSIONS_NMVOC <- function() {
.Call('_hector_EMISSIONS_NMVOC', PACKAGE = 'hector')
}

EMISSIONS_H2 <- function() {
.Call('_hector_EMISSIONS_H2', PACKAGE = 'hector')
}

#' @describeIn oh OH lifetime (\code{"Yr"})
#' @export
LIFETIME_OH <- function() {
.Call('_hector_LIFETIME_OH', PACKAGE = 'hector')
}

#' @describeIn emissions Emissions for organic carbon (\code{"Tg"})
#' @export
EMISSIONS_OC <- function() {
Expand Down
489 changes: 245 additions & 244 deletions data-raw/input_params.csv
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions data-raw/units-data.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ ch4_vars <- c(PREINDUSTRIAL_CH4(), NATURAL_CH4(), EMISSIONS_CH4(), CH4_CONSTRAIN
LIFETIME_SOIL(), LIFETIME_STRAT())
ch4_uni <- c("ppbv CH4", "Tg CH4", "Tg CH4", "ppbv CH4", "Years", "Years")

oh_vars <- c(EMISSIONS_NOX(), EMISSIONS_CO(), EMISSIONS_NMVOC())
oh_uni <- c("Tg N", "Tg CO", "Tg NMVOC")
oh_vars <- c(EMISSIONS_NOX(), EMISSIONS_CO(), EMISSIONS_NMVOC(), EMISSIONS_H2())
oh_uni <- c("Tg N", "Tg CO", "Tg NMVOC", "Tg H2")

n2o_vars <- c(EMISSIONS_N2O(), N2O_CONSTRAIN(), NAT_EMISSIONS_N2O(), PREINDUSTRIAL_N2O())
n2o_uni <- c("Tg N", "ppbv N2O", "Tg N", "ppbv N2O")
Expand Down
Binary file modified data/inputstable.rda
View file
Open in desktop
Binary file not shown.
Binary file modified data/unitstable.rda
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions inst/include/component_data.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,8 @@
#define D_COEFFICENT_CH4 "CCH4"
#define D_COEFFICENT_NMVOC "CNMVOC"
#define D_COEFFICENT_CO "CCO"
#define D_EMISSIONS_H2 "H2_emissions"


// o3 component
#define D_PREINDUSTRIAL_O3 "PO3"
Expand Down
1 change: 1 addition & 0 deletions inst/include/oh_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ class OHComponent : public IModelComponent {
tseries<unitval> CO_emissions;
tseries<unitval> NOX_emissions;
tseries<unitval> NMVOC_emissions;
tseries<unitval> H2_emissions;
tseries<unitval> TAU_OH;

unitval M0; // initial CH4 concentration
Expand Down
1 change: 1 addition & 0 deletions inst/include/unitval.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ enum unit_types {
U_TG_CH4,
U_TG_N,
U_TG_NMVOC,
U_TG_H2,
U_DU_O3,
U_GG_S, // SO2 emissions in Gg-S/yr

Expand Down
2 changes: 2 additions & 0 deletions inst/input/hector_ssp119.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ CH4_emissions=csv:tables/ssp119_emiss-constraints_rf.csv ; emissions time se
NOX_emissions=csv:tables/ssp119_emiss-constraints_rf.csv ; emissions time series
CO_emissions=csv:tables/ssp119_emiss-constraints_rf.csv ; emissions time series
NMVOC_emissions=csv:tables/ssp119_emiss-constraints_rf.csv ; emissions time series
H2_emissions=csv:tables/ssp119_emiss-constraints_rf.csv ; emissions time series


TOH0=6.6 ; inital OH lifetime (years)
CNOX=0.0042 ; coefficent for NOX
Expand Down
1 change: 1 addition & 0 deletions inst/input/hector_ssp126.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ CH4_emissions=csv:tables/ssp126_emiss-constraints_rf.csv ; emissions time se
NOX_emissions=csv:tables/ssp126_emiss-constraints_rf.csv ; emissions time series
CO_emissions=csv:tables/ssp126_emiss-constraints_rf.csv ; emissions time series
NMVOC_emissions=csv:tables/ssp126_emiss-constraints_rf.csv ; emissions time series
H2_emissions=csv:tables/ssp119_emiss-constraints_rf.csv ; emissions time series

TOH0=6.6 ; inital OH lifetime (years)
CNOX=0.0042 ; coefficent for NOX
Expand Down
2 changes: 2 additions & 0 deletions inst/input/hector_ssp245.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ CH4_emissions=csv:tables/ssp245_emiss-constraints_rf.csv ; emissions time se
NOX_emissions=csv:tables/ssp245_emiss-constraints_rf.csv ; emissions time series
CO_emissions=csv:tables/ssp245_emiss-constraints_rf.csv ; emissions time series
NMVOC_emissions=csv:tables/ssp245_emiss-constraints_rf.csv ; emissions time series
H2_emissions=csv:tables/ssp119_emiss-constraints_rf.csv ; emissions time series


TOH0=6.6 ; inital OH lifetime (years)
CNOX=0.0042 ; coefficent for NOX
Expand Down
2 changes: 2 additions & 0 deletions inst/input/hector_ssp370.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ CH4_emissions=csv:tables/ssp370_emiss-constraints_rf.csv ; emissions time se
NOX_emissions=csv:tables/ssp370_emiss-constraints_rf.csv ; emissions time series
CO_emissions=csv:tables/ssp370_emiss-constraints_rf.csv ; emissions time series
NMVOC_emissions=csv:tables/ssp370_emiss-constraints_rf.csv ; emissions time series
H2_emissions=csv:tables/ssp119_emiss-constraints_rf.csv ; emissions time series


TOH0=6.6 ; inital OH lifetime (years)
CNOX=0.0042 ; coefficent for NOX
Expand Down
2 changes: 2 additions & 0 deletions inst/input/hector_ssp434.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ CH4_emissions=csv:tables/ssp434_emiss-constraints_rf.csv ; emissions time se
NOX_emissions=csv:tables/ssp434_emiss-constraints_rf.csv ; emissions time series
CO_emissions=csv:tables/ssp434_emiss-constraints_rf.csv ; emissions time series
NMVOC_emissions=csv:tables/ssp434_emiss-constraints_rf.csv ; emissions time series
H2_emissions=csv:tables/ssp119_emiss-constraints_rf.csv ; emissions time series


TOH0=6.6 ; inital OH lifetime (years)
CNOX=0.0042 ; coefficent for NOX
Expand Down
2 changes: 2 additions & 0 deletions inst/input/hector_ssp460.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ CH4_emissions=csv:tables/ssp460_emiss-constraints_rf.csv ; emissions time se
NOX_emissions=csv:tables/ssp460_emiss-constraints_rf.csv ; emissions time series
CO_emissions=csv:tables/ssp460_emiss-constraints_rf.csv ; emissions time series
NMVOC_emissions=csv:tables/ssp460_emiss-constraints_rf.csv ; emissions time series
H2_emissions=csv:tables/ssp119_emiss-constraints_rf.csv ; emissions time series


TOH0=6.6 ; inital OH lifetime (years)
CNOX=0.0042 ; coefficent for NOX
Expand Down
2 changes: 2 additions & 0 deletions inst/input/hector_ssp534-over.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ CH4_emissions=csv:tables/ssp534-over_emiss-constraints_rf.csv ; emissions ti
NOX_emissions=csv:tables/ssp534-over_emiss-constraints_rf.csv ; emissions time series
CO_emissions=csv:tables/ssp534-over_emiss-constraints_rf.csv ; emissions time series
NMVOC_emissions=csv:tables/ssp534-over_emiss-constraints_rf.csv ; emissions time series
H2_emissions=csv:tables/ssp119_emiss-constraints_rf.csv ; emissions time series


TOH0=6.6 ; inital OH lifetime (years)
CNOX=0.0042 ; coefficent for NOX
Expand Down
1 change: 1 addition & 0 deletions inst/input/hector_ssp585.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ CH4_emissions=csv:tables/ssp585_emiss-constraints_rf.csv ; emissions time se
NOX_emissions=csv:tables/ssp585_emiss-constraints_rf.csv ; emissions time series
CO_emissions=csv:tables/ssp585_emiss-constraints_rf.csv ; emissions time series
NMVOC_emissions=csv:tables/ssp585_emiss-constraints_rf.csv ; emissions time series
H2_emissions=csv:tables/ssp119_emiss-constraints_rf.csv ; emissions time series

TOH0=6.6 ; inital OH lifetime (years)
CNOX=0.0042 ; coefficent for NOX
Expand Down
Loading
Loading