Skip to content

Commit

Permalink
updated names to aero_scalar and vol_scalar
Browse files Browse the repository at this point in the history
  • Loading branch information
@ptrscll
ptrscll committed Jul 12, 2024
1 parent 7c95eb9 commit 2aff388
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions data-raw/input_params.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ forcing,rho_so2,n,n,y,-7.24E-06,W yr m-2 S Gg-1,IPCC AR6 radiative efficiency SO
forcing,rho_nh3,n,n,y,-0.00208,W yr m-2 NH3 Tg-1,IPCC AR6 radiative efficiency NH3 (7.SM.1.3.1 of IPCC AR6)
forcing,RF_misc,n,n,n,"""(csv)""",,Miscellaneous radiative forcings default set to 0
forcing,RF_misc,n,n,y,0,,"Miscellaneous radiative forcings default set to 0, or read in from a input table, may be used to read in additional forcings not modeled by Hector (i.e. solar, bc on snow , contrails from)"
forcing,aero_scalar,n,n,y,1,(unitless),scaling factor for aerosol forcing
forcing,vol_scalar,n,n,y,1,(unitless),scaling factor for volcanic forcing
temperature,S,n,n,y,3,degC,equilibrium climate sensitivity for 2xCO2
temperature,diff,n,n,y,2.3,cm2 s-1,ocean heat diffusivity
temperature,alpha,n,n,y,1,(unitless),scaling factor for aerosol forcing
temperature,volscl,n,n,y,1,(unitless),scaling factor for volcanic forcing
temperature,qco2,n,n,y,3.75,,CO2 RF (7.3.2 of IPCC AR6)
temperature,tas_constrain,n,y,n,"""(csv)""",,"Optional global temperature constraint; If supplied, the model will use these data, ignoring what it calculates"
bc,BC_emissions,n,y,y,"""(csv)""",,
Expand Down
Binary file modified data/unitstable.rda
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions inst/include/component_data.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +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"
#define D_AERO_SCALE "aero_scalar"
#define D_VOLCANIC_SCALE "vol_scalar"

// halocarbon components
#define D_RF_CF4 D_RF_PREFIX CF4_COMPONENT_BASE
Expand Down
4 changes: 2 additions & 2 deletions inst/input/hector_ssp119.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +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
aero_scalar=1.0 ; (unitless) uncertainty scaling factor for volcanic forcing
vol_scalar=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)
Expand Down
4 changes: 2 additions & 2 deletions inst/input/hector_ssp126.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +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
aero_scalar=1.0 ; uncertainty scaling factor for aerosol forcing
vol_scalar=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)
Expand Down
4 changes: 2 additions & 2 deletions inst/input/hector_ssp245.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +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
aero_scalar=1.0 ; (unitless) uncertainty scaling factor for volcanic forcing
vol_scalar=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)
Expand Down
4 changes: 2 additions & 2 deletions inst/input/hector_ssp370.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +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
aero_scalar=1.0 ; uncertainty scaling factor for aerosol forcing
vol_scalar=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)
Expand Down
4 changes: 2 additions & 2 deletions inst/input/hector_ssp434.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +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
aero_scalar=1.0 ; uncertainty scaling factor for aerosol forcing
vol_scalar=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)
Expand Down
4 changes: 2 additions & 2 deletions inst/input/hector_ssp460.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +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
aero_scalar=1.0 ; uncertainty scaling factor for aerosol forcing
vol_scalar=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)
Expand Down
4 changes: 2 additions & 2 deletions inst/input/hector_ssp534-over.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +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
aero_scalar=1.0 ; uncertainty scaling factor for aerosol forcing
vol_scalar=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)
Expand Down
4 changes: 2 additions & 2 deletions inst/input/hector_ssp585.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +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
aero_scalar=1.0 ; uncertainty scaling factor for aerosol forcing
vol_scalar=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)
Expand Down

0 comments on commit 2aff388

Please sign in to comment.