Move alpha and volscl from temperature componet to forcing componet. …

…Adjsut BC RF.

inst/include/component_data.hpp

@@ -65,6 +65,8 @@
 #define D_RHO_OC "rho_oc"            // BC radiative efficiency
 #define D_RHO_SO2 "rho_so2"          // SO2 radiative efficiency
 #define D_RHO_NH3 "rho_nh3"          // NH3 radiative efficiency
+#define D_AERO_SCALE "alpha"
+#define D_VOLCANIC_SCALE "volscl"
 
 // halocarbon components
 #define D_RF_CF4 D_RF_PREFIX CF4_COMPONENT_BASE
@@ -397,8 +399,6 @@
 #define D_GMST "gmst"
 #define D_LO_WARMING_RATIO "lo_warming_ratio"
 #define D_DIFFUSIVITY "diff"
-#define D_AERO_SCALE "alpha"
-#define D_VOLCANIC_SCALE "volscl"
 #define D_FLUX_MIXED "heatflux_mixed"
 #define D_FLUX_INTERIOR "heatflux_interior"
 #define D_HEAT_FLUX "heatflux"

inst/include/forcing_component.hpp

@@ -118,7 +118,10 @@ class ForcingComponent : public IModelComponent {
   unitval
       rho_nh3; // (W yr m–2 Tg–1) IPCC AR6 radiative efficiency SO2 7.SM.1.3.1
 
-  // Aerosol parameters for aerosol-cloud interactions (RFaci) see equation
+  // Aerosol parameters
+  unitval alpha;  // aerosol forcing factor, unitless
+  unitval volscl; // volcanic forcing scaling factor, unitless
+  // Parameters for aerosol-cloud interactions (RFaci) see equation
   // Equation 7.SM.1.2 of IPCC AR6
   double const aci_beta = 2.279759; //  Dorheim et al. 2024
   double const s_BCOC = 111.05064063; // (Tg C yr-1) IPCC AR6 7.SM.1.3.1

inst/include/temperature_component.hpp

@@ -145,8 +145,6 @@ class TemperatureComponent : public IModelComponent {
   // Model parameters
   unitval S;      //!< climate sensitivity for 2xCO2, deg C
   unitval diff;   //!< ocean heat diffusivity, cm2/s
-  unitval alpha;  //!< aerosol forcing factor, unitless
-  unitval volscl; //!< volcanic forcing scaling factor, unitless
 
   // Model outputs
   unitval tas;       //!< global average air temperature anomaly, deg C

inst/input/hector_ssp119.ini

@@ -162,6 +162,8 @@ baseyear=1750		; when to start reporting; by definition, all F=0 in this year
 
 ; Optional radiative forcing constraint
 ;RF_tot_constrain=csv:tables/CONSTRAINT.csv
+alpha=1.0		; (unitless) uncertainty scaling factor for volcanic forcing 
+volscl=1.0		; (unitless) uncertainty scaling factor for volcanic forcing
 delta_co2=0.05		; (unitless) forcing tropospheric adjustments for CO2 (7.3.2.1 of IPCC AR6)
 delta_ch4=-.14		; (unitless) forcing tropospheric adjustments for CH4 (7.3.2.2 of IPCC AR6)
 delta_n2o=0.07		; (unitless) forcing tropospheric adjustments for N2O (7.3.2.3 of IPCC AR6)
@@ -179,8 +181,6 @@ RF_misc[1750]=0
 [temperature]
 S=3.0 			; equilibrium climate sensitivity for 2xCO2 degC (A.4.4 of IPCC AR6)
 diff=2.38		; ocean heat diffusivity, cm2/s calibrated to historical observations Dorheim et al. 2024 for details
-alpha=1.0     	; uncertainty scaling factor for aerosol forcing
-volscl=1.0    	; uncertainty scaling factor for volcanic forcing
 qco2=3.75     	; 2×CO2 RF (7.3.2 of IPCC AR6)
 
 ; Optional global temperature constraint

inst/input/hector_ssp126.ini

@@ -162,6 +162,8 @@ baseyear=1750		; when to start reporting; by definition, all F=0 in this year
 
 ; Optional radiative forcing constraint
 ;RF_tot_constrain=csv:tables/CONSTRAINT.csv
+alpha=1.0     		; uncertainty scaling factor for aerosol forcing
+volscl=1.0    		; uncertainty scaling factor for volcanic forcing
 delta_co2=0.05		; (unitless) forcing tropospheric adjustments for CO2 (7.3.2.1 of IPCC AR6)
 delta_ch4=-.14		; (unitless) forcing tropospheric adjustments for CH4 (7.3.2.2 of IPCC AR6)
 delta_n2o=0.07		; (unitless) forcing tropospheric adjustments for N2O (7.3.2.3 of IPCC AR6)
@@ -179,8 +181,6 @@ RF_misc[1750]=0
 [temperature]
 S=3.0 			; equilibrium climate sensitivity for 2xCO2 degC (A.4.4 of IPCC AR6)
 diff=2.38		; ocean heat diffusivity, cm2/s calibrated to historical observations Dorheim et al. 2024 for details
-alpha=1.0     	; uncertainty scaling factor for aerosol forcing
-volscl=1.0    	; uncertainty scaling factor for volcanic forcing
 qco2=3.75     	; 2×CO2 RF (7.3.2 of IPCC AR6)
 
 ; Optional global temperature constraint

inst/input/hector_ssp245.ini

@@ -162,6 +162,8 @@ baseyear=1750		; when to start reporting; by definition, all F=0 in this year
 
 ; Optional radiative forcing constraint
 ;RF_tot_constrain=csv:tables/CONSTRAINT.csv
+alpha=1.0		; (unitless) uncertainty scaling factor for volcanic forcing 
+volscl=1.0		; (unitless) uncertainty scaling factor for volcanic forcing
 delta_co2=0.05		; (unitless) forcing tropospheric adjustments for CO2 (7.3.2.1 of IPCC AR6)
 delta_ch4=-.14		; (unitless) forcing tropospheric adjustments for CH4 (7.3.2.2 of IPCC AR6)
 delta_n2o=0.07		; (unitless) forcing tropospheric adjustments for N2O (7.3.2.3 of IPCC AR6)
@@ -179,8 +181,6 @@ RF_misc[1750]=0
 [temperature]
 S=3.0 			; equilibrium climate sensitivity for 2xCO2 degC (A.4.4 of IPCC AR6)
 diff=2.38		; ocean heat diffusivity, cm2/s calibrated to historical observations Dorheim et al. 2024 for details
-alpha=1.0     	; uncertainty scaling factor for aerosol forcing
-volscl=1.0    	; uncertainty scaling factor for volcanic forcing
 qco2=3.75     	; 2×CO2 RF (7.3.2 of IPCC AR6)
 
 ; Optional global temperature constraint

inst/input/hector_ssp370.ini

@@ -162,6 +162,8 @@ baseyear=1750		; when to start reporting; by definition, all F=0 in this year
 
 ; Optional radiative forcing constraint
 ;RF_tot_constrain=csv:tables/CONSTRAINT.csv
+alpha=1.0     		; uncertainty scaling factor for aerosol forcing
+volscl=1.0    		; uncertainty scaling factor for volcanic forcing
 delta_co2=0.05		; (unitless) forcing tropospheric adjustments for CO2 (7.3.2.1 of IPCC AR6)
 delta_ch4=-.14		; (unitless) forcing tropospheric adjustments for CH4 (7.3.2.2 of IPCC AR6)
 delta_n2o=0.07		; (unitless) forcing tropospheric adjustments for N2O (7.3.2.3 of IPCC AR6)
@@ -179,8 +181,6 @@ RF_misc[1750]=0
 [temperature]
 S=3.0 			; equilibrium climate sensitivity for 2xCO2 degC (A.4.4 of IPCC AR6)
 diff=2.38		; ocean heat diffusivity, cm2/s calibrated to historical observations Dorheim et al. 2024 for details
-alpha=1.0     	; uncertainty scaling factor for aerosol forcing
-volscl=1.0    	; uncertainty scaling factor for volcanic forcing
 qco2=3.75     	; 2×CO2 RF (7.3.2 of IPCC AR6)
 
 ; Optional global temperature constraint

inst/input/hector_ssp434.ini

@@ -162,6 +162,8 @@ baseyear=1750		; when to start reporting; by definition, all F=0 in this year
 
 ; Optional radiative forcing constraint
 ;RF_tot_constrain=csv:tables/CONSTRAINT.csv
+alpha=1.0     		; uncertainty scaling factor for aerosol forcing
+volscl=1.0    		; uncertainty scaling factor for volcanic forcing
 delta_co2=0.05		; (unitless) forcing tropospheric adjustments for CO2 (7.3.2.1 of IPCC AR6)
 delta_ch4=-.14		; (unitless) forcing tropospheric adjustments for CH4 (7.3.2.2 of IPCC AR6)
 delta_n2o=0.07		; (unitless) forcing tropospheric adjustments for N2O (7.3.2.3 of IPCC AR6)
@@ -179,8 +181,6 @@ RF_misc[1750]=0
 [temperature]
 S=3.0 			; equilibrium climate sensitivity for 2xCO2 degC (A.4.4 of IPCC AR6)
 diff=2.38		; ocean heat diffusivity, cm2/s calibrated to historical observations Dorheim et al. 2024 for details
-alpha=1.0     	; uncertainty scaling factor for aerosol forcing
-volscl=1.0    	; uncertainty scaling factor for volcanic forcing
 qco2=3.75     	; 2×CO2 RF (7.3.2 of IPCC AR6)
 
 ; Optional global temperature constraint

inst/input/hector_ssp460.ini

@@ -162,6 +162,8 @@ baseyear=1750		; when to start reporting; by definition, all F=0 in this year
 
 ; Optional radiative forcing constraint
 ;RF_tot_constrain=csv:tables/CONSTRAINT.csv
+alpha=1.0     		; uncertainty scaling factor for aerosol forcing
+volscl=1.0    		; uncertainty scaling factor for volcanic forcing
 delta_co2=0.05		; (unitless) forcing tropospheric adjustments for CO2 (7.3.2.1 of IPCC AR6)
 delta_ch4=-.14		; (unitless) forcing tropospheric adjustments for CH4 (7.3.2.2 of IPCC AR6)
 delta_n2o=0.07		; (unitless) forcing tropospheric adjustments for N2O (7.3.2.3 of IPCC AR6)
@@ -179,8 +181,6 @@ RF_misc[1750]=0
 [temperature]
 S=3.0 			; equilibrium climate sensitivity for 2xCO2 degC (A.4.4 of IPCC AR6)
 diff=2.38		; ocean heat diffusivity, cm2/s calibrated to historical observations Dorheim et al. 2024 for details
-alpha=1.0     	; uncertainty scaling factor for aerosol forcing
-volscl=1.0    	; uncertainty scaling factor for volcanic forcing
 qco2=3.75     	; 2×CO2 RF (7.3.2 of IPCC AR6)
 
 ; Optional global temperature constraint

inst/input/hector_ssp534-over.ini

@@ -162,6 +162,8 @@ baseyear=1750		; when to start reporting; by definition, all F=0 in this year
 
 ; Optional radiative forcing constraint
 ;RF_tot_constrain=csv:tables/CONSTRAINT.csv
+alpha=1.0     		; uncertainty scaling factor for aerosol forcing
+volscl=1.0    		; uncertainty scaling factor for volcanic forcing
 delta_co2=0.05		; (unitless) forcing tropospheric adjustments for CO2 (7.3.2.1 of IPCC AR6)
 delta_ch4=-.14		; (unitless) forcing tropospheric adjustments for CH4 (7.3.2.2 of IPCC AR6)
 delta_n2o=0.07		; (unitless) forcing tropospheric adjustments for N2O (7.3.2.3 of IPCC AR6)
@@ -179,8 +181,6 @@ RF_misc[1750]=0
 [temperature]
 S=3.0 			; equilibrium climate sensitivity for 2xCO2 degC (A.4.4 of IPCC AR6)
 diff=2.38		; ocean heat diffusivity, cm2/s calibrated to historical observations Dorheim et al. 2024 for details
-alpha=1.0     	; uncertainty scaling factor for aerosol forcing
-volscl=1.0    	; uncertainty scaling factor for volcanic forcing
 qco2=3.75     	; 2×CO2 RF (7.3.2 of IPCC AR6)
 
 ; Optional global temperature constraint

inst/input/hector_ssp585.ini

@@ -162,6 +162,8 @@ baseyear=1750		; when to start reporting; by definition, all F=0 in this year
 
 ; Optional radiative forcing constraint
 ;RF_tot_constrain=csv:tables/CONSTRAINT.csv
+alpha=1.0     		; uncertainty scaling factor for aerosol forcing
+volscl=1.0    		; uncertainty scaling factor for volcanic forcing
 delta_co2=0.05		; (unitless) forcing tropospheric adjustments for CO2 (7.3.2.1 of IPCC AR6)
 delta_ch4=-.14		; (unitless) forcing tropospheric adjustments for CH4 (7.3.2.2 of IPCC AR6)
 delta_n2o=0.07		; (unitless) forcing tropospheric adjustments for N2O (7.3.2.3 of IPCC AR6)
@@ -179,8 +181,6 @@ RF_misc[1750]=0
 [temperature]
 S=3.0 			; equilibrium climate sensitivity for 2xCO2 degC (A.4.4 of IPCC AR6)
 diff=2.38		; ocean heat diffusivity, cm2/s calibrated to historical observations Dorheim et al. 2024 for details
-alpha=1.0     	; uncertainty scaling factor for aerosol forcing
-volscl=1.0    	; uncertainty scaling factor for volcanic forcing
 qco2=3.75     	; 2×CO2 RF (7.3.2 of IPCC AR6)
 
 ; Optional global temperature constraint

project_files/Xcode/hector.xcodeproj/project.pbxproj

@@ -82,9 +82,9 @@
 		27B2C270261511C8005DE26D /* spline_forsythe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27B2C24D261511C8005DE26D /* spline_forsythe.cpp */; };
 		27B2C271261511C8005DE26D /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27B2C24E261511C8005DE26D /* main.cpp */; };
 		27F2613726B55617004BDD47 /* csv_tracking_visitor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27962904268F237200333AA3 /* csv_tracking_visitor.cpp */; };
