implement the H2 coeff for the OH componet as something that can be r…

…ead in from teh ini file
JGCRI · Nov 6, 2024 · ec1511f · ec1511f
1 parent a46e14e
commit ec1511f
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 1 deletion.
diff --git a/inst/include/component_data.hpp b/inst/include/component_data.hpp
@@ -281,6 +281,7 @@
 #define D_COEFFICENT_CH4 "CCH4"
 #define D_COEFFICENT_NMVOC "CNMVOC"
 #define D_COEFFICENT_CO "CCO"
+#define D_COEFFICENT_H2 "CH2"
 #define D_EMISSIONS_H2 "H2_emissions"
 
 

diff --git a/inst/include/oh_component.hpp b/inst/include/oh_component.hpp
@@ -71,6 +71,8 @@ class OHComponent : public IModelComponent {
   double CNMVOC; // coefficent for NMVOC
   double CNOX;   // coefficent for NOX
   double CCH4;   // coefficent for CH4
+  double CH2;   // coefficent for CH4
+
 
   // logger
   Logger logger;

diff --git a/inst/input/hector_ssp119.ini b/inst/input/hector_ssp119.ini
@@ -138,6 +138,7 @@ CNOX=0.0042			; coefficent for NOX
 CCO=-0.000105		; coefficent for CO
 CNMVOC=-0.000315	; coefficent for NMVOC (non methane VOC)
 CCH4=-0.32			; coefficent for CH4
+CH2=-0.00044625 ; coefficent for H2
 
 ;------------------------------------------------------------------------
 [ozone]

diff --git a/inst/input/hector_ssp126.ini b/inst/input/hector_ssp126.ini
@@ -137,6 +137,8 @@ CNOX=0.0042			; coefficent for NOX
 CCO=-0.000105		; coefficent for CO
 CNMVOC=-0.000315	; coefficent for NMVOC (non methane VOC)
 CCH4=-0.32			; coefficent for CH4
+CH2=-0.00044625 ; coefficent for H2
+
 
 ;------------------------------------------------------------------------
 [ozone]

diff --git a/inst/input/hector_ssp245.ini b/inst/input/hector_ssp245.ini
@@ -138,6 +138,8 @@ CNOX=0.0042			; coefficent for NOX
 CCO=-0.000105		; coefficent for CO
 CNMVOC=-0.000315	; coefficent for NMVOC (non methane VOC)
 CCH4=-0.32			; coefficent for CH4
+CH2=-0.00044625 ; coefficent for H2
+
 
 ;------------------------------------------------------------------------
 [ozone]

diff --git a/inst/input/hector_ssp370.ini b/inst/input/hector_ssp370.ini
@@ -138,6 +138,8 @@ CNOX=0.0042			; coefficent for NOX
 CCO=-0.000105		; coefficent for CO
 CNMVOC=-0.000315	; coefficent for NMVOC (non methane VOC)
 CCH4=-0.32			; coefficent for CH4
+CH2=-0.00044625 ; coefficent for H2
+
 
 ;------------------------------------------------------------------------
 [ozone]

diff --git a/inst/input/hector_ssp434.ini b/inst/input/hector_ssp434.ini
@@ -138,6 +138,8 @@ CNOX=0.0042			; coefficent for NOX
 CCO=-0.000105		; coefficent for CO
 CNMVOC=-0.000315	; coefficent for NMVOC (non methane VOC)
 CCH4=-0.32			; coefficent for CH4
+CH2=-0.00044625 ; coefficent for H2
+
 
 ;------------------------------------------------------------------------
 [ozone]

diff --git a/inst/input/hector_ssp460.ini b/inst/input/hector_ssp460.ini
@@ -138,6 +138,8 @@ CNOX=0.0042			; coefficent for NOX
 CCO=-0.000105		; coefficent for CO
 CNMVOC=-0.000315	; coefficent for NMVOC (non methane VOC)
 CCH4=-0.32			; coefficent for CH4
+CH2=-0.00044625 ; coefficent for H2
+
 
 ;------------------------------------------------------------------------
 [ozone]

diff --git a/inst/input/hector_ssp534-over.ini b/inst/input/hector_ssp534-over.ini
@@ -138,6 +138,8 @@ CNOX=0.0042			; coefficent for NOX
 CCO=-0.000105		; coefficent for CO
 CNMVOC=-0.000315	; coefficent for NMVOC (non methane VOC)
 CCH4=-0.32			; coefficent for CH4
+CH2=-0.00044625 ; coefficent for H2
+
 
 ;------------------------------------------------------------------------
 [ozone]

diff --git a/inst/input/hector_ssp585.ini b/inst/input/hector_ssp585.ini
@@ -137,6 +137,8 @@ CNOX=0.0042			; coefficent for NOX
 CCO=-0.000105		; coefficent for CO
 CNMVOC=-0.000315	; coefficent for NMVOC (non methane VOC)
 CCH4=-0.32			; coefficent for CH4
+CH2=-0.00044625 ; coefficent for H2
+
 
 ;------------------------------------------------------------------------
 [ozone]

diff --git a/src/oh_component.cpp b/src/oh_component.cpp
@@ -117,6 +117,9 @@ void OHComponent::setData(const string &varName, const message_data &data) {
     } else if (varName == D_COEFFICENT_NOX) {
       H_ASSERT(data.date == Core::undefinedIndex(), "date not allowed");
       CNOX = data.getUnitval(U_UNDEFINED);
+    } else if (varName == D_COEFFICENT_H2) {
+      H_ASSERT(data.date == Core::undefinedIndex(), "date not allowed");
+      CH2 = data.getUnitval(U_UNDEFINED);
     } else {
       H_THROW("Unknown variable name while parsing " + getComponentName() +
               ": " + varName);
@@ -172,7 +175,7 @@ void OHComponent::run(const double runToDate) {
         ((1.0 * +current_nmvoc) -
          NMVOC_emissions.get(NMVOC_emissions.firstdate()).value(U_TG_NMVOC));
     const double e =
-          (-0.00044625) *
+         CH2 *
           ((1.0 * +current_h2) -
            H2_emissions.get(H2_emissions.firstdate()).value(U_TG_H2));