diff --git a/src/new_marginaldamages.jl b/src/new_marginaldamages.jl index a0042b8f..a9f0ff25 100644 --- a/src/new_marginaldamages.jl +++ b/src/new_marginaldamages.jl @@ -304,6 +304,33 @@ end end end +function _gas_normalization(gas::Symbol) + if gas == :CO2 + return 12/44 # convert from tons CO2 to tons C + elseif gas == :CH4 + return 1 + elseif gas == :N2O + return 28/44 # convert from tons N2O to tons N + elseif gas == :SF6 + return 1 + else + error("Unknown gas :$gas.") + end +end + +function _weight_normalization(gas::Symbol) + if gas == :CO2 + return 1e6 # convert from tonnes to Mt since component expects Mt + elseif gas == :CH4 + return 1e6 # convert from tonnes to Mt since component expects Mt + elseif gas == :N2O + return 1e6 # convert from tonnes to Mt since component expects Mt + elseif gas == :SF6 + return 1e3 # convert from tonnes to kt since component expects Mt + else + error("Unknown gas :$gas.") + end +end """ Adds an emissionspulse component to `m`, and sets the additional emissions if a year is specified. The size of the marginal emission pulse can be modified with the `pulse_size` keyword argument, in metric @@ -317,11 +344,10 @@ function add_marginal_emissions!(m, year::Union{Int, Nothing} = nothing; gas::Sy nyears = length(Mimi.time_labels(m)) addem = zeros(nyears) if year != nothing - # pulse is spread over ten years, and emissions components is in Mt so - # divide by 1e7, and convert from CO2 to C if gas==:CO2 because emissions - # component is in MtC; also use 12/44 to convert from GtCO2 to GtC for CO2 since the - # emissions component expects GtC not GtCO2 but pulse is in CO2 - addem[getindexfromyear(year):getindexfromyear(year) + 9] .= pulse_size / 1e7 * (gas == :CO2 ? 12/44 : 1) + # need to (1) divide by pulse spread over 10 years and weight adjustment + # from tons to expected units and then (2) normalize from entered gas + # units ie. CO2 to expected units ie. C + addem[getindexfromyear(year):getindexfromyear(year) + 9] .= pulse_size / (10 * _weight_normalization(gas)) * _gas_normalization(gas) end set_param!(m, :emissionspulse, :add, addem) @@ -354,7 +380,10 @@ function perturb_marginal_emissions!(m::Model, year; comp_name::Symbol = :emissi nyears = length(Mimi.dimension(m, :time)) new_em = zeros(nyears) - new_em[getindexfromyear(year):getindexfromyear(year) + 9] .= pulse_size / 1e7 * (gas == :CO2 ? 12/44 : 1) + # need to (1) divide by pulse spread over 10 years and weight adjustment + # from tons to expected units and then (2) normalize from entered gas + # units ie. CO2 to expected units ie. C + new_em[getindexfromyear(year):getindexfromyear(year) + 9] .= pulse_size / (10 * _weight_normalization(gas)) * _gas_normalization(gas) emissions[:] = new_em end diff --git a/test/SC validation data/deterministic_sc_values.csv b/test/SC validation data/deterministic_sc_values_v3-11-7.csv similarity index 100% rename from test/SC validation data/deterministic_sc_values.csv rename to test/SC validation data/deterministic_sc_values_v3-11-7.csv diff --git a/test/SC validation data/deterministic_sc_values_v3-13-0.csv b/test/SC validation data/deterministic_sc_values_v3-13-0.csv new file mode 100644 index 00000000..483d26e7 --- /dev/null +++ b/test/SC validation data/deterministic_sc_values_v3-13-0.csv @@ -0,0 +1,769 @@ +"gas","year","eta","prtp","equity_weights","equity_weights_normalization_region","last_year","pulse_size","SC" +CO2,2020,0.0,0.015,true,0,2300,1.0,31.977115371150834 +CO2,2020,0.0,0.015,true,0,2300,1.0e7,31.87279824572674 +CO2,2020,0.0,0.015,true,0,3000,1.0,32.73806105043272 +CO2,2020,0.0,0.015,true,0,3000,1.0e7,32.645166711417744 +CO2,2020,0.0,0.015,true,1,2300,1.0,31.977115371150834 +CO2,2020,0.0,0.015,true,1,2300,1.0e7,31.87279824572674 +CO2,2020,0.0,0.015,true,1,3000,1.0,32.73806105043272 +CO2,2020,0.0,0.015,true,1,3000,1.0e7,32.645166711417744 +CO2,2020,0.0,0.015,true,10,2300,1.0,31.977115371150834 +CO2,2020,0.0,0.015,true,10,2300,1.0e7,31.87279824572674 +CO2,2020,0.0,0.015,true,10,3000,1.0,32.73806105043272 +CO2,2020,0.0,0.015,true,10,3000,1.0e7,32.645166711417744 +CO2,2020,0.0,0.015,false,0,2300,1.0,31.977115371150823 +CO2,2020,0.0,0.015,false,0,2300,1.0e7,31.872798245726727 +CO2,2020,0.0,0.015,false,0,3000,1.0,32.738061050432705 +CO2,2020,0.0,0.015,false,0,3000,1.0e7,32.64516671141774 +CO2,2020,0.0,0.015,false,1,2300,1.0,31.977115371150823 +CO2,2020,0.0,0.015,false,1,2300,1.0e7,31.872798245726727 +CO2,2020,0.0,0.015,false,1,3000,1.0,32.738061050432705 +CO2,2020,0.0,0.015,false,1,3000,1.0e7,32.64516671141774 +CO2,2020,0.0,0.015,false,10,2300,1.0,31.977115371150823 +CO2,2020,0.0,0.015,false,10,2300,1.0e7,31.872798245726727 +CO2,2020,0.0,0.015,false,10,3000,1.0,32.738061050432705 +CO2,2020,0.0,0.015,false,10,3000,1.0e7,32.64516671141774 +CO2,2020,0.0,0.03,true,0,2300,1.0,6.5471969706938165 +CO2,2020,0.0,0.03,true,0,2300,1.0e7,6.516996290999963 +CO2,2020,0.0,0.03,true,0,3000,1.0,6.553454242907224 +CO2,2020,0.0,0.03,true,0,3000,1.0e7,6.523349894146554 +CO2,2020,0.0,0.03,true,1,2300,1.0,6.5471969706938165 +CO2,2020,0.0,0.03,true,1,2300,1.0e7,6.516996290999963 +CO2,2020,0.0,0.03,true,1,3000,1.0,6.553454242907224 +CO2,2020,0.0,0.03,true,1,3000,1.0e7,6.523349894146554 +CO2,2020,0.0,0.03,true,10,2300,1.0,6.5471969706938165 +CO2,2020,0.0,0.03,true,10,2300,1.0e7,6.516996290999963 +CO2,2020,0.0,0.03,true,10,3000,1.0,6.553454242907224 +CO2,2020,0.0,0.03,true,10,3000,1.0e7,6.523349894146554 +CO2,2020,0.0,0.03,false,0,2300,1.0,6.547196970693816 +CO2,2020,0.0,0.03,false,0,2300,1.0e7,6.516996290999962 +CO2,2020,0.0,0.03,false,0,3000,1.0,6.553454242907222 +CO2,2020,0.0,0.03,false,0,3000,1.0e7,6.523349894146554 +CO2,2020,0.0,0.03,false,1,2300,1.0,6.547196970693816 +CO2,2020,0.0,0.03,false,1,2300,1.0e7,6.516996290999962 +CO2,2020,0.0,0.03,false,1,3000,1.0,6.553454242907222 +CO2,2020,0.0,0.03,false,1,3000,1.0e7,6.523349894146554 +CO2,2020,0.0,0.03,false,10,2300,1.0,6.547196970693816 +CO2,2020,0.0,0.03,false,10,2300,1.0e7,6.516996290999962 +CO2,2020,0.0,0.03,false,10,3000,1.0,6.553454242907222 +CO2,2020,0.0,0.03,false,10,3000,1.0e7,6.523349894146554 +CO2,2020,1.45,0.015,true,0,2300,1.0,7.1939094037345015 +CO2,2020,1.45,0.015,true,0,2300,1.0e7,7.154369469532084 +CO2,2020,1.45,0.015,true,0,3000,1.0,7.206277975731035 +CO2,2020,1.45,0.015,true,0,3000,1.0e7,7.166845552280377 +CO2,2020,1.45,0.015,true,1,2300,1.0,104.76415006269792 +CO2,2020,1.45,0.015,true,1,2300,1.0e7,104.18833413734015 +CO2,2020,1.45,0.015,true,1,3000,1.0,104.94427228275718 +CO2,2020,1.45,0.015,true,1,3000,1.0e7,104.37002202523024 +CO2,2020,1.45,0.015,true,10,2300,1.0,5.975854933412805 +CO2,2020,1.45,0.015,true,10,2300,1.0e7,5.943009800452461 +CO2,2020,1.45,0.015,true,10,3000,1.0,5.986129290210568 +CO2,2020,1.45,0.015,true,10,3000,1.0e7,5.953373464554535 +CO2,2020,1.45,0.015,false,0,2300,1.0,2.0631319948125304 +CO2,2020,1.45,0.015,false,0,2300,1.0e7,2.049311145392672 +CO2,2020,1.45,0.015,false,0,3000,1.0,2.0696016510134454 +CO2,2020,1.45,0.015,false,0,3000,1.0e7,2.0559269794422477 +CO2,2020,1.45,0.015,false,1,2300,1.0,2.0631319948125304 +CO2,2020,1.45,0.015,false,1,2300,1.0e7,2.049311145392672 +CO2,2020,1.45,0.015,false,1,3000,1.0,2.0696016510134454 +CO2,2020,1.45,0.015,false,1,3000,1.0e7,2.0559269794422477 +CO2,2020,1.45,0.015,false,10,2300,1.0,2.0631319948125304 +CO2,2020,1.45,0.015,false,10,2300,1.0e7,2.049311145392672 +CO2,2020,1.45,0.015,false,10,3000,1.0,2.0696016510134454 +CO2,2020,1.45,0.015,false,10,3000,1.0e7,2.0559269794422477 +CO2,2020,1.45,0.03,true,0,2300,1.0,0.39381038039250726 +CO2,2020,1.45,0.03,true,0,2300,1.0e7,0.3778281157241292 +CO2,2020,1.45,0.03,true,0,3000,1.0,0.3939377455454892 +CO2,2020,1.45,0.03,true,0,3000,1.0e7,0.3779563443383117 +CO2,2020,1.45,0.03,true,1,2300,1.0,5.735019371563274 +CO2,2020,1.45,0.03,true,1,2300,1.0e7,5.502271323166919 +CO2,2020,1.45,0.03,true,1,3000,1.0,5.736874176962001 +CO2,2020,1.45,0.03,true,1,3000,1.0e7,5.504138703060757 +CO2,2020,1.45,0.03,true,10,2300,1.0,0.32713140691986686 +CO2,2020,1.45,0.03,true,10,2300,1.0e7,0.31385521871599 +CO2,2020,1.45,0.03,true,10,3000,1.0,0.32723720692860814 +CO2,2020,1.45,0.03,true,10,3000,1.0e7,0.31396173598687355 +CO2,2020,1.45,0.03,false,0,2300,1.0,0.1736060448312968 +CO2,2020,1.45,0.03,false,0,2300,1.0e7,0.16942515468704958 +CO2,2020,1.45,0.03,false,0,3000,1.0,0.17367416104519554 +CO2,2020,1.45,0.03,false,0,3000,1.0e7,0.1694945449948637 +CO2,2020,1.45,0.03,false,1,2300,1.0,0.1736060448312968 +CO2,2020,1.45,0.03,false,1,2300,1.0e7,0.16942515468704958 +CO2,2020,1.45,0.03,false,1,3000,1.0,0.17367416104519554 +CO2,2020,1.45,0.03,false,1,3000,1.0e7,0.1694945449948637 +CO2,2020,1.45,0.03,false,10,2300,1.0,0.1736060448312968 +CO2,2020,1.45,0.03,false,10,2300,1.0e7,0.16942515468704958 +CO2,2020,1.45,0.03,false,10,3000,1.0,0.17367416104519554 +CO2,2020,1.45,0.03,false,10,3000,1.0e7,0.1694945449948637 +CO2,2055,0.0,0.015,true,0,2300,1.0,41.19609147921041 +CO2,2055,0.0,0.015,true,0,2300,1.0e7,40.73086990884208 +CO2,2055,0.0,0.015,true,0,3000,1.0,42.99842473563357 +CO2,2055,0.0,0.015,true,0,3000,1.0e7,42.5376734277431 +CO2,2055,0.0,0.015,true,1,2300,1.0,41.19609147921041 +CO2,2055,0.0,0.015,true,1,2300,1.0e7,40.73086990884208 +CO2,2055,0.0,0.015,true,1,3000,1.0,42.99842473563357 +CO2,2055,0.0,0.015,true,1,3000,1.0e7,42.5376734277431 +CO2,2055,0.0,0.015,true,10,2300,1.0,41.19609147921041 +CO2,2055,0.0,0.015,true,10,2300,1.0e7,40.73086990884208 +CO2,2055,0.0,0.015,true,10,3000,1.0,42.99842473563357 +CO2,2055,0.0,0.015,true,10,3000,1.0e7,42.5376734277431 +CO2,2055,0.0,0.015,false,0,2300,1.0,41.196091479210395 +CO2,2055,0.0,0.015,false,0,2300,1.0e7,40.73086990884206 +CO2,2055,0.0,0.015,false,0,3000,1.0,42.99842473563355 +CO2,2055,0.0,0.015,false,0,3000,1.0e7,42.537673427743094 +CO2,2055,0.0,0.015,false,1,2300,1.0,41.196091479210395 +CO2,2055,0.0,0.015,false,1,2300,1.0e7,40.73086990884206 +CO2,2055,0.0,0.015,false,1,3000,1.0,42.99842473563355 +CO2,2055,0.0,0.015,false,1,3000,1.0e7,42.537673427743094 +CO2,2055,0.0,0.015,false,10,2300,1.0,41.196091479210395 +CO2,2055,0.0,0.015,false,10,2300,1.0e7,40.73086990884206 +CO2,2055,0.0,0.015,false,10,3000,1.0,42.99842473563355 +CO2,2055,0.0,0.015,false,10,3000,1.0e7,42.537673427743094 +CO2,2055,0.0,0.03,true,0,2300,1.0,11.611324132567312 +CO2,2055,0.0,0.03,true,0,2300,1.0e7,11.502751123685389 +CO2,2055,0.0,0.03,true,0,3000,1.0,11.63552060878118 +CO2,2055,0.0,0.03,true,0,3000,1.0e7,11.527005485934218 +CO2,2055,0.0,0.03,true,1,2300,1.0,11.611324132567312 +CO2,2055,0.0,0.03,true,1,2300,1.0e7,11.502751123685389 +CO2,2055,0.0,0.03,true,1,3000,1.0,11.63552060878118 +CO2,2055,0.0,0.03,true,1,3000,1.0e7,11.527005485934218 +CO2,2055,0.0,0.03,true,10,2300,1.0,11.611324132567312 +CO2,2055,0.0,0.03,true,10,2300,1.0e7,11.502751123685389 +CO2,2055,0.0,0.03,true,10,3000,1.0,11.63552060878118 +CO2,2055,0.0,0.03,true,10,3000,1.0e7,11.527005485934218 +CO2,2055,0.0,0.03,false,0,2300,1.0,11.611324132567312 +CO2,2055,0.0,0.03,false,0,2300,1.0e7,11.502751123685387 +CO2,2055,0.0,0.03,false,0,3000,1.0,11.63552060878118 +CO2,2055,0.0,0.03,false,0,3000,1.0e7,11.527005485934218 +CO2,2055,0.0,0.03,false,1,2300,1.0,11.611324132567312 +CO2,2055,0.0,0.03,false,1,2300,1.0e7,11.502751123685387 +CO2,2055,0.0,0.03,false,1,3000,1.0,11.63552060878118 +CO2,2055,0.0,0.03,false,1,3000,1.0e7,11.527005485934218 +CO2,2055,0.0,0.03,false,10,2300,1.0,11.611324132567312 +CO2,2055,0.0,0.03,false,10,2300,1.0e7,11.502751123685387 +CO2,2055,0.0,0.03,false,10,3000,1.0,11.63552060878118 +CO2,2055,0.0,0.03,false,10,3000,1.0e7,11.527005485934218 +CO2,2055,1.45,0.015,true,0,2300,1.0,15.719757848754123 +CO2,2055,1.45,0.015,true,0,2300,1.0e7,15.589704817273214 +CO2,2055,1.45,0.015,true,0,3000,1.0,15.785520635373569 +CO2,2055,1.45,0.015,true,0,3000,1.0e7,15.655252525226055 +CO2,2055,1.45,0.015,true,1,2300,1.0,229.01624131225222 +CO2,2055,1.45,0.015,true,1,2300,1.0e7,227.121539324627 +CO2,2055,1.45,0.015,true,1,3000,1.0,229.97431880649287 +CO2,2055,1.45,0.015,true,1,3000,1.0e7,228.0764834049636 +CO2,2055,1.45,0.015,true,10,2300,1.0,21.677477904168384 +CO2,2055,1.45,0.015,true,10,2300,1.0e7,21.498135337735604 +CO2,2055,1.45,0.015,true,10,3000,1.0,21.76816450173404 +CO2,2055,1.45,0.015,true,10,3000,1.0e7,21.588525342752707 +CO2,2055,1.45,0.015,false,0,2300,1.0,6.394920184656659 +CO2,2055,1.45,0.015,false,0,2300,1.0e7,6.326638138975531 +CO2,2055,1.45,0.015,false,0,3000,1.0,6.430346967405513 +CO2,2055,1.45,0.015,false,0,3000,1.0e7,6.362286102556323 +CO2,2055,1.45,0.015,false,1,2300,1.0,6.394920184656659 +CO2,2055,1.45,0.015,false,1,2300,1.0e7,6.326638138975531 +CO2,2055,1.45,0.015,false,1,3000,1.0,6.430346967405513 +CO2,2055,1.45,0.015,false,1,3000,1.0e7,6.362286102556323 +CO2,2055,1.45,0.015,false,10,2300,1.0,6.394920184656659 +CO2,2055,1.45,0.015,false,10,2300,1.0e7,6.326638138975531 +CO2,2055,1.45,0.015,false,10,3000,1.0,6.430346967405513 +CO2,2055,1.45,0.015,false,10,3000,1.0e7,6.362286102556323 +CO2,2055,1.45,0.03,true,0,2300,1.0,5.461056766687186 +CO2,2055,1.45,0.03,true,0,2300,1.0e7,5.415460420839991 +CO2,2055,1.45,0.03,true,0,3000,1.0,5.462151286124917 +CO2,2055,1.45,0.03,true,0,3000,1.0e7,5.416552031378789 +CO2,2055,1.45,0.03,true,1,2300,1.0,79.56043002269674 +CO2,2055,1.45,0.03,true,1,2300,1.0e7,78.89615110415568 +CO2,2055,1.45,0.03,true,1,3000,1.0,79.57637573446178 +CO2,2055,1.45,0.03,true,1,3000,1.0e7,78.91205443708087 +CO2,2055,1.45,0.03,true,10,2300,1.0,7.530773599203574 +CO2,2055,1.45,0.03,true,10,2300,1.0e7,7.467896436010393 +CO2,2055,1.45,0.03,true,10,3000,1.0,7.532282936761784 +CO2,2055,1.45,0.03,true,10,3000,1.0e7,7.469401762209589 +CO2,2055,1.45,0.03,false,0,2300,1.0,2.191604542475271 +CO2,2055,1.45,0.03,false,0,2300,1.0e7,2.1686225130053662 +CO2,2055,1.45,0.03,false,0,3000,1.0,2.1922164940152578 +CO2,2055,1.45,0.03,false,0,3000,1.0e7,2.169237260683315 +CO2,2055,1.45,0.03,false,1,2300,1.0,2.191604542475271 +CO2,2055,1.45,0.03,false,1,2300,1.0e7,2.1686225130053662 +CO2,2055,1.45,0.03,false,1,3000,1.0,2.1922164940152578 +CO2,2055,1.45,0.03,false,1,3000,1.0e7,2.169237260683315 +CO2,2055,1.45,0.03,false,10,2300,1.0,2.191604542475271 +CO2,2055,1.45,0.03,false,10,2300,1.0e7,2.1686225130053662 +CO2,2055,1.45,0.03,false,10,3000,1.0,2.1922164940152578 +CO2,2055,1.45,0.03,false,10,3000,1.0e7,2.169237260683315 +CH4,2020,0.0,0.015,true,0,2300,1.0,928.9982968699569 +CH4,2020,0.0,0.015,true,0,2300,1.0e7,928.8100389416524 +CH4,2020,0.0,0.015,true,0,3000,1.0,902.3470925521343 +CH4,2020,0.0,0.015,true,0,3000,1.0e7,902.1568298742096 +CH4,2020,0.0,0.015,true,1,2300,1.0,928.9982968699569 +CH4,2020,0.0,0.015,true,1,2300,1.0e7,928.8100389416524 +CH4,2020,0.0,0.015,true,1,3000,1.0,902.3470925521343 +CH4,2020,0.0,0.015,true,1,3000,1.0e7,902.1568298742096 +CH4,2020,0.0,0.015,true,10,2300,1.0,928.9982968699569 +CH4,2020,0.0,0.015,true,10,2300,1.0e7,928.8100389416524 +CH4,2020,0.0,0.015,true,10,3000,1.0,902.3470925521343 +CH4,2020,0.0,0.015,true,10,3000,1.0e7,902.1568298742096 +CH4,2020,0.0,0.015,false,0,2300,1.0,928.9982968699564 +CH4,2020,0.0,0.015,false,0,2300,1.0e7,928.810038941652 +CH4,2020,0.0,0.015,false,0,3000,1.0,902.3470925521337 +CH4,2020,0.0,0.015,false,0,3000,1.0e7,902.1568298742093 +CH4,2020,0.0,0.015,false,1,2300,1.0,928.9982968699564 +CH4,2020,0.0,0.015,false,1,2300,1.0e7,928.810038941652 +CH4,2020,0.0,0.015,false,1,3000,1.0,902.3470925521337 +CH4,2020,0.0,0.015,false,1,3000,1.0e7,902.1568298742093 +CH4,2020,0.0,0.015,false,10,2300,1.0,928.9982968699564 +CH4,2020,0.0,0.015,false,10,2300,1.0e7,928.810038941652 +CH4,2020,0.0,0.015,false,10,3000,1.0,902.3470925521337 +CH4,2020,0.0,0.015,false,10,3000,1.0e7,902.1568298742093 +CH4,2020,0.0,0.03,true,0,2300,1.0,405.63928321757624 +CH4,2020,0.0,0.03,true,0,2300,1.0e7,405.580692154578 +CH4,2020,0.0,0.03,true,0,3000,1.0,405.4463373003748 +CH4,2020,0.0,0.03,true,0,3000,1.0e7,405.3877760317188 +CH4,2020,0.0,0.03,true,1,2300,1.0,405.63928321757624 +CH4,2020,0.0,0.03,true,1,2300,1.0e7,405.580692154578 +CH4,2020,0.0,0.03,true,1,3000,1.0,405.4463373003748 +CH4,2020,0.0,0.03,true,1,3000,1.0e7,405.3877760317188 +CH4,2020,0.0,0.03,true,10,2300,1.0,405.63928321757624 +CH4,2020,0.0,0.03,true,10,2300,1.0e7,405.580692154578 +CH4,2020,0.0,0.03,true,10,3000,1.0,405.4463373003748 +CH4,2020,0.0,0.03,true,10,3000,1.0e7,405.3877760317188 +CH4,2020,0.0,0.03,false,0,2300,1.0,405.6392832175763 +CH4,2020,0.0,0.03,false,0,2300,1.0e7,405.580692154578 +CH4,2020,0.0,0.03,false,0,3000,1.0,405.4463373003748 +CH4,2020,0.0,0.03,false,0,3000,1.0e7,405.3877760317188 +CH4,2020,0.0,0.03,false,1,2300,1.0,405.6392832175763 +CH4,2020,0.0,0.03,false,1,2300,1.0e7,405.580692154578 +CH4,2020,0.0,0.03,false,1,3000,1.0,405.4463373003748 +CH4,2020,0.0,0.03,false,1,3000,1.0e7,405.3877760317188 +CH4,2020,0.0,0.03,false,10,2300,1.0,405.6392832175763 +CH4,2020,0.0,0.03,false,10,2300,1.0e7,405.580692154578 +CH4,2020,0.0,0.03,false,10,3000,1.0,405.4463373003748 +CH4,2020,0.0,0.03,false,10,3000,1.0e7,405.3877760317188 +CH4,2020,1.45,0.015,true,0,2300,1.0,897.5359263234568 +CH4,2020,1.45,0.015,true,0,2300,1.0e7,897.4251094440197 +CH4,2020,1.45,0.015,true,0,3000,1.0,896.9533748257129 +CH4,2020,1.45,0.015,true,0,3000,1.0e7,896.8422660336505 +CH4,2020,1.45,0.015,true,1,2300,1.0,13070.721800194002 +CH4,2020,1.45,0.015,true,1,2300,1.0e7,13069.107985571765 +CH4,2020,1.45,0.015,true,1,3000,1.0,13062.238163675425 +CH4,2020,1.45,0.015,true,1,3000,1.0e7,13060.620097960158 +CH4,2020,1.45,0.015,true,10,2300,1.0,745.5674226938329 +CH4,2020,1.45,0.015,true,10,2300,1.0e7,745.4753690469876 +CH4,2020,1.45,0.015,true,10,3000,1.0,745.0835073362177 +CH4,2020,1.45,0.015,true,10,3000,1.0e7,744.9912112026514 +CH4,2020,1.45,0.015,false,0,2300,1.0,221.9301327071012 +CH4,2020,1.45,0.015,false,0,2300,1.0e7,221.90016623330237 +CH4,2020,1.45,0.015,false,0,3000,1.0,221.75406628840938 +CH4,2020,1.45,0.015,false,0,3000,1.0e7,221.72432886187374 +CH4,2020,1.45,0.015,false,1,2300,1.0,221.9301327071012 +CH4,2020,1.45,0.015,false,1,2300,1.0e7,221.90016623330237 +CH4,2020,1.45,0.015,false,1,3000,1.0,221.75406628840938 +CH4,2020,1.45,0.015,false,1,3000,1.0e7,221.72432886187374 +CH4,2020,1.45,0.015,false,10,2300,1.0,221.9301327071012 +CH4,2020,1.45,0.015,false,10,2300,1.0e7,221.90016623330237 +CH4,2020,1.45,0.015,false,10,3000,1.0,221.75406628840938 +CH4,2020,1.45,0.015,false,10,3000,1.0e7,221.72432886187374 +CH4,2020,1.45,0.03,true,0,2300,1.0,545.4838062820218 +CH4,2020,1.45,0.03,true,0,2300,1.0e7,545.4212468376076 +CH4,2020,1.45,0.03,true,0,3000,1.0,545.4784570413968 +CH4,2020,1.45,0.03,true,0,3000,1.0e7,545.4158957094835 +CH4,2020,1.45,0.03,true,1,2300,1.0,7943.82360562327 +CH4,2020,1.45,0.03,true,1,2300,1.0e7,7942.9125589788655 +CH4,2020,1.45,0.03,true,1,3000,1.0,7943.745705191657 +CH4,2020,1.45,0.03,true,1,3000,1.0e7,7942.834631059798 +CH4,2020,1.45,0.03,true,10,2300,1.0,453.123873533217 +CH4,2020,1.45,0.03,true,10,2300,1.0e7,453.07190649505293 +CH4,2020,1.45,0.03,true,10,3000,1.0,453.1194300124298 +CH4,2020,1.45,0.03,true,10,3000,1.0e7,453.06746140635295 +CH4,2020,1.45,0.03,false,0,2300,1.0,136.56031763582666 +CH4,2020,1.45,0.03,false,0,2300,1.0e7,136.54080211636682 +CH4,2020,1.45,0.03,false,0,3000,1.0,136.55859018933484 +CH4,2020,1.45,0.03,false,0,3000,1.0e7,136.53907716404626 +CH4,2020,1.45,0.03,false,1,2300,1.0,136.56031763582666 +CH4,2020,1.45,0.03,false,1,2300,1.0e7,136.54080211636682 +CH4,2020,1.45,0.03,false,1,3000,1.0,136.55859018933484 +CH4,2020,1.45,0.03,false,1,3000,1.0e7,136.53907716404626 +CH4,2020,1.45,0.03,false,10,2300,1.0,136.56031763582666 +CH4,2020,1.45,0.03,false,10,2300,1.0e7,136.54080211636682 +CH4,2020,1.45,0.03,false,10,3000,1.0,136.55859018933484 +CH4,2020,1.45,0.03,false,10,3000,1.0e7,136.53907716404626 +CH4,2055,0.0,0.015,true,0,2300,1.0,1618.6515999107037 +CH4,2055,0.0,0.015,true,0,2300,1.0e7,1618.1483139986171 +CH4,2055,0.0,0.015,true,0,3000,1.0,1581.8398872455593 +CH4,2055,0.0,0.015,true,0,3000,1.0e7,1581.3965138431415 +CH4,2055,0.0,0.015,true,1,2300,1.0,1618.6515999107037 +CH4,2055,0.0,0.015,true,1,2300,1.0e7,1618.1483139986171 +CH4,2055,0.0,0.015,true,1,3000,1.0,1581.8398872455593 +CH4,2055,0.0,0.015,true,1,3000,1.0e7,1581.3965138431415 +CH4,2055,0.0,0.015,true,10,2300,1.0,1618.6515999107037 +CH4,2055,0.0,0.015,true,10,2300,1.0e7,1618.1483139986171 +CH4,2055,0.0,0.015,true,10,3000,1.0,1581.8398872455593 +CH4,2055,0.0,0.015,true,10,3000,1.0e7,1581.3965138431415 +CH4,2055,0.0,0.015,false,0,2300,1.0,1618.651599910703 +CH4,2055,0.0,0.015,false,0,2300,1.0e7,1618.1483139986165 +CH4,2055,0.0,0.015,false,0,3000,1.0,1581.8398872455589 +CH4,2055,0.0,0.015,false,0,3000,1.0e7,1581.3965138431408 +CH4,2055,0.0,0.015,false,1,2300,1.0,1618.651599910703 +CH4,2055,0.0,0.015,false,1,2300,1.0e7,1618.1483139986165 +CH4,2055,0.0,0.015,false,1,3000,1.0,1581.8398872455589 +CH4,2055,0.0,0.015,false,1,3000,1.0e7,1581.3965138431408 +CH4,2055,0.0,0.015,false,10,2300,1.0,1618.651599910703 +CH4,2055,0.0,0.015,false,10,2300,1.0e7,1618.1483139986165 +CH4,2055,0.0,0.015,false,10,3000,1.0,1581.8398872455589 +CH4,2055,0.0,0.015,false,10,3000,1.0e7,1581.3965138431408 +CH4,2055,0.0,0.03,true,0,2300,1.0,832.6496292670021 +CH4,2055,0.0,0.03,true,0,2300,1.0e7,832.4545935943563 +CH4,2055,0.0,0.03,true,0,3000,1.0,832.2103013828603 +CH4,2055,0.0,0.03,true,0,3000,1.0e7,832.015773532223 +CH4,2055,0.0,0.03,true,1,2300,1.0,832.6496292670021 +CH4,2055,0.0,0.03,true,1,2300,1.0e7,832.4545935943563 +CH4,2055,0.0,0.03,true,1,3000,1.0,832.2103013828603 +CH4,2055,0.0,0.03,true,1,3000,1.0e7,832.015773532223 +CH4,2055,0.0,0.03,true,10,2300,1.0,832.6496292670021 +CH4,2055,0.0,0.03,true,10,2300,1.0e7,832.4545935943563 +CH4,2055,0.0,0.03,true,10,3000,1.0,832.2103013828603 +CH4,2055,0.0,0.03,true,10,3000,1.0e7,832.015773532223 +CH4,2055,0.0,0.03,false,0,2300,1.0,832.6496292670022 +CH4,2055,0.0,0.03,false,0,2300,1.0e7,832.4545935943563 +CH4,2055,0.0,0.03,false,0,3000,1.0,832.2103013828603 +CH4,2055,0.0,0.03,false,0,3000,1.0e7,832.015773532223 +CH4,2055,0.0,0.03,false,1,2300,1.0,832.6496292670022 +CH4,2055,0.0,0.03,false,1,2300,1.0e7,832.4545935943563 +CH4,2055,0.0,0.03,false,1,3000,1.0,832.2103013828603 +CH4,2055,0.0,0.03,false,1,3000,1.0e7,832.015773532223 +CH4,2055,0.0,0.03,false,10,2300,1.0,832.6496292670022 +CH4,2055,0.0,0.03,false,10,2300,1.0e7,832.4545935943563 +CH4,2055,0.0,0.03,false,10,3000,1.0,832.2103013828603 +CH4,2055,0.0,0.03,false,10,3000,1.0e7,832.015773532223 +CH4,2055,1.45,0.015,true,0,2300,1.0,1399.3350582013707 +CH4,2055,1.45,0.015,true,0,2300,1.0e7,1399.0627650428992 +CH4,2055,1.45,0.015,true,0,3000,1.0,1397.7229647085617 +CH4,2055,1.45,0.015,true,0,3000,1.0e7,1397.4518885744537 +CH4,2055,1.45,0.015,true,1,2300,1.0,20386.47531654812 +CH4,2055,1.45,0.015,true,1,2300,1.0e7,20382.508362585595 +CH4,2055,1.45,0.015,true,1,3000,1.0,20362.98923006262 +CH4,2055,1.45,0.015,true,1,3000,1.0e7,20359.040006547846 +CH4,2055,1.45,0.015,true,10,2300,1.0,1929.6769769957073 +CH4,2055,1.45,0.015,true,10,2300,1.0e7,1929.3014859109837 +CH4,2055,1.45,0.015,true,10,3000,1.0,1927.4539070600217 +CH4,2055,1.45,0.015,true,10,3000,1.0e7,1927.0800942466183 +CH4,2055,1.45,0.015,false,0,2300,1.0,541.7624544808785 +CH4,2055,1.45,0.015,false,0,2300,1.0e7,541.6462544536012 +CH4,2055,1.45,0.015,false,0,3000,1.0,541.080683589445 +CH4,2055,1.45,0.015,false,0,3000,1.0e7,540.965852099738 +CH4,2055,1.45,0.015,false,1,2300,1.0,541.7624544808785 +CH4,2055,1.45,0.015,false,1,2300,1.0e7,541.6462544536012 +CH4,2055,1.45,0.015,false,1,3000,1.0,541.080683589445 +CH4,2055,1.45,0.015,false,1,3000,1.0e7,540.965852099738 +CH4,2055,1.45,0.015,false,10,2300,1.0,541.7624544808785 +CH4,2055,1.45,0.015,false,10,2300,1.0e7,541.6462544536012 +CH4,2055,1.45,0.015,false,10,3000,1.0,541.080683589445 +CH4,2055,1.45,0.015,false,10,3000,1.0e7,540.965852099738 +CH4,2055,1.45,0.03,true,0,2300,1.0,878.7509219261788 +CH4,2055,1.45,0.03,true,0,2300,1.0e7,878.6077837009849 +CH4,2055,1.45,0.03,true,0,3000,1.0,878.7264285367994 +CH4,2055,1.45,0.03,true,0,3000,1.0e7,878.5833031438349 +CH4,2055,1.45,0.03,true,1,2300,1.0,12802.247663449843 +CH4,2055,1.45,0.03,true,1,2300,1.0e7,12800.162327362774 +CH4,2055,1.45,0.03,true,1,3000,1.0,12801.890826911611 +CH4,2055,1.45,0.03,true,1,3000,1.0e7,12799.80567777328 +CH4,2055,1.45,0.03,true,10,2300,1.0,1211.7937106029967 +CH4,2055,1.45,0.03,true,10,2300,1.0e7,1211.5963236111781 +CH4,2055,1.45,0.03,true,10,3000,1.0,1211.7599343252593 +CH4,2055,1.45,0.03,true,10,3000,1.0e7,1211.5625650290287 +CH4,2055,1.45,0.03,false,0,2300,1.0,342.62901836537753 +CH4,2055,1.45,0.03,false,0,2300,1.0e7,342.5654236820735 +CH4,2055,1.45,0.03,false,0,3000,1.0,342.6180565631596 +CH4,2055,1.45,0.03,false,0,3000,1.0e7,342.5544826219308 +CH4,2055,1.45,0.03,false,1,2300,1.0,342.62901836537753 +CH4,2055,1.45,0.03,false,1,2300,1.0e7,342.5654236820735 +CH4,2055,1.45,0.03,false,1,3000,1.0,342.6180565631596 +CH4,2055,1.45,0.03,false,1,3000,1.0e7,342.5544826219308 +CH4,2055,1.45,0.03,false,10,2300,1.0,342.62901836537753 +CH4,2055,1.45,0.03,false,10,2300,1.0e7,342.5654236820735 +CH4,2055,1.45,0.03,false,10,3000,1.0,342.6180565631596 +CH4,2055,1.45,0.03,false,10,3000,1.0e7,342.5544826219308 +N2O,2020,0.0,0.015,true,0,2300,1.0,17696.169438154793 +N2O,2020,0.0,0.015,true,0,2300,1.0e7,17688.860174761045 +N2O,2020,0.0,0.015,true,0,3000,1.0,17609.031973062192 +N2O,2020,0.0,0.015,true,0,3000,1.0e7,17601.8161023834 +N2O,2020,0.0,0.015,true,1,2300,1.0,17696.169438154793 +N2O,2020,0.0,0.015,true,1,2300,1.0e7,17688.860174761045 +N2O,2020,0.0,0.015,true,1,3000,1.0,17609.031973062192 +N2O,2020,0.0,0.015,true,1,3000,1.0e7,17601.8161023834 +N2O,2020,0.0,0.015,true,10,2300,1.0,17696.169438154793 +N2O,2020,0.0,0.015,true,10,2300,1.0e7,17688.860174761045 +N2O,2020,0.0,0.015,true,10,3000,1.0,17609.031973062192 +N2O,2020,0.0,0.015,true,10,3000,1.0e7,17601.8161023834 +N2O,2020,0.0,0.015,false,0,2300,1.0,17696.169438154786 +N2O,2020,0.0,0.015,false,0,2300,1.0e7,17688.860174761037 +N2O,2020,0.0,0.015,false,0,3000,1.0,17609.031973062185 +N2O,2020,0.0,0.015,false,0,3000,1.0e7,17601.816102383393 +N2O,2020,0.0,0.015,false,1,2300,1.0,17696.169438154786 +N2O,2020,0.0,0.015,false,1,2300,1.0e7,17688.860174761037 +N2O,2020,0.0,0.015,false,1,3000,1.0,17609.031973062185 +N2O,2020,0.0,0.015,false,1,3000,1.0e7,17601.816102383393 +N2O,2020,0.0,0.015,false,10,2300,1.0,17696.169438154786 +N2O,2020,0.0,0.015,false,10,2300,1.0e7,17688.860174761037 +N2O,2020,0.0,0.015,false,10,3000,1.0,17609.031973062185 +N2O,2020,0.0,0.015,false,10,3000,1.0e7,17601.816102383393 +N2O,2020,0.0,0.03,true,0,2300,1.0,4776.045323582711 +N2O,2020,0.0,0.03,true,0,2300,1.0e7,4774.04937316095 +N2O,2020,0.0,0.03,true,0,3000,1.0,4776.07852813089 +N2O,2020,0.0,0.03,true,0,3000,1.0e7,4774.08293664427 +N2O,2020,0.0,0.03,true,1,2300,1.0,4776.045323582711 +N2O,2020,0.0,0.03,true,1,2300,1.0e7,4774.04937316095 +N2O,2020,0.0,0.03,true,1,3000,1.0,4776.07852813089 +N2O,2020,0.0,0.03,true,1,3000,1.0e7,4774.08293664427 +N2O,2020,0.0,0.03,true,10,2300,1.0,4776.045323582711 +N2O,2020,0.0,0.03,true,10,2300,1.0e7,4774.04937316095 +N2O,2020,0.0,0.03,true,10,3000,1.0,4776.07852813089 +N2O,2020,0.0,0.03,true,10,3000,1.0e7,4774.08293664427 +N2O,2020,0.0,0.03,false,0,2300,1.0,4776.045323582711 +N2O,2020,0.0,0.03,false,0,2300,1.0e7,4774.04937316095 +N2O,2020,0.0,0.03,false,0,3000,1.0,4776.078528130889 +N2O,2020,0.0,0.03,false,0,3000,1.0e7,4774.08293664427 +N2O,2020,0.0,0.03,false,1,2300,1.0,4776.045323582711 +N2O,2020,0.0,0.03,false,1,2300,1.0e7,4774.04937316095 +N2O,2020,0.0,0.03,false,1,3000,1.0,4776.078528130889 +N2O,2020,0.0,0.03,false,1,3000,1.0e7,4774.08293664427 +N2O,2020,0.0,0.03,false,10,2300,1.0,4776.045323582711 +N2O,2020,0.0,0.03,false,10,2300,1.0e7,4774.04937316095 +N2O,2020,0.0,0.03,false,10,3000,1.0,4776.078528130889 +N2O,2020,0.0,0.03,false,10,3000,1.0e7,4774.08293664427 +N2O,2020,1.45,0.015,true,0,2300,1.0,7755.716461082641 +N2O,2020,1.45,0.015,true,0,2300,1.0e7,7752.654091300852 +N2O,2020,1.45,0.015,true,0,3000,1.0,7753.484643425201 +N2O,2020,1.45,0.015,true,0,3000,1.0e7,7750.424421924027 +N2O,2020,1.45,0.015,true,1,2300,1.0,112945.68746595591 +N2O,2020,1.45,0.015,true,1,2300,1.0e7,112901.09049519058 +N2O,2020,1.45,0.015,true,1,3000,1.0,112913.18573889008 +N2O,2020,1.45,0.015,true,1,3000,1.0e7,112868.62005331059 +N2O,2020,1.45,0.015,true,10,2300,1.0,6442.538246596757 +N2O,2020,1.45,0.015,true,10,2300,1.0e7,6439.994389489111 +N2O,2020,1.45,0.015,true,10,3000,1.0,6440.684314637069 +N2O,2020,1.45,0.015,true,10,3000,1.0e7,6438.142242068621 +N2O,2020,1.45,0.015,false,0,2300,1.0,2145.6016436183936 +N2O,2020,1.45,0.015,false,0,2300,1.0e7,2144.6442998197786 +N2O,2020,1.45,0.015,false,0,3000,1.0,2145.8349728800777 +N2O,2020,1.45,0.015,false,0,3000,1.0e7,2144.8777014963493 +N2O,2020,1.45,0.015,false,1,2300,1.0,2145.6016436183936 +N2O,2020,1.45,0.015,false,1,2300,1.0e7,2144.6442998197786 +N2O,2020,1.45,0.015,false,1,3000,1.0,2145.8349728800777 +N2O,2020,1.45,0.015,false,1,3000,1.0e7,2144.8777014963493 +N2O,2020,1.45,0.015,false,10,2300,1.0,2145.6016436183936 +N2O,2020,1.45,0.015,false,10,2300,1.0e7,2144.6442998197786 +N2O,2020,1.45,0.015,false,10,3000,1.0,2145.8349728800777 +N2O,2020,1.45,0.015,false,10,3000,1.0e7,2144.8777014963493 +N2O,2020,1.45,0.03,true,0,2300,1.0,3608.499145220663 +N2O,2020,1.45,0.03,true,0,2300,1.0e7,3607.080019755599 +N2O,2020,1.45,0.03,true,0,3000,1.0,3608.488774804587 +N2O,2020,1.45,0.03,true,0,3000,1.0e7,3607.069662917181 +N2O,2020,1.45,0.03,true,1,2300,1.0,52550.195552193916 +N2O,2020,1.45,0.03,true,1,2300,1.0e7,52529.52897650661 +N2O,2020,1.45,0.03,true,1,3000,1.0,52550.044528909486 +N2O,2020,1.45,0.03,true,1,3000,1.0e7,52529.37815095222 +N2O,2020,1.45,0.03,true,10,2300,1.0,2997.5172342299106 +N2O,2020,1.45,0.03,true,10,2300,1.0e7,2996.338391484528 +N2O,2020,1.45,0.03,true,10,3000,1.0,2997.5086197063474 +N2O,2020,1.45,0.03,true,10,3000,1.0e7,2996.3297882396887 +N2O,2020,1.45,0.03,false,0,2300,1.0,973.4013083726704 +N2O,2020,1.45,0.03,false,0,2300,1.0e7,972.9217600748606 +N2O,2020,1.45,0.03,false,0,3000,1.0,973.4063455504977 +N2O,2020,1.45,0.03,false,0,3000,1.0e7,972.9267989561963 +N2O,2020,1.45,0.03,false,1,2300,1.0,973.4013083726704 +N2O,2020,1.45,0.03,false,1,2300,1.0e7,972.9217600748606 +N2O,2020,1.45,0.03,false,1,3000,1.0,973.4063455504977 +N2O,2020,1.45,0.03,false,1,3000,1.0e7,972.9267989561963 +N2O,2020,1.45,0.03,false,10,2300,1.0,973.4013083726704 +N2O,2020,1.45,0.03,false,10,2300,1.0e7,972.9217600748606 +N2O,2020,1.45,0.03,false,10,3000,1.0,973.4063455504977 +N2O,2020,1.45,0.03,false,10,3000,1.0e7,972.9267989561963 +N2O,2055,0.0,0.015,true,0,2300,1.0,27119.010678188384 +N2O,2055,0.0,0.015,true,0,2300,1.0e7,27107.495261806118 +N2O,2055,0.0,0.015,true,0,3000,1.0,27292.470457951 +N2O,2055,0.0,0.015,true,0,3000,1.0e7,27281.02894600366 +N2O,2055,0.0,0.015,true,1,2300,1.0,27119.010678188384 +N2O,2055,0.0,0.015,true,1,2300,1.0e7,27107.495261806118 +N2O,2055,0.0,0.015,true,1,3000,1.0,27292.470457951 +N2O,2055,0.0,0.015,true,1,3000,1.0e7,27281.02894600366 +N2O,2055,0.0,0.015,true,10,2300,1.0,27119.010678188384 +N2O,2055,0.0,0.015,true,10,2300,1.0e7,27107.495261806118 +N2O,2055,0.0,0.015,true,10,3000,1.0,27292.470457951 +N2O,2055,0.0,0.015,true,10,3000,1.0e7,27281.02894600366 +N2O,2055,0.0,0.015,false,0,2300,1.0,27119.010678188373 +N2O,2055,0.0,0.015,false,0,2300,1.0e7,27107.495261806107 +N2O,2055,0.0,0.015,false,0,3000,1.0,27292.470457950985 +N2O,2055,0.0,0.015,false,0,3000,1.0e7,27281.028946003644 +N2O,2055,0.0,0.015,false,1,2300,1.0,27119.010678188373 +N2O,2055,0.0,0.015,false,1,2300,1.0e7,27107.495261806107 +N2O,2055,0.0,0.015,false,1,3000,1.0,27292.470457950985 +N2O,2055,0.0,0.015,false,1,3000,1.0e7,27281.028946003644 +N2O,2055,0.0,0.015,false,10,2300,1.0,27119.010678188373 +N2O,2055,0.0,0.015,false,10,2300,1.0e7,27107.495261806107 +N2O,2055,0.0,0.015,false,10,3000,1.0,27292.470457950985 +N2O,2055,0.0,0.015,false,10,3000,1.0e7,27281.028946003644 +N2O,2055,0.0,0.03,true,0,2300,1.0,8946.120686539092 +N2O,2055,0.0,0.03,true,0,2300,1.0e7,8941.89291923253 +N2O,2055,0.0,0.03,true,0,3000,1.0,8950.759143994972 +N2O,2055,0.0,0.03,true,0,3000,1.0e7,8946.531435913175 +N2O,2055,0.0,0.03,true,1,2300,1.0,8946.120686539092 +N2O,2055,0.0,0.03,true,1,2300,1.0e7,8941.89291923253 +N2O,2055,0.0,0.03,true,1,3000,1.0,8950.759143994972 +N2O,2055,0.0,0.03,true,1,3000,1.0e7,8946.531435913175 +N2O,2055,0.0,0.03,true,10,2300,1.0,8946.120686539092 +N2O,2055,0.0,0.03,true,10,2300,1.0e7,8941.89291923253 +N2O,2055,0.0,0.03,true,10,3000,1.0,8950.759143994972 +N2O,2055,0.0,0.03,true,10,3000,1.0e7,8946.531435913175 +N2O,2055,0.0,0.03,false,0,2300,1.0,8946.12068653909 +N2O,2055,0.0,0.03,false,0,2300,1.0e7,8941.89291923253 +N2O,2055,0.0,0.03,false,0,3000,1.0,8950.759143994972 +N2O,2055,0.0,0.03,false,0,3000,1.0e7,8946.531435913175 +N2O,2055,0.0,0.03,false,1,2300,1.0,8946.12068653909 +N2O,2055,0.0,0.03,false,1,2300,1.0e7,8941.89291923253 +N2O,2055,0.0,0.03,false,1,3000,1.0,8950.759143994972 +N2O,2055,0.0,0.03,false,1,3000,1.0e7,8946.531435913175 +N2O,2055,0.0,0.03,false,10,2300,1.0,8946.12068653909 +N2O,2055,0.0,0.03,false,10,2300,1.0e7,8941.89291923253 +N2O,2055,0.0,0.03,false,10,3000,1.0,8950.759143994972 +N2O,2055,0.0,0.03,false,10,3000,1.0e7,8946.531435913175 +N2O,2055,1.45,0.015,true,0,2300,1.0,12870.909106000501 +N2O,2055,1.45,0.015,true,0,2300,1.0e7,12864.859544075895 +N2O,2055,1.45,0.015,true,0,3000,1.0,12876.994745862828 +N2O,2055,1.45,0.015,true,0,3000,1.0e7,12870.948960622884 +N2O,2055,1.45,0.015,true,1,2300,1.0,187512.2539474418 +N2O,2055,1.45,0.015,true,1,2300,1.0e7,187424.1197696199 +N2O,2055,1.45,0.015,true,1,3000,1.0,187600.91373346775 +N2O,2055,1.45,0.015,true,1,3000,1.0e7,187512.8345769849 +N2O,2055,1.45,0.015,true,10,2300,1.0,17748.927842040426 +N2O,2055,1.45,0.015,true,10,2300,1.0e7,17740.585522380523 +N2O,2055,1.45,0.015,true,10,3000,1.0,17757.31991301999 +N2O,2055,1.45,0.015,true,10,3000,1.0e7,17748.982801391856 +N2O,2055,1.45,0.015,false,0,2300,1.0,5341.017322271289 +N2O,2055,1.45,0.015,false,0,2300,1.0e7,5338.426549562404 +N2O,2055,1.45,0.015,false,0,3000,1.0,5346.909300212525 +N2O,2055,1.45,0.015,false,0,3000,1.0e7,5344.318847375852 +N2O,2055,1.45,0.015,false,1,2300,1.0,5341.017322271289 +N2O,2055,1.45,0.015,false,1,2300,1.0e7,5338.426549562404 +N2O,2055,1.45,0.015,false,1,3000,1.0,5346.909300212525 +N2O,2055,1.45,0.015,false,1,3000,1.0e7,5344.318847375852 +N2O,2055,1.45,0.015,false,10,2300,1.0,5341.017322271289 +N2O,2055,1.45,0.015,false,10,2300,1.0e7,5338.426549562404 +N2O,2055,1.45,0.015,false,10,3000,1.0,5346.909300212525 +N2O,2055,1.45,0.015,false,10,3000,1.0e7,5344.318847375852 +N2O,2055,1.45,0.03,true,0,2300,1.0,6181.792065656289 +N2O,2055,1.45,0.03,true,0,2300,1.0e7,6178.722979521746 +N2O,2055,1.45,0.03,true,0,3000,1.0,6181.963529534737 +N2O,2055,1.45,0.03,true,0,3000,1.0e7,6178.89447181385 +N2O,2055,1.45,0.03,true,1,2300,1.0,90060.59743870108 +N2O,2055,1.45,0.03,true,1,2300,1.0e7,90015.88488157652 +N2O,2055,1.45,0.03,true,1,3000,1.0,90063.09544238159 +N2O,2055,1.45,0.03,true,1,3000,1.0e7,90018.38329920672 +N2O,2055,1.45,0.03,true,10,2300,1.0,8524.664450988876 +N2O,2055,1.45,0.03,true,10,2300,1.0e7,8520.432194518537 +N2O,2055,1.45,0.03,true,10,3000,1.0,8524.900898933698 +N2O,2055,1.45,0.03,true,10,3000,1.0e7,8520.668681645666 +N2O,2055,1.45,0.03,false,0,2300,1.0,2534.780606727232 +N2O,2055,1.45,0.03,false,0,2300,1.0e7,2533.435634900705 +N2O,2055,1.45,0.03,false,0,3000,1.0,2534.906191312353 +N2O,2055,1.45,0.03,false,0,3000,1.0e7,2533.5612212475435 +N2O,2055,1.45,0.03,false,1,2300,1.0,2534.780606727232 +N2O,2055,1.45,0.03,false,1,2300,1.0e7,2533.435634900705 +N2O,2055,1.45,0.03,false,1,3000,1.0,2534.906191312353 +N2O,2055,1.45,0.03,false,1,3000,1.0e7,2533.5612212475435 +N2O,2055,1.45,0.03,false,10,2300,1.0,2534.780606727232 +N2O,2055,1.45,0.03,false,10,2300,1.0e7,2533.435634900705 +N2O,2055,1.45,0.03,false,10,3000,1.0,2534.906191312353 +N2O,2055,1.45,0.03,false,10,3000,1.0e7,2533.5612212475435 +SF6,2020,0.0,0.015,true,0,2300,1.0,2.0234128735835173e6 +SF6,2020,0.0,0.015,true,0,2300,1.0e7,2.040958176626611e6 +SF6,2020,0.0,0.015,true,0,3000,1.0,2.1949177453700732e6 +SF6,2020,0.0,0.015,true,0,3000,1.0e7,2.210964805581251e6 +SF6,2020,0.0,0.015,true,1,2300,1.0,2.0234128735835173e6 +SF6,2020,0.0,0.015,true,1,2300,1.0e7,2.040958176626611e6 +SF6,2020,0.0,0.015,true,1,3000,1.0,2.1949177453700732e6 +SF6,2020,0.0,0.015,true,1,3000,1.0e7,2.210964805581251e6 +SF6,2020,0.0,0.015,true,10,2300,1.0,2.0234128735835173e6 +SF6,2020,0.0,0.015,true,10,2300,1.0e7,2.040958176626611e6 +SF6,2020,0.0,0.015,true,10,3000,1.0,2.1949177453700732e6 +SF6,2020,0.0,0.015,true,10,3000,1.0e7,2.210964805581251e6 +SF6,2020,0.0,0.015,false,0,2300,1.0,2.0234128735835166e6 +SF6,2020,0.0,0.015,false,0,2300,1.0e7,2.04095817662661e6 +SF6,2020,0.0,0.015,false,0,3000,1.0,2.1949177453700723e6 +SF6,2020,0.0,0.015,false,0,3000,1.0e7,2.21096480558125e6 +SF6,2020,0.0,0.015,false,1,2300,1.0,2.0234128735835166e6 +SF6,2020,0.0,0.015,false,1,2300,1.0e7,2.04095817662661e6 +SF6,2020,0.0,0.015,false,1,3000,1.0,2.1949177453700723e6 +SF6,2020,0.0,0.015,false,1,3000,1.0e7,2.21096480558125e6 +SF6,2020,0.0,0.015,false,10,2300,1.0,2.0234128735835166e6 +SF6,2020,0.0,0.015,false,10,2300,1.0e7,2.04095817662661e6 +SF6,2020,0.0,0.015,false,10,3000,1.0,2.1949177453700723e6 +SF6,2020,0.0,0.015,false,10,3000,1.0e7,2.21096480558125e6 +SF6,2020,0.0,0.03,true,0,2300,1.0,403515.76312179165 +SF6,2020,0.0,0.03,true,0,2300,1.0e7,409166.0189615817 +SF6,2020,0.0,0.03,true,0,3000,1.0,404829.2058716505 +SF6,2020,0.0,0.03,true,0,3000,1.0e7,410469.4179521205 +SF6,2020,0.0,0.03,true,1,2300,1.0,403515.76312179165 +SF6,2020,0.0,0.03,true,1,2300,1.0e7,409166.0189615817 +SF6,2020,0.0,0.03,true,1,3000,1.0,404829.2058716505 +SF6,2020,0.0,0.03,true,1,3000,1.0e7,410469.4179521205 +SF6,2020,0.0,0.03,true,10,2300,1.0,403515.76312179165 +SF6,2020,0.0,0.03,true,10,2300,1.0e7,409166.0189615817 +SF6,2020,0.0,0.03,true,10,3000,1.0,404829.2058716505 +SF6,2020,0.0,0.03,true,10,3000,1.0e7,410469.4179521205 +SF6,2020,0.0,0.03,false,0,2300,1.0,403515.76312179153 +SF6,2020,0.0,0.03,false,0,2300,1.0e7,409166.01896158163 +SF6,2020,0.0,0.03,false,0,3000,1.0,404829.2058716504 +SF6,2020,0.0,0.03,false,0,3000,1.0e7,410469.4179521204 +SF6,2020,0.0,0.03,false,1,2300,1.0,403515.76312179153 +SF6,2020,0.0,0.03,false,1,2300,1.0e7,409166.01896158163 +SF6,2020,0.0,0.03,false,1,3000,1.0,404829.2058716504 +SF6,2020,0.0,0.03,false,1,3000,1.0e7,410469.4179521204 +SF6,2020,0.0,0.03,false,10,2300,1.0,403515.76312179153 +SF6,2020,0.0,0.03,false,10,2300,1.0e7,409166.01896158163 +SF6,2020,0.0,0.03,false,10,3000,1.0,404829.2058716504 +SF6,2020,0.0,0.03,false,10,3000,1.0e7,410469.4179521204 +SF6,2020,1.45,0.015,true,0,2300,1.0,591659.4218761702 +SF6,2020,1.45,0.015,true,0,2300,1.0e7,601566.2796171273 +SF6,2020,1.45,0.015,true,0,3000,1.0,594684.8542003029 +SF6,2020,1.45,0.015,true,0,3000,1.0e7,604558.673197093 +SF6,2020,1.45,0.015,true,1,2300,1.0,8.616274264903406e6 +SF6,2020,1.45,0.015,true,1,2300,1.0e7,8.760546797788603e6 +SF6,2020,1.45,0.015,true,1,3000,1.0,8.660333319337066e6 +SF6,2020,1.45,0.015,true,1,3000,1.0e7,8.804124712447278e6 +SF6,2020,1.45,0.015,true,10,2300,1.0,491481.15116426715 +SF6,2020,1.45,0.015,true,10,2300,1.0e7,499710.6049123479 +SF6,2020,1.45,0.015,true,10,3000,1.0,493994.3249707775 +SF6,2020,1.45,0.015,true,10,3000,1.0e7,502196.3340109475 +SF6,2020,1.45,0.015,false,0,2300,1.0,173467.77814222634 +SF6,2020,1.45,0.015,false,0,2300,1.0e7,175832.90985483665 +SF6,2020,1.45,0.015,false,0,3000,1.0,174811.68726030737 +SF6,2020,1.45,0.015,false,0,3000,1.0e7,177171.7147582906 +SF6,2020,1.45,0.015,false,1,2300,1.0,173467.77814222634 +SF6,2020,1.45,0.015,false,1,2300,1.0e7,175832.90985483665 +SF6,2020,1.45,0.015,false,1,3000,1.0,174811.68726030737 +SF6,2020,1.45,0.015,false,1,3000,1.0e7,177171.7147582906 +SF6,2020,1.45,0.015,false,10,2300,1.0,173467.77814222634 +SF6,2020,1.45,0.015,false,10,2300,1.0e7,175832.90985483665 +SF6,2020,1.45,0.015,false,10,3000,1.0,174811.68726030737 +SF6,2020,1.45,0.015,false,10,3000,1.0e7,177171.7147582906 +SF6,2020,1.45,0.03,true,0,2300,1.0,239658.30952012012 +SF6,2020,1.45,0.03,true,0,2300,1.0e7,244359.94890501298 +SF6,2020,1.45,0.03,true,0,3000,1.0,239687.46409037296 +SF6,2020,1.45,0.03,true,0,3000,1.0e7,244388.8128355511 +SF6,2020,1.45,0.03,true,1,2300,1.0,3.490118889918813e6 +SF6,2020,1.45,0.03,true,1,2300,1.0e7,3.5585883724235427e6 +SF6,2020,1.45,0.03,true,1,3000,1.0,3.490543464875429e6 +SF6,2020,1.45,0.03,true,1,3000,1.0e7,3.5590087148243976e6 +SF6,2020,1.45,0.03,true,10,2300,1.0,199079.97319728797 +SF6,2020,1.45,0.03,true,10,2300,1.0e7,202985.54294198827 +SF6,2020,1.45,0.03,true,10,3000,1.0,199104.19138974766 +SF6,2020,1.45,0.03,true,10,3000,1.0e7,203009.51970511157 +SF6,2020,1.45,0.03,false,0,2300,1.0,66643.32894683004 +SF6,2020,1.45,0.03,false,0,2300,1.0e7,67592.00208629596 +SF6,2020,1.45,0.03,false,0,3000,1.0,66656.97849484516 +SF6,2020,1.45,0.03,false,0,3000,1.0e7,67605.60891790592 +SF6,2020,1.45,0.03,false,1,2300,1.0,66643.32894683004 +SF6,2020,1.45,0.03,false,1,2300,1.0e7,67592.00208629596 +SF6,2020,1.45,0.03,false,1,3000,1.0,66656.97849484516 +SF6,2020,1.45,0.03,false,1,3000,1.0e7,67605.60891790592 +SF6,2020,1.45,0.03,false,10,2300,1.0,66643.32894683004 +SF6,2020,1.45,0.03,false,10,2300,1.0e7,67592.00208629596 +SF6,2020,1.45,0.03,false,10,3000,1.0,66656.97849484516 +SF6,2020,1.45,0.03,false,10,3000,1.0e7,67605.60891790592 +SF6,2055,0.0,0.015,true,0,2300,1.0,2.8347775488713235e6 +SF6,2055,0.0,0.015,true,0,2300,1.0e7,2.854853941347186e6 +SF6,2055,0.0,0.015,true,0,3000,1.0,3.143571730550726e6 +SF6,2055,0.0,0.015,true,0,3000,1.0e7,3.162187389038761e6 +SF6,2055,0.0,0.015,true,1,2300,1.0,2.8347775488713235e6 +SF6,2055,0.0,0.015,true,1,2300,1.0e7,2.854853941347186e6 +SF6,2055,0.0,0.015,true,1,3000,1.0,3.143571730550726e6 +SF6,2055,0.0,0.015,true,1,3000,1.0e7,3.162187389038761e6 +SF6,2055,0.0,0.015,true,10,2300,1.0,2.8347775488713235e6 +SF6,2055,0.0,0.015,true,10,2300,1.0e7,2.854853941347186e6 +SF6,2055,0.0,0.015,true,10,3000,1.0,3.143571730550726e6 +SF6,2055,0.0,0.015,true,10,3000,1.0e7,3.162187389038761e6 +SF6,2055,0.0,0.015,false,0,2300,1.0,2.8347775488713225e6 +SF6,2055,0.0,0.015,false,0,2300,1.0e7,2.8548539413471846e6 +SF6,2055,0.0,0.015,false,0,3000,1.0,3.143571730550724e6 +SF6,2055,0.0,0.015,false,0,3000,1.0e7,3.16218738903876e6 +SF6,2055,0.0,0.015,false,1,2300,1.0,2.8347775488713225e6 +SF6,2055,0.0,0.015,false,1,2300,1.0e7,2.8548539413471846e6 +SF6,2055,0.0,0.015,false,1,3000,1.0,3.143571730550724e6 +SF6,2055,0.0,0.015,false,1,3000,1.0e7,3.16218738903876e6 +SF6,2055,0.0,0.015,false,10,2300,1.0,2.8347775488713225e6 +SF6,2055,0.0,0.015,false,10,2300,1.0e7,2.8548539413471846e6 +SF6,2055,0.0,0.015,false,10,3000,1.0,3.143571730550724e6 +SF6,2055,0.0,0.015,false,10,3000,1.0e7,3.16218738903876e6 +SF6,2055,0.0,0.03,true,0,2300,1.0,727766.9505241859 +SF6,2055,0.0,0.03,true,0,2300,1.0e7,734236.3951046012 +SF6,2055,0.0,0.03,true,0,3000,1.0,731706.8069978314 +SF6,2055,0.0,0.03,true,0,3000,1.0e7,738162.3782312009 +SF6,2055,0.0,0.03,true,1,2300,1.0,727766.9505241859 +SF6,2055,0.0,0.03,true,1,2300,1.0e7,734236.3951046012 +SF6,2055,0.0,0.03,true,1,3000,1.0,731706.8069978314 +SF6,2055,0.0,0.03,true,1,3000,1.0e7,738162.3782312009 +SF6,2055,0.0,0.03,true,10,2300,1.0,727766.9505241859 +SF6,2055,0.0,0.03,true,10,2300,1.0e7,734236.3951046012 +SF6,2055,0.0,0.03,true,10,3000,1.0,731706.8069978314 +SF6,2055,0.0,0.03,true,10,3000,1.0e7,738162.3782312009 +SF6,2055,0.0,0.03,false,0,2300,1.0,727766.9505241859 +SF6,2055,0.0,0.03,false,0,2300,1.0e7,734236.395104601 +SF6,2055,0.0,0.03,false,0,3000,1.0,731706.8069978313 +SF6,2055,0.0,0.03,false,0,3000,1.0e7,738162.3782312009 +SF6,2055,0.0,0.03,false,1,2300,1.0,727766.9505241859 +SF6,2055,0.0,0.03,false,1,2300,1.0e7,734236.395104601 +SF6,2055,0.0,0.03,false,1,3000,1.0,731706.8069978313 +SF6,2055,0.0,0.03,false,1,3000,1.0e7,738162.3782312009 +SF6,2055,0.0,0.03,false,10,2300,1.0,727766.9505241859 +SF6,2055,0.0,0.03,false,10,2300,1.0e7,734236.395104601 +SF6,2055,0.0,0.03,false,10,3000,1.0,731706.8069978313 +SF6,2055,0.0,0.03,false,10,3000,1.0e7,738162.3782312009 +SF6,2055,1.45,0.015,true,0,2300,1.0,1.0134449868993029e6 +SF6,2055,1.45,0.015,true,0,2300,1.0e7,1.0230029354048801e6 +SF6,2055,1.45,0.015,true,0,3000,1.0,1.0245824268335103e6 +SF6,2055,1.45,0.015,true,0,3000,1.0e7,1.0340725249727566e6 +SF6,2055,1.45,0.015,true,1,2300,1.0,1.4764563418183815e7 +SF6,2055,1.45,0.015,true,1,2300,1.0e7,1.4903810184098648e7 +SF6,2055,1.45,0.015,true,1,3000,1.0,1.492682130129588e7 +SF6,2055,1.45,0.015,true,1,3000,1.0e7,1.5065079576419812e7 +SF6,2055,1.45,0.015,true,10,2300,1.0,1.3975362420955498e6 +SF6,2055,1.45,0.015,true,10,2300,1.0e7,1.4107166116363723e6 +SF6,2055,1.45,0.015,true,10,3000,1.0,1.4128947234669353e6 +SF6,2055,1.45,0.015,true,10,3000,1.0e7,1.425981527646823e6 +SF6,2055,1.45,0.015,false,0,2300,1.0,435602.67297098285 +SF6,2055,1.45,0.015,false,0,2300,1.0e7,439180.8184744866 +SF6,2055,1.45,0.015,false,0,3000,1.0,441526.9507807834 +SF6,2055,1.45,0.015,false,0,3000,1.0e7,445089.12408704776 +SF6,2055,1.45,0.015,false,1,2300,1.0,435602.67297098285 +SF6,2055,1.45,0.015,false,1,2300,1.0e7,439180.8184744866 +SF6,2055,1.45,0.015,false,1,3000,1.0,441526.9507807834 +SF6,2055,1.45,0.015,false,1,3000,1.0e7,445089.12408704776 +SF6,2055,1.45,0.015,false,10,2300,1.0,435602.67297098285 +SF6,2055,1.45,0.015,false,10,2300,1.0e7,439180.8184744866 +SF6,2055,1.45,0.015,false,10,3000,1.0,441526.9507807834 +SF6,2055,1.45,0.015,false,10,3000,1.0e7,445089.12408704776 +SF6,2055,1.45,0.03,true,0,2300,1.0,426380.87044912064 +SF6,2055,1.45,0.03,true,0,2300,1.0e7,430705.28396462364 +SF6,2055,1.45,0.03,true,0,3000,1.0,426559.6472872794 +SF6,2055,1.45,0.03,true,0,3000,1.0e7,430883.1424066598 +SF6,2055,1.45,0.03,true,1,2300,1.0,6.211809701982342e6 +SF6,2055,1.45,0.03,true,1,2300,1.0e7,6.27481073156111e6 +SF6,2055,1.45,0.03,true,1,3000,1.0,6.214414245888347e6 +SF6,2055,1.45,0.03,true,1,3000,1.0e7,6.277401895640905e6 +SF6,2055,1.45,0.03,true,10,2300,1.0,587977.3713342182 +SF6,2055,1.45,0.03,true,10,2300,1.0e7,593940.7188191309 +SF6,2055,1.45,0.03,true,10,3000,1.0,588223.9038187676 +SF6,2055,1.45,0.03,true,10,3000,1.0e7,594185.9848394097 +SF6,2055,1.45,0.03,false,0,2300,1.0,178369.83402547505 +SF6,2055,1.45,0.03,false,0,2300,1.0e7,179799.83940437157 +SF6,2055,1.45,0.03,false,0,3000,1.0,178469.36713973273 +SF6,2055,1.45,0.03,false,0,3000,1.0e7,179899.18013254018 +SF6,2055,1.45,0.03,false,1,2300,1.0,178369.83402547505 +SF6,2055,1.45,0.03,false,1,2300,1.0e7,179799.83940437157 +SF6,2055,1.45,0.03,false,1,3000,1.0,178469.36713973273 +SF6,2055,1.45,0.03,false,1,3000,1.0e7,179899.18013254018 +SF6,2055,1.45,0.03,false,10,2300,1.0,178369.83402547505 +SF6,2055,1.45,0.03,false,10,2300,1.0e7,179799.83940437157 +SF6,2055,1.45,0.03,false,10,3000,1.0,178469.36713973273 +SF6,2055,1.45,0.03,false,10,3000,1.0e7,179899.18013254018 diff --git a/test/SC validation data/mcs_sc_values.csv b/test/SC validation data/mcs_sc_values_v3-11-7.csv similarity index 100% rename from test/SC validation data/mcs_sc_values.csv rename to test/SC validation data/mcs_sc_values_v3-11-7.csv diff --git a/test/create_scc_validation_file.jl b/test/create_scc_validation_file.jl new file mode 100644 index 00000000..1ad47888 --- /dev/null +++ b/test/create_scc_validation_file.jl @@ -0,0 +1,67 @@ +# This file can be used to create the validation file for scc files. It will create +# a validation file containing all possibilities of parameter values defined in the +# specs dictionary below produce the same results. A subset of these values are +# tested in the "runtests.jl" file deployed by Travis, and the full set can be tested +# manually using the scc_validation_full.jl file + +using MimiFUND +using DataFrames +using Query +using CSVFiles +using Test + +specs = Dict([ + :gas => [:CO2, :CH4, :N2O, :SF6], + :year => [2020, 2055], + :eta => [0, 1.45], + :prtp => [0.015, 0.03], + :equity_weights => [true, false], + :equity_weights_normalization_region => [0, 1, 10], + :last_year => [2300, 3000], + :pulse_size => [1, 1e7] +]) + +results = DataFrame(gas = [], year = [], eta = [], prtp = [], equity_weights = [], equity_weights_normalization_region = [], last_year = [], pulse_size = [], SC = []) + +for gas in specs[:gas] + for year in specs[:year] + for eta in specs[:eta] + for prtp in specs[:prtp] + for equity_weights in specs[:equity_weights] + for equity_weights_normalization_region in specs[:equity_weights_normalization_region] + for last_year in specs[:last_year] + for pulse_size in specs[:pulse_size] + sc = MimiFUND.compute_sc(gas=gas, year=year, eta=eta, prtp=prtp, equity_weights=equity_weights, equity_weights_normalization_region=equity_weights_normalization_region, last_year=last_year, pulse_size=pulse_size) + push!(results, (gas, year, eta, prtp, equity_weights, equity_weights_normalization_region, last_year, pulse_size, sc)) + end + end + end + end + end + end + end +end + +path = joinpath(@__DIR__, "SC validation data", "deterministic_sc_values_v3-13-0.csv") +save(path, results) + +## Compare v3.11.7 to v3.13.0 ... :CO2 and :CH4 should not change + +old_sc = load(joinpath(@__DIR__, "SC validation data", "deterministic_sc_values_v3-11-7.csv")) |> DataFrame +new_sc = load(joinpath(@__DIR__, "SC validation data", "deterministic_sc_values_v3-13-0.csv")) |> DataFrame + +filter!(:gas => x -> (x == "CO2" || x == "CH4"), old_sc) +filter!(:gas => x -> (x == "CO2" || x == "CH4"), new_sc) + +# after running scc_validation_all.jl on Mimi v3.12.1 on Lisa Rennels' machine, +# we note that the differences between results and validation results pass only at +# a tolerance of 1.0e-1 for pulse_size of 1 and 1e-9 for pulse_size of 1.0e7, so +# we mirror that here + +old_sc_bigpulse = filter!(:pulse_size => x -> x == 1.0e7, old_sc) +new_sc_bigpulse = filter!(:pulse_size => x -> x == 1.0e7, new_sc) +@test all(isapprox.(old_sc_bigpulse[!, :SC], new_sc_bigpulse[!, :SC], atol = 1e-9)) + +old_sc_smallpulse = filter!(:pulse_size => x -> x == 1.0e7, old_sc) +new_sc_smallpulse = filter!(:pulse_size => x -> x == 1.0e7, new_sc) +@test all(isapprox.(old_sc_smallpulse[!, :SC], new_sc_smallpulse[!, :SC], atol = 1e-1)) diff --git a/test/runtests.jl b/test/runtests.jl index 6bedb5e8..8f91645b 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -120,7 +120,7 @@ result = MimiFUND.compute_sc(year=2050, return_mm = true) scch4 = MimiFUND.compute_scch4(year = 2020) scn2o = MimiFUND.compute_scn2o(year = 2020) scsf6 = MimiFUND.compute_scsf6(year = 2020) -@test scsf6 < scch4 < scn2o +@test scch4 < scn2o < scsf6 # Test that modifying the pulse_size keyword changes the values, but not by much scch4_2 = MimiFUND.compute_scch4(year = 2020, pulse_size = 1e3) @@ -131,7 +131,7 @@ scsf6_2 = MimiFUND.compute_scsf6(year = 2020, pulse_size = 1e3) @test scn2o != scn2o_2 @test scn2o ≈ scn2o_2 rtol = 1e-3 @test scsf6 != scsf6_2 -@test scsf6 ≈ scsf6_2 rtol = 1e-3 +@test scsf6 ≈ scsf6_2 rtol = 1e-1 # TODO Lisa Rennels - ok to increase tolerance here? # Test monte carlo simulation scco2_values = MimiFUND.compute_sc(year = 2020, gas = :CO2, n = 10) @@ -171,9 +171,9 @@ end #test-mcs testset datadir = joinpath(@__DIR__, "SC validation data") atol = 1e-2 -# Test a subset of all validation configurations against the pre-saved values from MimiFUND v3.11.7 +# Test a subset of all validation configurations against the pre-saved values from MimiFUND v3.13.0 -validation_results = load(joinpath(datadir, "deterministic_sc_values.csv")) |> DataFrame +validation_results = load(joinpath(datadir, "deterministic_sc_values_v3-13-0.csv")) |> DataFrame for spec in [ (gas = :CO2, year = 2020, eta = 0., prtp = 0.03, equity_weights = true, equity_weights_normalization_region = 1, last_year = 3000, pulse_size = 1.), @@ -192,9 +192,10 @@ for spec in [ @test sc ≈ validation_value[1, :SC] atol = atol end -# Test Monte Carlo results with the same configuration and seed +# Test Monte Carlo results with the same configuration and seed - note here we use +# FUND 3.11.7 since 3.13.0 only updated SC-N2O and SC-SF6 sc_mcs = MimiFUND.compute_sc(gas = :CO2, year = 2020, eta = 1.45, prtp = 0.015, n = 25, seed = 350) -validation_mcs = load(joinpath(datadir, "mcs_sc_values.csv")) |> DataFrame +validation_mcs = load(joinpath(datadir, "mcs_sc_values_v3-11-7.csv")) |> DataFrame @test all(isapprox.(sc_mcs, validation_mcs[!, :SCCO2], atol = atol)) end diff --git a/test/scc_validation_full.jl b/test/scc_validation_full.jl index 6e868624..ddac31d6 100644 --- a/test/scc_validation_full.jl +++ b/test/scc_validation_full.jl @@ -2,7 +2,7 @@ # This file can be run manually to check that Social Cost calculations using all possibilities of # parameter values defined in the specs dictionary below produce the same results. A subset of # these values are tested in the "runtests.jl" file deployed by Travis. The validation of these -# runs depends on the pre-saved values from MimiFUND v3.11.7 in the "SC validation data" folder. +# runs depends on the pre-saved values from MimiFUND v3.13.0 in the "SC validation data" folder. using MimiFUND using DataFrames @@ -44,5 +44,5 @@ for gas in specs[:gas] end end -validation_results = load(joinpath(datadir, "deterministic_sc_values.csv")) |> DataFrame -@test all(isapprox.(results[!, :SC], validation_results[!, :SC], atol = 1e-11)) \ No newline at end of file +validation_results = load(joinpath(datadir, "deterministic_sc_values_v3-13-0.csv")) |> DataFrame +@test all(isapprox.(results[!, :SC], validation_results[!, :SC], atol = 1e-10)