-		354045FC2913D50A00CA297D /* test_dependency_finder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 273FC38F26A3570B00D5303E /* test_dependency_finder.cpp */; };
-		354045FB2913CF6600CA297D /* test_csv_file_reader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 273FC39126A3570B00D5303E /* test_csv_file_reader.cpp */; };
 		354045FA2913C0F300CA297D /* test_core.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 273FC38D26A3570B00D5303E /* test_core.cpp */; };
+		354045FB2913CF6600CA297D /* test_csv_file_reader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 273FC39126A3570B00D5303E /* test_csv_file_reader.cpp */; };
+		354045FC2913D50A00CA297D /* test_dependency_finder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 273FC38F26A3570B00D5303E /* test_dependency_finder.cpp */; };
 		35ACB833285E4F4E0025928F /* h_util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 275CBFF127AC7CC0009E2AF5 /* h_util.cpp */; };
 		954D62AE278E005500840656 /* nh3_component.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 954D62AD278E005500840656 /* nh3_component.cpp */; };
 		954D62AF278E005500840656 /* nh3_component.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 954D62AD278E005500840656 /* nh3_component.cpp */; };
@@ -607,7 +607,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = "${BOOSTROOT}";
+				HEADER_SEARCH_PATHS = "${BOOSTINC}";
 				"HEADER_SEARCH_PATHS[arch=*]" = "${BOOSTROOT}";
 				LIBRARY_SEARCH_PATHS = "${BOOSTLIB}";
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
@@ -664,7 +664,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = "${BOOSTROOT}";
+				HEADER_SEARCH_PATHS = "${BOOSTINC}";
 				LIBRARY_SEARCH_PATHS = "${BOOSTLIB}";
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = NO;
@@ -681,6 +681,7 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
+				HEADER_SEARCH_PATHS = "${BOOSTINC}";
 				LIBRARY_SEARCH_PATHS = "${BOOSTLIB}";
 				"OTHER_LDFLAGS[arch=*]" = "$(inherited)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -692,6 +693,7 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
