Reorganize getdata section of temperature_component.cpp (#595)

* restructure the temp getdata section * Simplify qco2 & define units
JGCRI · Mar 30, 2022 · b0baa15 · b0baa15 · github-actions · Mar 30, 2022
1 parent 15b6318
commit b0baa15
Show file tree

Hide file tree

Showing 5 changed files with 165 additions and 157 deletions.
diff --git a/R/sysdata.rda b/R/sysdata.rda
diff --git a/data-raw/units-data.R b/data-raw/units-data.R
@@ -12,7 +12,7 @@ hvars <- c(
   EMISSIONS_CH4(), PREINDUSTRIAL_CH4(), NATURAL_CH4(), LIFETIME_SOIL(), LIFETIME_STRAT(),
   EMISSIONS_SO2(), VOLCANIC_SO2(), CO2_CONSTRAIN(), TGAV_CONSTRAIN(),
   CH4_CONSTRAIN(), N2O_CONSTRAIN(), NBP_CONSTRAIN(),
-  TRACKING_DATE(), RHO_BC(), LO_WARMING_RATIO()
+  TRACKING_DATE(), RHO_BC(), LO_WARMING_RATIO(), Q_CO2()
 )
 
 
@@ -24,7 +24,7 @@ hunits <- c(
   "Tg CH4", "ppbv CH4", "Tg CH4", "Years", "Years",
   "Gg S", "W/m2", "ppmv CO2", "degC",
   "ppbv CH4", "ppbv N2O", "Pg C/yr",
-  "(unitless)", "W/m2/Tg", "(unitless)"
+  "(unitless)", "W/m2/Tg", "(unitless)", "W/m2"
 )
 
 

diff --git a/inst/include/temperature_component.hpp b/inst/include/temperature_component.hpp
@@ -103,7 +103,7 @@ class TemperatureComponent : public IModelComponent {
     double taudif;           // interior ocean heat uptake time scale, yr
     double tauksl;           // sea-land heat exchange time scale, yr
     double taukls;           // land-sea heat exchange time scale, yr
-    unitval q2co2;           // radiative forcing for atmospheric CO2 doubling (W/m2)
+    double qco2;             // radiative forcing for atmospheric CO2 doubling
 
     std::vector<double> KT0;
     std::vector<double> KTA1;

diff --git a/man/hector-package.Rd b/man/hector-package.Rd