+				HEADER_SEARCH_PATHS = "${BOOSTINC}";
 				LIBRARY_SEARCH_PATHS = "${BOOSTLIB}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};

project_files/Xcode/hector.xcodeproj/xcshareddata/xcschemes/ssp245.xcscheme

@@ -53,7 +53,7 @@
       </BuildableProductRunnable>
       <CommandLineArguments>
          <CommandLineArgument
-            argument = "./inst/input/hector_ssp245.ini"
+            argument = "/Users/dorh012/Documents/Hector-WD/hector/inst/input/hector_ssp245.ini"
             isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>

src/forcing_component.cpp

@@ -132,6 +132,9 @@ void ForcingComponent::init(Core *coreptr) {
   core->registerCapability(D_RHO_SO2, getComponentName());
   core->registerCapability(D_RF_SO2, getComponentName());
   core->registerCapability(D_RF_ACI, getComponentName());
+  core->registerCapability(D_AERO_SCALE, getComponentName());
+  core->registerCapability(D_VOLCANIC_SCALE, getComponentName());
+
   for (int i = 0; i < N_HALO_FORCINGS; ++i) {
     core->registerCapability(adjusted_halo_forcings[i], getComponentName());
     forcing_name_map[adjusted_halo_forcings[i]] = halo_forcing_names[i];
@@ -183,6 +186,9 @@ void ForcingComponent::init(Core *coreptr) {
   core->registerInput(D_RHO_NH3, getComponentName());
   core->registerInput(D_RF_MISC, getComponentName());
   core->registerInput(D_FTOT_CONSTRAIN, getComponentName());
+  core->registerInput(D_AERO_SCALE, getComponentName());
+  core->registerInput(D_VOLCANIC_SCALE, getComponentName());
+
 }
 
 //------------------------------------------------------------------------------
@@ -237,6 +243,12 @@ void ForcingComponent::setData(const string &varName,
     } else if (varName == D_RHO_SO2) {
       H_ASSERT(data.date == Core::undefinedIndex(), "date not allowed");
       rho_so2 = data.getUnitval(U_W_M2_GG);
+    } else if (varName == D_AERO_SCALE) {
+      H_ASSERT(data.date == Core::undefinedIndex(), "date not allowed");
+      alpha = data.getUnitval(U_UNITLESS);
+    } else if (varName == D_VOLCANIC_SCALE) {
+      H_ASSERT(data.date == Core::undefinedIndex(), "date not allowed");
+      volscl = data.getUnitval(U_UNITLESS);
     } else if (varName == D_FTOT_CONSTRAIN) {
       H_ASSERT(data.date != Core::undefinedIndex(), "date required");
       Ftot_constrain.set(data.date, data.getUnitval(U_W_M2));
@@ -422,7 +434,9 @@ void ForcingComponent::run(const double runToDate) {
       double E_BC =
           core->sendMessage(M_GETDATA, D_EMISSIONS_BC, message_data(runToDate))
               .value(U_TG);
-      double fbc = rho_bc * E_BC;
+      // The 0.2 value comes from equally distributing the alpha scalar to all 5
+      // aerosol RF types.
+      double fbc = 0.2 * alpha.value(U_UNITLESS) * rho_bc * E_BC;
       forcings[D_RF_BC].set(fbc, U_W_M2);
 
       // ---------- Organic carbon ----------
@@ -540,6 +554,10 @@ unitval ForcingComponent::getData(const std::string &varName,
     returnval = rho_so2;
   } else if (varName == D_RHO_NH3) {
     returnval = rho_nh3;
+  } else if (varName == D_AERO_SCALE) {
+    returnval = alpha;
+  } else if (varName == D_VOLCANIC_SCALE) {
+    returnval = volscl;
   } else if (varName == D_RF_BASEYEAR) {
     returnval.set(baseyear, U_UNITLESS);
   } else {

src/temperature_component.cpp

@@ -137,8 +137,6 @@ void TemperatureComponent::init(Core *coreptr) {
   core->registerInput(D_ECS, getComponentName());
   core->registerInput(D_QCO2, getComponentName());
   core->registerInput(D_DIFFUSIVITY, getComponentName());
-  core->registerInput(D_AERO_SCALE, getComponentName());
-  core->registerInput(D_VOLCANIC_SCALE, getComponentName());
   core->registerInput(D_LO_WARMING_RATIO, getComponentName());
   core->registerInput(D_TAS_CONSTRAIN, getComponentName());
 }
@@ -177,12 +175,6 @@ void TemperatureComponent::setData(const string &varName,
     } else if (varName == D_DIFFUSIVITY) {
       H_ASSERT(data.date == Core::undefinedIndex(), "date not allowed");
       diff = data.getUnitval(U_CM2_S);
-    } else if (varName == D_AERO_SCALE) {
-      H_ASSERT(data.date == Core::undefinedIndex(), "date not allowed");
-      alpha = data.getUnitval(U_UNITLESS);
-    } else if (varName == D_VOLCANIC_SCALE) {
-      H_ASSERT(data.date == Core::undefinedIndex(), "date not allowed");
-      volscl = data.getUnitval(U_UNITLESS);
     } else if (varName == D_QCO2) {
       H_ASSERT(data.date == Core::undefinedIndex(), "date not allowed");
       qco2 = data.getUnitval(U_UNITLESS).value(U_UNITLESS);
@@ -471,8 +463,8 @@ void TemperatureComponent::run(const double runToDate) {
   const double ftot = core->sendMessage(M_GETDATA, D_RF_TOTAL, message_data(runToDate)).value(U_W_M2);
   forcing[tstep] =
       double(ftot) -
-      (1.0 - alpha) * aero_forcing - (1.0 - volscl) * volcanic_forcing;
-  
+      (1.0) * aero_forcing - (1.0) * volcanic_forcing;
+
   // Initialize variables for time-stepping through the model
   double DQ1 = 0.0;
   double DQ2 = 0.0;
@@ -695,17 +687,9 @@ unitval TemperatureComponent::getData(const std::string &varName,
     H_ASSERT(date == Core::undefinedIndex(),
              "Date not allowed for diffusivity");
     returnval = diff;
-  } else if (varName == D_AERO_SCALE) {
-    H_ASSERT(date == Core::undefinedIndex(),
-             "Date not allowed for aero scaler");
-    returnval = alpha;
   } else if (varName == D_ECS) {
     H_ASSERT(date == Core::undefinedIndex(), "Date not allowed for ECS");
     returnval = S;
-  } else if (varName == D_VOLCANIC_SCALE) {
-    H_ASSERT(date == Core::undefinedIndex(),
-             "Date not allowed for volcanic scaler");
-    returnval = volscl;
   } else if (varName == D_QCO2) {
     H_ASSERT(date == Core::undefinedIndex(), "Date not allowed for q2co2");
     returnval = unitval(qco2, U_W_M2);

tests/testthat/input/luc_pulse.ini

@@ -143,6 +143,8 @@ baseyear=1750		; when to start reporting; by definition, all F=0 in this year
 ; Optional radiative forcing constraint
 ; If supplied, the model will use these data, ignoring what it calculates
 ;RF_tot_constrain=csv:tables/CONSTRAINT.csv
+alpha=1.0     		; uncertainty scaling factor for aerosol forcing
+volscl=1.0    		; uncertainty scaling factor for volcanic forcing
 delta_co2=0.05		; (unitless) forcing tropospheric adjustments for CO2 (7.3.2.1 of IPCC AR6)
 delta_ch4=-.14		; (unitless) forcing tropospheric adjustments for CH4 (7.3.2.2 of IPCC AR6)
 delta_n2o=0.07		; (unitless) forcing tropospheric adjustments for N2O (7.3.2.3 of IPCC AR6)
@@ -164,8 +166,6 @@ enabled=1
 
 S=2.7 			; equilibrium climate sensitivity for 2xCO2, degC (calibrated to historical)
 diff=2.4		; ocean heat diffusivity, cm2/s (calibrated to historical)
-alpha=0.5     		; scaling factor for aerosol forcing, calibrated to historical observations
-volscl=1.0    		; scaling factor for volcanic forcing
 qco2=3.75     		; 2×CO2 RF (7.3.2 of IPCC AR6)
 
 ; Optional global temperature constraint