From e73cc81f4e4a704f56e39b87e44a5715381faed9 Mon Sep 17 00:00:00 2001 From: lrennels Date: Thu, 30 Dec 2021 13:16:51 -0800 Subject: [PATCH 1/2] Use update param instead of set param --- README.md | 2 +- .../emissions.taxmp.csv | 0 .../impactagriculture.agcbm.csv | 0 .../impactagriculture.aglparl.csv | 0 .../impactagriculture.aglparq.csv | 0 .../impactagriculture.agrbm.csv | 0 .../impactagriculture.agtime.csv | 0 .../impactbiodiversity.valinc.csv | 0 ...impactcardiovascularrespiratory.ccmlbm.csv | 0 ...impactcardiovascularrespiratory.ccmqbm.csv | 0 ...impactcardiovascularrespiratory.ccplbm.csv | 0 ...impactcardiovascularrespiratory.ccpqbm.csv | 0 ...impactcardiovascularrespiratory.chmlbm.csv | 0 ...impactcardiovascularrespiratory.chmqbm.csv | 0 ...impactcardiovascularrespiratory.chplbm.csv | 0 ...impactcardiovascularrespiratory.chpqbm.csv | 0 .../impactcardiovascularrespiratory.rlbm.csv | 0 .../impactcardiovascularrespiratory.rqbm.csv | 0 .../impactcooling.cebm.csv | 0 .../impactforests.forbm.csv | 0 .../impactheating.hebm.csv | 0 .../impactsealevelrise.dlbm.csv | 0 .../impactsealevelrise.drylandlossparam.csv | 0 .../impactsealevelrise.migrate.csv | 0 .../impactsealevelrise.pc.csv | 0 .../impactsealevelrise.wlbm.csv | 0 .../impactsealevelrise.wmbm.csv | 0 .../impactvectorbornediseases.dfch.csv | 0 .../impactvectorbornediseases.malch.csv | 0 .../impactvectorbornediseases.smch.csv | 0 .../impactwaterresources.wrbm.csv | 0 .../scenariouncertainty.aceiadd.csv | 0 .../scenariouncertainty.aeeiadd.csv | 0 .../scenariouncertainty.ecgradd.csv | 0 .../scenariouncertainty.foremadd.csv | 0 .../scenariouncertainty.pgadd.csv | 0 data/{ => shared_parameters}/bregtmp.csv | 0 data/{ => shared_parameters}/ch4pre.csv | 0 data/{ => shared_parameters}/co2pre.csv | 0 data/{ => shared_parameters}/dbsta.csv | 0 data/{ => shared_parameters}/gdp90.csv | 0 data/{ => shared_parameters}/n2opre.csv | 0 data/{ => shared_parameters}/nospecbase.csv | 0 data/{ => shared_parameters}/plus90.csv | 0 data/{ => shared_parameters}/pop90.csv | 0 data/{ => shared_parameters}/sf6pre.csv | 0 .../climateco2cycle-cbox10.csv} | 0 .../climateco2cycle-cbox20.csv} | 0 .../climateco2cycle-cbox30.csv} | 0 .../climateco2cycle-cbox40.csv} | 0 .../climateco2cycle-cbox50.csv} | 0 .../climatedynamics-lifetempconst.csv} | 0 .../climatedynamics-lifetemplin.csv} | 0 .../climatedynamics-lifetempqd.csv} | 0 .../climateforcing-rfso2.csv} | 0 .../climateregional-bregstmp.csv} | 0 .../climateregional-bregtmp.csv | 17 +++++ .../climateregional-scentemp.csv} | 0 .../emissions-ch4em.csv} | 0 .../emissions-ch4par1.csv} | 0 .../emissions-ch4par2.csv} | 0 .../emissions-currtax.csv} | 0 .../emissions-currtaxch4.csv} | 0 .../emissions-currtaxn2o.csv} | 0 .../emissions-emissint0.csv} | 0 .../emissions-n2oem.csv} | 0 .../emissions-n2opar1.csv} | 0 .../emissions-n2opar2.csv} | 0 .../emissions-sf60.csv} | 0 .../emissions-taxmp.csv} | 0 .../geography-area0.csv} | 0 .../impactaggregation-eloss_other.csv} | 0 .../impactaggregation-sloss_other.csv} | 0 .../impactagriculture-agcbm.csv} | 0 .../impactagriculture-aglparl.csv} | 0 .../impactagriculture-aglparq.csv} | 0 .../impactagriculture-agrbm.csv} | 0 .../impactagriculture-agrish0.csv} | 0 .../impactagriculture-agtime.csv} | 0 .../impactbiodiversity-valinc.csv} | 0 ...tcardiovascularrespiratory-cardvasc90.csv} | 0 ...mpactcardiovascularrespiratory-ccmlbm.csv} | 0 ...mpactcardiovascularrespiratory-ccmqbm.csv} | 0 ...mpactcardiovascularrespiratory-ccplbm.csv} | 0 ...mpactcardiovascularrespiratory-ccpqbm.csv} | 0 ...mpactcardiovascularrespiratory-chmlbm.csv} | 0 ...mpactcardiovascularrespiratory-chmqbm.csv} | 0 ...mpactcardiovascularrespiratory-chplbm.csv} | 0 ...mpactcardiovascularrespiratory-chpqbm.csv} | 0 ...mpactcardiovascularrespiratory-resp90.csv} | 0 .../impactcardiovascularrespiratory-rlbm.csv} | 0 .../impactcardiovascularrespiratory-rqbm.csv} | 0 .../impactcooling-cebm.csv} | 0 .../impactdeathmorbidity-d2dc.csv} | 0 .../impactdeathmorbidity-d2dd.csv} | 0 .../impactdeathmorbidity-d2dm.csv} | 0 .../impactdeathmorbidity-d2dr.csv} | 0 .../impactdeathmorbidity-d2ds.csv} | 0 .../impactdeathmorbidity-d2lc.csv} | 0 .../impactdeathmorbidity-d2ld.csv} | 0 .../impactdeathmorbidity-d2lm.csv} | 0 .../impactdeathmorbidity-d2lr.csv} | 0 .../impactdeathmorbidity-d2ls.csv} | 0 .../impactdeathmorbidity-dead_other.csv} | 0 .../impactdeathmorbidity-sick_other.csv} | 0 .../impactdiarrhoea-diamort.csv} | 0 .../impactdiarrhoea-diayld.csv} | 0 .../impactdiarrhoea-temp90.csv} | 0 ...icalstorms-extratropicalstormsbasedam.csv} | 0 ...calstorms-extratropicalstormsbasedead.csv} | 0 ...tropicalstorms-extratropicalstormspar.csv} | 0 .../impactforests-forbm.csv} | 0 .../impactheating-hebm.csv} | 0 .../impactsealevelrise-coastpd.csv} | 0 .../impactsealevelrise-dlbm.csv} | 0 .../impactsealevelrise-drylandlossparam.csv} | 0 .../impactsealevelrise-maxlandloss.csv} | 0 .../impactsealevelrise-migrate.csv} | 0 .../impactsealevelrise-pc.csv} | 0 .../impactsealevelrise-slrprtp.csv} | 0 .../impactsealevelrise-wetland90.csv} | 0 .../impactsealevelrise-wetmax.csv} | 0 .../impactsealevelrise-wlbm.csv} | 0 .../impactsealevelrise-wmbm.csv} | 0 .../impacttropicalstorms-hurrbasedam.csv} | 0 .../impacttropicalstorms-hurrbasedead.csv} | 0 .../impactvectorbornediseases-dfbs.csv} | 0 .../impactvectorbornediseases-dfch.csv} | 0 .../impactvectorbornediseases-malbs.csv} | 0 .../impactvectorbornediseases-malch.csv} | 0 .../impactvectorbornediseases-smbs.csv} | 0 .../impactvectorbornediseases-smch.csv} | 0 .../impactwaterresources-wrbm.csv} | 0 .../population-pop0.csv} | 0 .../scenariouncertainty-aceiadd.csv} | 0 .../scenariouncertainty-aeeiadd.csv} | 0 .../scenariouncertainty-ecgradd.csv} | 0 .../scenariouncertainty-foremadd.csv} | 0 .../scenariouncertainty-pgadd.csv} | 0 .../scenariouncertainty-scenacei.csv} | 0 .../scenariouncertainty-scenaeei.csv} | 0 .../scenariouncertainty-scenforestemm.csv} | 0 .../scenariouncertainty-scenpgrowth.csv} | 0 .../scenariouncertainty-scenypcgrowth.csv} | 0 .../socioeconomic-gdp0.csv} | 0 .../socioeconomic-urbcorr.csv} | 0 src/MimiFUND.jl | 71 ++++++++++++++++++- src/helper.jl | 26 +++++-- src/marginaldamage3.jl | 2 +- src/marginaldamages.jl | 2 +- src/montecarlo/defmcs.jl | 2 +- src/montecarlo/load_mcs_RVs.jl | 2 +- src/new_marginaldamages.jl | 2 +- test/runtests.jl | 2 +- 154 files changed, 112 insertions(+), 16 deletions(-) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/emissions.taxmp.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactagriculture.agcbm.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactagriculture.aglparl.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactagriculture.aglparq.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactagriculture.agrbm.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactagriculture.agtime.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactbiodiversity.valinc.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactcardiovascularrespiratory.ccmlbm.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactcardiovascularrespiratory.ccmqbm.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactcardiovascularrespiratory.ccplbm.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactcardiovascularrespiratory.ccpqbm.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactcardiovascularrespiratory.chmlbm.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactcardiovascularrespiratory.chmqbm.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactcardiovascularrespiratory.chplbm.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactcardiovascularrespiratory.chpqbm.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactcardiovascularrespiratory.rlbm.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactcardiovascularrespiratory.rqbm.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactcooling.cebm.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactforests.forbm.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactheating.hebm.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactsealevelrise.dlbm.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactsealevelrise.drylandlossparam.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactsealevelrise.migrate.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactsealevelrise.pc.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactsealevelrise.wlbm.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactsealevelrise.wmbm.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactvectorbornediseases.dfch.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactvectorbornediseases.malch.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactvectorbornediseases.smch.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/impactwaterresources.wrbm.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/scenariouncertainty.aceiadd.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/scenariouncertainty.aeeiadd.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/scenariouncertainty.ecgradd.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/scenariouncertainty.foremadd.csv (100%) rename {data_for_load_mcs_RVs => data/data_for_load_mcs_RVs}/scenariouncertainty.pgadd.csv (100%) rename data/{ => shared_parameters}/bregtmp.csv (100%) rename data/{ => shared_parameters}/ch4pre.csv (100%) rename data/{ => shared_parameters}/co2pre.csv (100%) rename data/{ => shared_parameters}/dbsta.csv (100%) rename data/{ => shared_parameters}/gdp90.csv (100%) rename data/{ => shared_parameters}/n2opre.csv (100%) rename data/{ => shared_parameters}/nospecbase.csv (100%) rename data/{ => shared_parameters}/plus90.csv (100%) rename data/{ => shared_parameters}/pop90.csv (100%) rename data/{ => shared_parameters}/sf6pre.csv (100%) rename data/{cbox10.csv => unshared_parameters/climateco2cycle-cbox10.csv} (100%) rename data/{cbox20.csv => unshared_parameters/climateco2cycle-cbox20.csv} (100%) rename data/{cbox30.csv => unshared_parameters/climateco2cycle-cbox30.csv} (100%) rename data/{cbox40.csv => unshared_parameters/climateco2cycle-cbox40.csv} (100%) rename data/{cbox50.csv => unshared_parameters/climateco2cycle-cbox50.csv} (100%) rename data/{lifetempconst.csv => unshared_parameters/climatedynamics-lifetempconst.csv} (100%) rename data/{lifetemplin.csv => unshared_parameters/climatedynamics-lifetemplin.csv} (100%) rename data/{lifetempqd.csv => unshared_parameters/climatedynamics-lifetempqd.csv} (100%) rename data/{rfso2.csv => unshared_parameters/climateforcing-rfso2.csv} (100%) rename data/{bregstmp.csv => unshared_parameters/climateregional-bregstmp.csv} (100%) create mode 100644 data/unshared_parameters/climateregional-bregtmp.csv rename data/{currtax.csv => unshared_parameters/climateregional-scentemp.csv} (100%) rename data/{ch4em.csv => unshared_parameters/emissions-ch4em.csv} (100%) rename data/{ch4par1.csv => unshared_parameters/emissions-ch4par1.csv} (100%) rename data/{ch4par2.csv => unshared_parameters/emissions-ch4par2.csv} (100%) rename data/{currtaxch4.csv => unshared_parameters/emissions-currtax.csv} (100%) rename data/{currtaxn2o.csv => unshared_parameters/emissions-currtaxch4.csv} (100%) rename data/{dead_other.csv => unshared_parameters/emissions-currtaxn2o.csv} (100%) rename data/{emissint0.csv => unshared_parameters/emissions-emissint0.csv} (100%) rename data/{n2oem.csv => unshared_parameters/emissions-n2oem.csv} (100%) rename data/{n2opar1.csv => unshared_parameters/emissions-n2opar1.csv} (100%) rename data/{n2opar2.csv => unshared_parameters/emissions-n2opar2.csv} (100%) rename data/{sf60.csv => unshared_parameters/emissions-sf60.csv} (100%) rename data/{taxmp.csv => unshared_parameters/emissions-taxmp.csv} (100%) rename data/{area0.csv => unshared_parameters/geography-area0.csv} (100%) rename data/{eloss_other.csv => unshared_parameters/impactaggregation-eloss_other.csv} (100%) rename data/{scentemp.csv => unshared_parameters/impactaggregation-sloss_other.csv} (100%) rename data/{agcbm.csv => unshared_parameters/impactagriculture-agcbm.csv} (100%) rename data/{aglparl.csv => unshared_parameters/impactagriculture-aglparl.csv} (100%) rename data/{aglparq.csv => unshared_parameters/impactagriculture-aglparq.csv} (100%) rename data/{agrbm.csv => unshared_parameters/impactagriculture-agrbm.csv} (100%) rename data/{agrish0.csv => unshared_parameters/impactagriculture-agrish0.csv} (100%) rename data/{agtime.csv => unshared_parameters/impactagriculture-agtime.csv} (100%) rename data/{valinc.csv => unshared_parameters/impactbiodiversity-valinc.csv} (100%) rename data/{cardvasc90.csv => unshared_parameters/impactcardiovascularrespiratory-cardvasc90.csv} (100%) rename data/{ccmlbm.csv => unshared_parameters/impactcardiovascularrespiratory-ccmlbm.csv} (100%) rename data/{ccmqbm.csv => unshared_parameters/impactcardiovascularrespiratory-ccmqbm.csv} (100%) rename data/{ccplbm.csv => unshared_parameters/impactcardiovascularrespiratory-ccplbm.csv} (100%) rename data/{ccpqbm.csv => unshared_parameters/impactcardiovascularrespiratory-ccpqbm.csv} (100%) rename data/{chmlbm.csv => unshared_parameters/impactcardiovascularrespiratory-chmlbm.csv} (100%) rename data/{chmqbm.csv => unshared_parameters/impactcardiovascularrespiratory-chmqbm.csv} (100%) rename data/{chplbm.csv => unshared_parameters/impactcardiovascularrespiratory-chplbm.csv} (100%) rename data/{chpqbm.csv => unshared_parameters/impactcardiovascularrespiratory-chpqbm.csv} (100%) rename data/{resp90.csv => unshared_parameters/impactcardiovascularrespiratory-resp90.csv} (100%) rename data/{rlbm.csv => unshared_parameters/impactcardiovascularrespiratory-rlbm.csv} (100%) rename data/{rqbm.csv => unshared_parameters/impactcardiovascularrespiratory-rqbm.csv} (100%) rename data/{cebm.csv => unshared_parameters/impactcooling-cebm.csv} (100%) rename data/{d2dc.csv => unshared_parameters/impactdeathmorbidity-d2dc.csv} (100%) rename data/{d2dd.csv => unshared_parameters/impactdeathmorbidity-d2dd.csv} (100%) rename data/{d2dm.csv => unshared_parameters/impactdeathmorbidity-d2dm.csv} (100%) rename data/{d2dr.csv => unshared_parameters/impactdeathmorbidity-d2dr.csv} (100%) rename data/{d2ds.csv => unshared_parameters/impactdeathmorbidity-d2ds.csv} (100%) rename data/{d2lc.csv => unshared_parameters/impactdeathmorbidity-d2lc.csv} (100%) rename data/{d2ld.csv => unshared_parameters/impactdeathmorbidity-d2ld.csv} (100%) rename data/{d2lm.csv => unshared_parameters/impactdeathmorbidity-d2lm.csv} (100%) rename data/{d2lr.csv => unshared_parameters/impactdeathmorbidity-d2lr.csv} (100%) rename data/{d2ls.csv => unshared_parameters/impactdeathmorbidity-d2ls.csv} (100%) rename data/{sick_other.csv => unshared_parameters/impactdeathmorbidity-dead_other.csv} (100%) rename data/{sloss_other.csv => unshared_parameters/impactdeathmorbidity-sick_other.csv} (100%) rename data/{diamort.csv => unshared_parameters/impactdiarrhoea-diamort.csv} (100%) rename data/{diayld.csv => unshared_parameters/impactdiarrhoea-diayld.csv} (100%) rename data/{temp90.csv => unshared_parameters/impactdiarrhoea-temp90.csv} (100%) rename data/{extratropicalstormsbasedam.csv => unshared_parameters/impactextratropicalstorms-extratropicalstormsbasedam.csv} (100%) rename data/{extratropicalstormsbasedead.csv => unshared_parameters/impactextratropicalstorms-extratropicalstormsbasedead.csv} (100%) rename data/{extratropicalstormspar.csv => unshared_parameters/impactextratropicalstorms-extratropicalstormspar.csv} (100%) rename data/{forbm.csv => unshared_parameters/impactforests-forbm.csv} (100%) rename data/{hebm.csv => unshared_parameters/impactheating-hebm.csv} (100%) rename data/{coastpd.csv => unshared_parameters/impactsealevelrise-coastpd.csv} (100%) rename data/{dlbm.csv => unshared_parameters/impactsealevelrise-dlbm.csv} (100%) rename data/{drylandlossparam.csv => unshared_parameters/impactsealevelrise-drylandlossparam.csv} (100%) rename data/{maxlandloss.csv => unshared_parameters/impactsealevelrise-maxlandloss.csv} (100%) rename data/{migrate.csv => unshared_parameters/impactsealevelrise-migrate.csv} (100%) rename data/{pc.csv => unshared_parameters/impactsealevelrise-pc.csv} (100%) rename data/{slrprtp.csv => unshared_parameters/impactsealevelrise-slrprtp.csv} (100%) rename data/{wetland90.csv => unshared_parameters/impactsealevelrise-wetland90.csv} (100%) rename data/{wetmax.csv => unshared_parameters/impactsealevelrise-wetmax.csv} (100%) rename data/{wlbm.csv => unshared_parameters/impactsealevelrise-wlbm.csv} (100%) rename data/{wmbm.csv => unshared_parameters/impactsealevelrise-wmbm.csv} (100%) rename data/{hurrbasedam.csv => unshared_parameters/impacttropicalstorms-hurrbasedam.csv} (100%) rename data/{hurrbasedead.csv => unshared_parameters/impacttropicalstorms-hurrbasedead.csv} (100%) rename data/{dfbs.csv => unshared_parameters/impactvectorbornediseases-dfbs.csv} (100%) rename data/{dfch.csv => unshared_parameters/impactvectorbornediseases-dfch.csv} (100%) rename data/{malbs.csv => unshared_parameters/impactvectorbornediseases-malbs.csv} (100%) rename data/{malch.csv => unshared_parameters/impactvectorbornediseases-malch.csv} (100%) rename data/{smbs.csv => unshared_parameters/impactvectorbornediseases-smbs.csv} (100%) rename data/{smch.csv => unshared_parameters/impactvectorbornediseases-smch.csv} (100%) rename data/{wrbm.csv => unshared_parameters/impactwaterresources-wrbm.csv} (100%) rename data/{pop0.csv => unshared_parameters/population-pop0.csv} (100%) rename data/{aceiadd.csv => unshared_parameters/scenariouncertainty-aceiadd.csv} (100%) rename data/{aeeiadd.csv => unshared_parameters/scenariouncertainty-aeeiadd.csv} (100%) rename data/{ecgradd.csv => unshared_parameters/scenariouncertainty-ecgradd.csv} (100%) rename data/{foremadd.csv => unshared_parameters/scenariouncertainty-foremadd.csv} (100%) rename data/{pgadd.csv => unshared_parameters/scenariouncertainty-pgadd.csv} (100%) rename data/{scenacei.csv => unshared_parameters/scenariouncertainty-scenacei.csv} (100%) rename data/{scenaeei.csv => unshared_parameters/scenariouncertainty-scenaeei.csv} (100%) rename data/{scenforestemm.csv => unshared_parameters/scenariouncertainty-scenforestemm.csv} (100%) rename data/{scenpgrowth.csv => unshared_parameters/scenariouncertainty-scenpgrowth.csv} (100%) rename data/{scenypcgrowth.csv => unshared_parameters/scenariouncertainty-scenypcgrowth.csv} (100%) rename data/{gdp0.csv => unshared_parameters/socioeconomic-gdp0.csv} (100%) rename data/{urbcorr.csv => unshared_parameters/socioeconomic-urbcorr.csv} (100%) diff --git a/README.md b/README.md index 19affe18..46150fcc 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ scc = MimiFUND.compute_scco2(year = 2020, eta = 0., prtp = 0.03, equity_weights # Or, you can also compute the SC-CO2 from a modified version of a MimiFUND model: m = MimiFUND.get_model() # Get the default version of the FUND model -set_param!(m, :climatesensitivity, 5) # make any modifications to your model using Mimi +update_param!(m, :climatedynamics, :climatesensitivity, 5) # make any modifications to your model using Mimi scc = MimiFUND.compute_scco2(m, year = 2020) # Compute the SC-CO2 from your model ``` There are also functions for computing the Social Cost of CH4, N2O, and SF6: `compute_scch4`, `compute_scn2o`, and `compute_scsf6`. diff --git a/data_for_load_mcs_RVs/emissions.taxmp.csv b/data/data_for_load_mcs_RVs/emissions.taxmp.csv similarity index 100% rename from data_for_load_mcs_RVs/emissions.taxmp.csv rename to data/data_for_load_mcs_RVs/emissions.taxmp.csv diff --git a/data_for_load_mcs_RVs/impactagriculture.agcbm.csv b/data/data_for_load_mcs_RVs/impactagriculture.agcbm.csv similarity index 100% rename from data_for_load_mcs_RVs/impactagriculture.agcbm.csv rename to data/data_for_load_mcs_RVs/impactagriculture.agcbm.csv diff --git a/data_for_load_mcs_RVs/impactagriculture.aglparl.csv b/data/data_for_load_mcs_RVs/impactagriculture.aglparl.csv similarity index 100% rename from data_for_load_mcs_RVs/impactagriculture.aglparl.csv rename to data/data_for_load_mcs_RVs/impactagriculture.aglparl.csv diff --git a/data_for_load_mcs_RVs/impactagriculture.aglparq.csv b/data/data_for_load_mcs_RVs/impactagriculture.aglparq.csv similarity index 100% rename from data_for_load_mcs_RVs/impactagriculture.aglparq.csv rename to data/data_for_load_mcs_RVs/impactagriculture.aglparq.csv diff --git a/data_for_load_mcs_RVs/impactagriculture.agrbm.csv b/data/data_for_load_mcs_RVs/impactagriculture.agrbm.csv similarity index 100% rename from data_for_load_mcs_RVs/impactagriculture.agrbm.csv rename to data/data_for_load_mcs_RVs/impactagriculture.agrbm.csv diff --git a/data_for_load_mcs_RVs/impactagriculture.agtime.csv b/data/data_for_load_mcs_RVs/impactagriculture.agtime.csv similarity index 100% rename from data_for_load_mcs_RVs/impactagriculture.agtime.csv rename to data/data_for_load_mcs_RVs/impactagriculture.agtime.csv diff --git a/data_for_load_mcs_RVs/impactbiodiversity.valinc.csv b/data/data_for_load_mcs_RVs/impactbiodiversity.valinc.csv similarity index 100% rename from data_for_load_mcs_RVs/impactbiodiversity.valinc.csv rename to data/data_for_load_mcs_RVs/impactbiodiversity.valinc.csv diff --git a/data_for_load_mcs_RVs/impactcardiovascularrespiratory.ccmlbm.csv b/data/data_for_load_mcs_RVs/impactcardiovascularrespiratory.ccmlbm.csv similarity index 100% rename from data_for_load_mcs_RVs/impactcardiovascularrespiratory.ccmlbm.csv rename to data/data_for_load_mcs_RVs/impactcardiovascularrespiratory.ccmlbm.csv diff --git a/data_for_load_mcs_RVs/impactcardiovascularrespiratory.ccmqbm.csv b/data/data_for_load_mcs_RVs/impactcardiovascularrespiratory.ccmqbm.csv similarity index 100% rename from data_for_load_mcs_RVs/impactcardiovascularrespiratory.ccmqbm.csv rename to data/data_for_load_mcs_RVs/impactcardiovascularrespiratory.ccmqbm.csv diff --git a/data_for_load_mcs_RVs/impactcardiovascularrespiratory.ccplbm.csv b/data/data_for_load_mcs_RVs/impactcardiovascularrespiratory.ccplbm.csv similarity index 100% rename from data_for_load_mcs_RVs/impactcardiovascularrespiratory.ccplbm.csv rename to data/data_for_load_mcs_RVs/impactcardiovascularrespiratory.ccplbm.csv diff --git a/data_for_load_mcs_RVs/impactcardiovascularrespiratory.ccpqbm.csv b/data/data_for_load_mcs_RVs/impactcardiovascularrespiratory.ccpqbm.csv similarity index 100% rename from data_for_load_mcs_RVs/impactcardiovascularrespiratory.ccpqbm.csv rename to data/data_for_load_mcs_RVs/impactcardiovascularrespiratory.ccpqbm.csv diff --git a/data_for_load_mcs_RVs/impactcardiovascularrespiratory.chmlbm.csv b/data/data_for_load_mcs_RVs/impactcardiovascularrespiratory.chmlbm.csv similarity index 100% rename from data_for_load_mcs_RVs/impactcardiovascularrespiratory.chmlbm.csv rename to data/data_for_load_mcs_RVs/impactcardiovascularrespiratory.chmlbm.csv diff --git a/data_for_load_mcs_RVs/impactcardiovascularrespiratory.chmqbm.csv b/data/data_for_load_mcs_RVs/impactcardiovascularrespiratory.chmqbm.csv similarity index 100% rename from data_for_load_mcs_RVs/impactcardiovascularrespiratory.chmqbm.csv rename to data/data_for_load_mcs_RVs/impactcardiovascularrespiratory.chmqbm.csv diff --git a/data_for_load_mcs_RVs/impactcardiovascularrespiratory.chplbm.csv b/data/data_for_load_mcs_RVs/impactcardiovascularrespiratory.chplbm.csv similarity index 100% rename from data_for_load_mcs_RVs/impactcardiovascularrespiratory.chplbm.csv rename to data/data_for_load_mcs_RVs/impactcardiovascularrespiratory.chplbm.csv diff --git a/data_for_load_mcs_RVs/impactcardiovascularrespiratory.chpqbm.csv b/data/data_for_load_mcs_RVs/impactcardiovascularrespiratory.chpqbm.csv similarity index 100% rename from data_for_load_mcs_RVs/impactcardiovascularrespiratory.chpqbm.csv rename to data/data_for_load_mcs_RVs/impactcardiovascularrespiratory.chpqbm.csv diff --git a/data_for_load_mcs_RVs/impactcardiovascularrespiratory.rlbm.csv b/data/data_for_load_mcs_RVs/impactcardiovascularrespiratory.rlbm.csv similarity index 100% rename from data_for_load_mcs_RVs/impactcardiovascularrespiratory.rlbm.csv rename to data/data_for_load_mcs_RVs/impactcardiovascularrespiratory.rlbm.csv diff --git a/data_for_load_mcs_RVs/impactcardiovascularrespiratory.rqbm.csv b/data/data_for_load_mcs_RVs/impactcardiovascularrespiratory.rqbm.csv similarity index 100% rename from data_for_load_mcs_RVs/impactcardiovascularrespiratory.rqbm.csv rename to data/data_for_load_mcs_RVs/impactcardiovascularrespiratory.rqbm.csv diff --git a/data_for_load_mcs_RVs/impactcooling.cebm.csv b/data/data_for_load_mcs_RVs/impactcooling.cebm.csv similarity index 100% rename from data_for_load_mcs_RVs/impactcooling.cebm.csv rename to data/data_for_load_mcs_RVs/impactcooling.cebm.csv diff --git a/data_for_load_mcs_RVs/impactforests.forbm.csv b/data/data_for_load_mcs_RVs/impactforests.forbm.csv similarity index 100% rename from data_for_load_mcs_RVs/impactforests.forbm.csv rename to data/data_for_load_mcs_RVs/impactforests.forbm.csv diff --git a/data_for_load_mcs_RVs/impactheating.hebm.csv b/data/data_for_load_mcs_RVs/impactheating.hebm.csv similarity index 100% rename from data_for_load_mcs_RVs/impactheating.hebm.csv rename to data/data_for_load_mcs_RVs/impactheating.hebm.csv diff --git a/data_for_load_mcs_RVs/impactsealevelrise.dlbm.csv b/data/data_for_load_mcs_RVs/impactsealevelrise.dlbm.csv similarity index 100% rename from data_for_load_mcs_RVs/impactsealevelrise.dlbm.csv rename to data/data_for_load_mcs_RVs/impactsealevelrise.dlbm.csv diff --git a/data_for_load_mcs_RVs/impactsealevelrise.drylandlossparam.csv b/data/data_for_load_mcs_RVs/impactsealevelrise.drylandlossparam.csv similarity index 100% rename from data_for_load_mcs_RVs/impactsealevelrise.drylandlossparam.csv rename to data/data_for_load_mcs_RVs/impactsealevelrise.drylandlossparam.csv diff --git a/data_for_load_mcs_RVs/impactsealevelrise.migrate.csv b/data/data_for_load_mcs_RVs/impactsealevelrise.migrate.csv similarity index 100% rename from data_for_load_mcs_RVs/impactsealevelrise.migrate.csv rename to data/data_for_load_mcs_RVs/impactsealevelrise.migrate.csv diff --git a/data_for_load_mcs_RVs/impactsealevelrise.pc.csv b/data/data_for_load_mcs_RVs/impactsealevelrise.pc.csv similarity index 100% rename from data_for_load_mcs_RVs/impactsealevelrise.pc.csv rename to data/data_for_load_mcs_RVs/impactsealevelrise.pc.csv diff --git a/data_for_load_mcs_RVs/impactsealevelrise.wlbm.csv b/data/data_for_load_mcs_RVs/impactsealevelrise.wlbm.csv similarity index 100% rename from data_for_load_mcs_RVs/impactsealevelrise.wlbm.csv rename to data/data_for_load_mcs_RVs/impactsealevelrise.wlbm.csv diff --git a/data_for_load_mcs_RVs/impactsealevelrise.wmbm.csv b/data/data_for_load_mcs_RVs/impactsealevelrise.wmbm.csv similarity index 100% rename from data_for_load_mcs_RVs/impactsealevelrise.wmbm.csv rename to data/data_for_load_mcs_RVs/impactsealevelrise.wmbm.csv diff --git a/data_for_load_mcs_RVs/impactvectorbornediseases.dfch.csv b/data/data_for_load_mcs_RVs/impactvectorbornediseases.dfch.csv similarity index 100% rename from data_for_load_mcs_RVs/impactvectorbornediseases.dfch.csv rename to data/data_for_load_mcs_RVs/impactvectorbornediseases.dfch.csv diff --git a/data_for_load_mcs_RVs/impactvectorbornediseases.malch.csv b/data/data_for_load_mcs_RVs/impactvectorbornediseases.malch.csv similarity index 100% rename from data_for_load_mcs_RVs/impactvectorbornediseases.malch.csv rename to data/data_for_load_mcs_RVs/impactvectorbornediseases.malch.csv diff --git a/data_for_load_mcs_RVs/impactvectorbornediseases.smch.csv b/data/data_for_load_mcs_RVs/impactvectorbornediseases.smch.csv similarity index 100% rename from data_for_load_mcs_RVs/impactvectorbornediseases.smch.csv rename to data/data_for_load_mcs_RVs/impactvectorbornediseases.smch.csv diff --git a/data_for_load_mcs_RVs/impactwaterresources.wrbm.csv b/data/data_for_load_mcs_RVs/impactwaterresources.wrbm.csv similarity index 100% rename from data_for_load_mcs_RVs/impactwaterresources.wrbm.csv rename to data/data_for_load_mcs_RVs/impactwaterresources.wrbm.csv diff --git a/data_for_load_mcs_RVs/scenariouncertainty.aceiadd.csv b/data/data_for_load_mcs_RVs/scenariouncertainty.aceiadd.csv similarity index 100% rename from data_for_load_mcs_RVs/scenariouncertainty.aceiadd.csv rename to data/data_for_load_mcs_RVs/scenariouncertainty.aceiadd.csv diff --git a/data_for_load_mcs_RVs/scenariouncertainty.aeeiadd.csv b/data/data_for_load_mcs_RVs/scenariouncertainty.aeeiadd.csv similarity index 100% rename from data_for_load_mcs_RVs/scenariouncertainty.aeeiadd.csv rename to data/data_for_load_mcs_RVs/scenariouncertainty.aeeiadd.csv diff --git a/data_for_load_mcs_RVs/scenariouncertainty.ecgradd.csv b/data/data_for_load_mcs_RVs/scenariouncertainty.ecgradd.csv similarity index 100% rename from data_for_load_mcs_RVs/scenariouncertainty.ecgradd.csv rename to data/data_for_load_mcs_RVs/scenariouncertainty.ecgradd.csv diff --git a/data_for_load_mcs_RVs/scenariouncertainty.foremadd.csv b/data/data_for_load_mcs_RVs/scenariouncertainty.foremadd.csv similarity index 100% rename from data_for_load_mcs_RVs/scenariouncertainty.foremadd.csv rename to data/data_for_load_mcs_RVs/scenariouncertainty.foremadd.csv diff --git a/data_for_load_mcs_RVs/scenariouncertainty.pgadd.csv b/data/data_for_load_mcs_RVs/scenariouncertainty.pgadd.csv similarity index 100% rename from data_for_load_mcs_RVs/scenariouncertainty.pgadd.csv rename to data/data_for_load_mcs_RVs/scenariouncertainty.pgadd.csv diff --git a/data/bregtmp.csv b/data/shared_parameters/bregtmp.csv similarity index 100% rename from data/bregtmp.csv rename to data/shared_parameters/bregtmp.csv diff --git a/data/ch4pre.csv b/data/shared_parameters/ch4pre.csv similarity index 100% rename from data/ch4pre.csv rename to data/shared_parameters/ch4pre.csv diff --git a/data/co2pre.csv b/data/shared_parameters/co2pre.csv similarity index 100% rename from data/co2pre.csv rename to data/shared_parameters/co2pre.csv diff --git a/data/dbsta.csv b/data/shared_parameters/dbsta.csv similarity index 100% rename from data/dbsta.csv rename to data/shared_parameters/dbsta.csv diff --git a/data/gdp90.csv b/data/shared_parameters/gdp90.csv similarity index 100% rename from data/gdp90.csv rename to data/shared_parameters/gdp90.csv diff --git a/data/n2opre.csv b/data/shared_parameters/n2opre.csv similarity index 100% rename from data/n2opre.csv rename to data/shared_parameters/n2opre.csv diff --git a/data/nospecbase.csv b/data/shared_parameters/nospecbase.csv similarity index 100% rename from data/nospecbase.csv rename to data/shared_parameters/nospecbase.csv diff --git a/data/plus90.csv b/data/shared_parameters/plus90.csv similarity index 100% rename from data/plus90.csv rename to data/shared_parameters/plus90.csv diff --git a/data/pop90.csv b/data/shared_parameters/pop90.csv similarity index 100% rename from data/pop90.csv rename to data/shared_parameters/pop90.csv diff --git a/data/sf6pre.csv b/data/shared_parameters/sf6pre.csv similarity index 100% rename from data/sf6pre.csv rename to data/shared_parameters/sf6pre.csv diff --git a/data/cbox10.csv b/data/unshared_parameters/climateco2cycle-cbox10.csv similarity index 100% rename from data/cbox10.csv rename to data/unshared_parameters/climateco2cycle-cbox10.csv diff --git a/data/cbox20.csv b/data/unshared_parameters/climateco2cycle-cbox20.csv similarity index 100% rename from data/cbox20.csv rename to data/unshared_parameters/climateco2cycle-cbox20.csv diff --git a/data/cbox30.csv b/data/unshared_parameters/climateco2cycle-cbox30.csv similarity index 100% rename from data/cbox30.csv rename to data/unshared_parameters/climateco2cycle-cbox30.csv diff --git a/data/cbox40.csv b/data/unshared_parameters/climateco2cycle-cbox40.csv similarity index 100% rename from data/cbox40.csv rename to data/unshared_parameters/climateco2cycle-cbox40.csv diff --git a/data/cbox50.csv b/data/unshared_parameters/climateco2cycle-cbox50.csv similarity index 100% rename from data/cbox50.csv rename to data/unshared_parameters/climateco2cycle-cbox50.csv diff --git a/data/lifetempconst.csv b/data/unshared_parameters/climatedynamics-lifetempconst.csv similarity index 100% rename from data/lifetempconst.csv rename to data/unshared_parameters/climatedynamics-lifetempconst.csv diff --git a/data/lifetemplin.csv b/data/unshared_parameters/climatedynamics-lifetemplin.csv similarity index 100% rename from data/lifetemplin.csv rename to data/unshared_parameters/climatedynamics-lifetemplin.csv diff --git a/data/lifetempqd.csv b/data/unshared_parameters/climatedynamics-lifetempqd.csv similarity index 100% rename from data/lifetempqd.csv rename to data/unshared_parameters/climatedynamics-lifetempqd.csv diff --git a/data/rfso2.csv b/data/unshared_parameters/climateforcing-rfso2.csv similarity index 100% rename from data/rfso2.csv rename to data/unshared_parameters/climateforcing-rfso2.csv diff --git a/data/bregstmp.csv b/data/unshared_parameters/climateregional-bregstmp.csv similarity index 100% rename from data/bregstmp.csv rename to data/unshared_parameters/climateregional-bregstmp.csv diff --git a/data/unshared_parameters/climateregional-bregtmp.csv b/data/unshared_parameters/climateregional-bregtmp.csv new file mode 100644 index 00000000..3a23c14f --- /dev/null +++ b/data/unshared_parameters/climateregional-bregtmp.csv @@ -0,0 +1,17 @@ +# FUND scenario +USA,1.1941 +CAN,1.4712 +WEU,1.1248 +JPK,1.0555 +ANZ,0.9676 +EEU,1.1676 +FSU,1.2866 +MDE,1.1546 +CAM,0.8804 +LAM,0.8504 +SAS,0.9074 +SEA,0.7098 +CHI,1.1847 +MAF,1.143 +SSA,0.878 +SIS,0.7517 diff --git a/data/currtax.csv b/data/unshared_parameters/climateregional-scentemp.csv similarity index 100% rename from data/currtax.csv rename to data/unshared_parameters/climateregional-scentemp.csv diff --git a/data/ch4em.csv b/data/unshared_parameters/emissions-ch4em.csv similarity index 100% rename from data/ch4em.csv rename to data/unshared_parameters/emissions-ch4em.csv diff --git a/data/ch4par1.csv b/data/unshared_parameters/emissions-ch4par1.csv similarity index 100% rename from data/ch4par1.csv rename to data/unshared_parameters/emissions-ch4par1.csv diff --git a/data/ch4par2.csv b/data/unshared_parameters/emissions-ch4par2.csv similarity index 100% rename from data/ch4par2.csv rename to data/unshared_parameters/emissions-ch4par2.csv diff --git a/data/currtaxch4.csv b/data/unshared_parameters/emissions-currtax.csv similarity index 100% rename from data/currtaxch4.csv rename to data/unshared_parameters/emissions-currtax.csv diff --git a/data/currtaxn2o.csv b/data/unshared_parameters/emissions-currtaxch4.csv similarity index 100% rename from data/currtaxn2o.csv rename to data/unshared_parameters/emissions-currtaxch4.csv diff --git a/data/dead_other.csv b/data/unshared_parameters/emissions-currtaxn2o.csv similarity index 100% rename from data/dead_other.csv rename to data/unshared_parameters/emissions-currtaxn2o.csv diff --git a/data/emissint0.csv b/data/unshared_parameters/emissions-emissint0.csv similarity index 100% rename from data/emissint0.csv rename to data/unshared_parameters/emissions-emissint0.csv diff --git a/data/n2oem.csv b/data/unshared_parameters/emissions-n2oem.csv similarity index 100% rename from data/n2oem.csv rename to data/unshared_parameters/emissions-n2oem.csv diff --git a/data/n2opar1.csv b/data/unshared_parameters/emissions-n2opar1.csv similarity index 100% rename from data/n2opar1.csv rename to data/unshared_parameters/emissions-n2opar1.csv diff --git a/data/n2opar2.csv b/data/unshared_parameters/emissions-n2opar2.csv similarity index 100% rename from data/n2opar2.csv rename to data/unshared_parameters/emissions-n2opar2.csv diff --git a/data/sf60.csv b/data/unshared_parameters/emissions-sf60.csv similarity index 100% rename from data/sf60.csv rename to data/unshared_parameters/emissions-sf60.csv diff --git a/data/taxmp.csv b/data/unshared_parameters/emissions-taxmp.csv similarity index 100% rename from data/taxmp.csv rename to data/unshared_parameters/emissions-taxmp.csv diff --git a/data/area0.csv b/data/unshared_parameters/geography-area0.csv similarity index 100% rename from data/area0.csv rename to data/unshared_parameters/geography-area0.csv diff --git a/data/eloss_other.csv b/data/unshared_parameters/impactaggregation-eloss_other.csv similarity index 100% rename from data/eloss_other.csv rename to data/unshared_parameters/impactaggregation-eloss_other.csv diff --git a/data/scentemp.csv b/data/unshared_parameters/impactaggregation-sloss_other.csv similarity index 100% rename from data/scentemp.csv rename to data/unshared_parameters/impactaggregation-sloss_other.csv diff --git a/data/agcbm.csv b/data/unshared_parameters/impactagriculture-agcbm.csv similarity index 100% rename from data/agcbm.csv rename to data/unshared_parameters/impactagriculture-agcbm.csv diff --git a/data/aglparl.csv b/data/unshared_parameters/impactagriculture-aglparl.csv similarity index 100% rename from data/aglparl.csv rename to data/unshared_parameters/impactagriculture-aglparl.csv diff --git a/data/aglparq.csv b/data/unshared_parameters/impactagriculture-aglparq.csv similarity index 100% rename from data/aglparq.csv rename to data/unshared_parameters/impactagriculture-aglparq.csv diff --git a/data/agrbm.csv b/data/unshared_parameters/impactagriculture-agrbm.csv similarity index 100% rename from data/agrbm.csv rename to data/unshared_parameters/impactagriculture-agrbm.csv diff --git a/data/agrish0.csv b/data/unshared_parameters/impactagriculture-agrish0.csv similarity index 100% rename from data/agrish0.csv rename to data/unshared_parameters/impactagriculture-agrish0.csv diff --git a/data/agtime.csv b/data/unshared_parameters/impactagriculture-agtime.csv similarity index 100% rename from data/agtime.csv rename to data/unshared_parameters/impactagriculture-agtime.csv diff --git a/data/valinc.csv b/data/unshared_parameters/impactbiodiversity-valinc.csv similarity index 100% rename from data/valinc.csv rename to data/unshared_parameters/impactbiodiversity-valinc.csv diff --git a/data/cardvasc90.csv b/data/unshared_parameters/impactcardiovascularrespiratory-cardvasc90.csv similarity index 100% rename from data/cardvasc90.csv rename to data/unshared_parameters/impactcardiovascularrespiratory-cardvasc90.csv diff --git a/data/ccmlbm.csv b/data/unshared_parameters/impactcardiovascularrespiratory-ccmlbm.csv similarity index 100% rename from data/ccmlbm.csv rename to data/unshared_parameters/impactcardiovascularrespiratory-ccmlbm.csv diff --git a/data/ccmqbm.csv b/data/unshared_parameters/impactcardiovascularrespiratory-ccmqbm.csv similarity index 100% rename from data/ccmqbm.csv rename to data/unshared_parameters/impactcardiovascularrespiratory-ccmqbm.csv diff --git a/data/ccplbm.csv b/data/unshared_parameters/impactcardiovascularrespiratory-ccplbm.csv similarity index 100% rename from data/ccplbm.csv rename to data/unshared_parameters/impactcardiovascularrespiratory-ccplbm.csv diff --git a/data/ccpqbm.csv b/data/unshared_parameters/impactcardiovascularrespiratory-ccpqbm.csv similarity index 100% rename from data/ccpqbm.csv rename to data/unshared_parameters/impactcardiovascularrespiratory-ccpqbm.csv diff --git a/data/chmlbm.csv b/data/unshared_parameters/impactcardiovascularrespiratory-chmlbm.csv similarity index 100% rename from data/chmlbm.csv rename to data/unshared_parameters/impactcardiovascularrespiratory-chmlbm.csv diff --git a/data/chmqbm.csv b/data/unshared_parameters/impactcardiovascularrespiratory-chmqbm.csv similarity index 100% rename from data/chmqbm.csv rename to data/unshared_parameters/impactcardiovascularrespiratory-chmqbm.csv diff --git a/data/chplbm.csv b/data/unshared_parameters/impactcardiovascularrespiratory-chplbm.csv similarity index 100% rename from data/chplbm.csv rename to data/unshared_parameters/impactcardiovascularrespiratory-chplbm.csv diff --git a/data/chpqbm.csv b/data/unshared_parameters/impactcardiovascularrespiratory-chpqbm.csv similarity index 100% rename from data/chpqbm.csv rename to data/unshared_parameters/impactcardiovascularrespiratory-chpqbm.csv diff --git a/data/resp90.csv b/data/unshared_parameters/impactcardiovascularrespiratory-resp90.csv similarity index 100% rename from data/resp90.csv rename to data/unshared_parameters/impactcardiovascularrespiratory-resp90.csv diff --git a/data/rlbm.csv b/data/unshared_parameters/impactcardiovascularrespiratory-rlbm.csv similarity index 100% rename from data/rlbm.csv rename to data/unshared_parameters/impactcardiovascularrespiratory-rlbm.csv diff --git a/data/rqbm.csv b/data/unshared_parameters/impactcardiovascularrespiratory-rqbm.csv similarity index 100% rename from data/rqbm.csv rename to data/unshared_parameters/impactcardiovascularrespiratory-rqbm.csv diff --git a/data/cebm.csv b/data/unshared_parameters/impactcooling-cebm.csv similarity index 100% rename from data/cebm.csv rename to data/unshared_parameters/impactcooling-cebm.csv diff --git a/data/d2dc.csv b/data/unshared_parameters/impactdeathmorbidity-d2dc.csv similarity index 100% rename from data/d2dc.csv rename to data/unshared_parameters/impactdeathmorbidity-d2dc.csv diff --git a/data/d2dd.csv b/data/unshared_parameters/impactdeathmorbidity-d2dd.csv similarity index 100% rename from data/d2dd.csv rename to data/unshared_parameters/impactdeathmorbidity-d2dd.csv diff --git a/data/d2dm.csv b/data/unshared_parameters/impactdeathmorbidity-d2dm.csv similarity index 100% rename from data/d2dm.csv rename to data/unshared_parameters/impactdeathmorbidity-d2dm.csv diff --git a/data/d2dr.csv b/data/unshared_parameters/impactdeathmorbidity-d2dr.csv similarity index 100% rename from data/d2dr.csv rename to data/unshared_parameters/impactdeathmorbidity-d2dr.csv diff --git a/data/d2ds.csv b/data/unshared_parameters/impactdeathmorbidity-d2ds.csv similarity index 100% rename from data/d2ds.csv rename to data/unshared_parameters/impactdeathmorbidity-d2ds.csv diff --git a/data/d2lc.csv b/data/unshared_parameters/impactdeathmorbidity-d2lc.csv similarity index 100% rename from data/d2lc.csv rename to data/unshared_parameters/impactdeathmorbidity-d2lc.csv diff --git a/data/d2ld.csv b/data/unshared_parameters/impactdeathmorbidity-d2ld.csv similarity index 100% rename from data/d2ld.csv rename to data/unshared_parameters/impactdeathmorbidity-d2ld.csv diff --git a/data/d2lm.csv b/data/unshared_parameters/impactdeathmorbidity-d2lm.csv similarity index 100% rename from data/d2lm.csv rename to data/unshared_parameters/impactdeathmorbidity-d2lm.csv diff --git a/data/d2lr.csv b/data/unshared_parameters/impactdeathmorbidity-d2lr.csv similarity index 100% rename from data/d2lr.csv rename to data/unshared_parameters/impactdeathmorbidity-d2lr.csv diff --git a/data/d2ls.csv b/data/unshared_parameters/impactdeathmorbidity-d2ls.csv similarity index 100% rename from data/d2ls.csv rename to data/unshared_parameters/impactdeathmorbidity-d2ls.csv diff --git a/data/sick_other.csv b/data/unshared_parameters/impactdeathmorbidity-dead_other.csv similarity index 100% rename from data/sick_other.csv rename to data/unshared_parameters/impactdeathmorbidity-dead_other.csv diff --git a/data/sloss_other.csv b/data/unshared_parameters/impactdeathmorbidity-sick_other.csv similarity index 100% rename from data/sloss_other.csv rename to data/unshared_parameters/impactdeathmorbidity-sick_other.csv diff --git a/data/diamort.csv b/data/unshared_parameters/impactdiarrhoea-diamort.csv similarity index 100% rename from data/diamort.csv rename to data/unshared_parameters/impactdiarrhoea-diamort.csv diff --git a/data/diayld.csv b/data/unshared_parameters/impactdiarrhoea-diayld.csv similarity index 100% rename from data/diayld.csv rename to data/unshared_parameters/impactdiarrhoea-diayld.csv diff --git a/data/temp90.csv b/data/unshared_parameters/impactdiarrhoea-temp90.csv similarity index 100% rename from data/temp90.csv rename to data/unshared_parameters/impactdiarrhoea-temp90.csv diff --git a/data/extratropicalstormsbasedam.csv b/data/unshared_parameters/impactextratropicalstorms-extratropicalstormsbasedam.csv similarity index 100% rename from data/extratropicalstormsbasedam.csv rename to data/unshared_parameters/impactextratropicalstorms-extratropicalstormsbasedam.csv diff --git a/data/extratropicalstormsbasedead.csv b/data/unshared_parameters/impactextratropicalstorms-extratropicalstormsbasedead.csv similarity index 100% rename from data/extratropicalstormsbasedead.csv rename to data/unshared_parameters/impactextratropicalstorms-extratropicalstormsbasedead.csv diff --git a/data/extratropicalstormspar.csv b/data/unshared_parameters/impactextratropicalstorms-extratropicalstormspar.csv similarity index 100% rename from data/extratropicalstormspar.csv rename to data/unshared_parameters/impactextratropicalstorms-extratropicalstormspar.csv diff --git a/data/forbm.csv b/data/unshared_parameters/impactforests-forbm.csv similarity index 100% rename from data/forbm.csv rename to data/unshared_parameters/impactforests-forbm.csv diff --git a/data/hebm.csv b/data/unshared_parameters/impactheating-hebm.csv similarity index 100% rename from data/hebm.csv rename to data/unshared_parameters/impactheating-hebm.csv diff --git a/data/coastpd.csv b/data/unshared_parameters/impactsealevelrise-coastpd.csv similarity index 100% rename from data/coastpd.csv rename to data/unshared_parameters/impactsealevelrise-coastpd.csv diff --git a/data/dlbm.csv b/data/unshared_parameters/impactsealevelrise-dlbm.csv similarity index 100% rename from data/dlbm.csv rename to data/unshared_parameters/impactsealevelrise-dlbm.csv diff --git a/data/drylandlossparam.csv b/data/unshared_parameters/impactsealevelrise-drylandlossparam.csv similarity index 100% rename from data/drylandlossparam.csv rename to data/unshared_parameters/impactsealevelrise-drylandlossparam.csv diff --git a/data/maxlandloss.csv b/data/unshared_parameters/impactsealevelrise-maxlandloss.csv similarity index 100% rename from data/maxlandloss.csv rename to data/unshared_parameters/impactsealevelrise-maxlandloss.csv diff --git a/data/migrate.csv b/data/unshared_parameters/impactsealevelrise-migrate.csv similarity index 100% rename from data/migrate.csv rename to data/unshared_parameters/impactsealevelrise-migrate.csv diff --git a/data/pc.csv b/data/unshared_parameters/impactsealevelrise-pc.csv similarity index 100% rename from data/pc.csv rename to data/unshared_parameters/impactsealevelrise-pc.csv diff --git a/data/slrprtp.csv b/data/unshared_parameters/impactsealevelrise-slrprtp.csv similarity index 100% rename from data/slrprtp.csv rename to data/unshared_parameters/impactsealevelrise-slrprtp.csv diff --git a/data/wetland90.csv b/data/unshared_parameters/impactsealevelrise-wetland90.csv similarity index 100% rename from data/wetland90.csv rename to data/unshared_parameters/impactsealevelrise-wetland90.csv diff --git a/data/wetmax.csv b/data/unshared_parameters/impactsealevelrise-wetmax.csv similarity index 100% rename from data/wetmax.csv rename to data/unshared_parameters/impactsealevelrise-wetmax.csv diff --git a/data/wlbm.csv b/data/unshared_parameters/impactsealevelrise-wlbm.csv similarity index 100% rename from data/wlbm.csv rename to data/unshared_parameters/impactsealevelrise-wlbm.csv diff --git a/data/wmbm.csv b/data/unshared_parameters/impactsealevelrise-wmbm.csv similarity index 100% rename from data/wmbm.csv rename to data/unshared_parameters/impactsealevelrise-wmbm.csv diff --git a/data/hurrbasedam.csv b/data/unshared_parameters/impacttropicalstorms-hurrbasedam.csv similarity index 100% rename from data/hurrbasedam.csv rename to data/unshared_parameters/impacttropicalstorms-hurrbasedam.csv diff --git a/data/hurrbasedead.csv b/data/unshared_parameters/impacttropicalstorms-hurrbasedead.csv similarity index 100% rename from data/hurrbasedead.csv rename to data/unshared_parameters/impacttropicalstorms-hurrbasedead.csv diff --git a/data/dfbs.csv b/data/unshared_parameters/impactvectorbornediseases-dfbs.csv similarity index 100% rename from data/dfbs.csv rename to data/unshared_parameters/impactvectorbornediseases-dfbs.csv diff --git a/data/dfch.csv b/data/unshared_parameters/impactvectorbornediseases-dfch.csv similarity index 100% rename from data/dfch.csv rename to data/unshared_parameters/impactvectorbornediseases-dfch.csv diff --git a/data/malbs.csv b/data/unshared_parameters/impactvectorbornediseases-malbs.csv similarity index 100% rename from data/malbs.csv rename to data/unshared_parameters/impactvectorbornediseases-malbs.csv diff --git a/data/malch.csv b/data/unshared_parameters/impactvectorbornediseases-malch.csv similarity index 100% rename from data/malch.csv rename to data/unshared_parameters/impactvectorbornediseases-malch.csv diff --git a/data/smbs.csv b/data/unshared_parameters/impactvectorbornediseases-smbs.csv similarity index 100% rename from data/smbs.csv rename to data/unshared_parameters/impactvectorbornediseases-smbs.csv diff --git a/data/smch.csv b/data/unshared_parameters/impactvectorbornediseases-smch.csv similarity index 100% rename from data/smch.csv rename to data/unshared_parameters/impactvectorbornediseases-smch.csv diff --git a/data/wrbm.csv b/data/unshared_parameters/impactwaterresources-wrbm.csv similarity index 100% rename from data/wrbm.csv rename to data/unshared_parameters/impactwaterresources-wrbm.csv diff --git a/data/pop0.csv b/data/unshared_parameters/population-pop0.csv similarity index 100% rename from data/pop0.csv rename to data/unshared_parameters/population-pop0.csv diff --git a/data/aceiadd.csv b/data/unshared_parameters/scenariouncertainty-aceiadd.csv similarity index 100% rename from data/aceiadd.csv rename to data/unshared_parameters/scenariouncertainty-aceiadd.csv diff --git a/data/aeeiadd.csv b/data/unshared_parameters/scenariouncertainty-aeeiadd.csv similarity index 100% rename from data/aeeiadd.csv rename to data/unshared_parameters/scenariouncertainty-aeeiadd.csv diff --git a/data/ecgradd.csv b/data/unshared_parameters/scenariouncertainty-ecgradd.csv similarity index 100% rename from data/ecgradd.csv rename to data/unshared_parameters/scenariouncertainty-ecgradd.csv diff --git a/data/foremadd.csv b/data/unshared_parameters/scenariouncertainty-foremadd.csv similarity index 100% rename from data/foremadd.csv rename to data/unshared_parameters/scenariouncertainty-foremadd.csv diff --git a/data/pgadd.csv b/data/unshared_parameters/scenariouncertainty-pgadd.csv similarity index 100% rename from data/pgadd.csv rename to data/unshared_parameters/scenariouncertainty-pgadd.csv diff --git a/data/scenacei.csv b/data/unshared_parameters/scenariouncertainty-scenacei.csv similarity index 100% rename from data/scenacei.csv rename to data/unshared_parameters/scenariouncertainty-scenacei.csv diff --git a/data/scenaeei.csv b/data/unshared_parameters/scenariouncertainty-scenaeei.csv similarity index 100% rename from data/scenaeei.csv rename to data/unshared_parameters/scenariouncertainty-scenaeei.csv diff --git a/data/scenforestemm.csv b/data/unshared_parameters/scenariouncertainty-scenforestemm.csv similarity index 100% rename from data/scenforestemm.csv rename to data/unshared_parameters/scenariouncertainty-scenforestemm.csv diff --git a/data/scenpgrowth.csv b/data/unshared_parameters/scenariouncertainty-scenpgrowth.csv similarity index 100% rename from data/scenpgrowth.csv rename to data/unshared_parameters/scenariouncertainty-scenpgrowth.csv diff --git a/data/scenypcgrowth.csv b/data/unshared_parameters/scenariouncertainty-scenypcgrowth.csv similarity index 100% rename from data/scenypcgrowth.csv rename to data/unshared_parameters/scenariouncertainty-scenypcgrowth.csv diff --git a/data/gdp0.csv b/data/unshared_parameters/socioeconomic-gdp0.csv similarity index 100% rename from data/gdp0.csv rename to data/unshared_parameters/socioeconomic-gdp0.csv diff --git a/data/urbcorr.csv b/data/unshared_parameters/socioeconomic-urbcorr.csv similarity index 100% rename from data/urbcorr.csv rename to data/unshared_parameters/socioeconomic-urbcorr.csv diff --git a/src/MimiFUND.jl b/src/MimiFUND.jl index 395be901..8ade2d7c 100644 --- a/src/MimiFUND.jl +++ b/src/MimiFUND.jl @@ -82,7 +82,7 @@ function get_model(; nsteps = default_nsteps, datadir = default_datadir, params # --------------------------------------------- add_comp!(m, scenariouncertainty) - add_comp!(m, population) # can't have external params and components with the same name + add_comp!(m, population) add_comp!(m, geography) add_comp!(m, socioeconomic) add_comp!(m, emissions) @@ -257,10 +257,75 @@ function get_model(; nsteps = default_nsteps, datadir = default_datadir, params parameters = params === nothing ? load_default_parameters(datadir) : params - for (name, value) in parameters - set_param!(m, name, value) + # Set unshared parameters - name is a Tuple{Symbol, Symbol} of (component_name, param_name) + for (name, value) in parameters[:unshared] + update_param!(m, name[1], name[2], value) end + # Set shared parameters - name is a Symbol representing the param_name, here + # we will create a shared model parameter with the same name as the component + # parameter and then connect our component parameters to this shared model parameter + + add_shared_param!(m, :ch4pre, parameters[:shared][:ch4pre]) + connect_param!(m, :climateforcing, :ch4pre, :ch4pre) + connect_param!(m, :climatech4cycle, :ch4pre, :ch4pre) + + add_shared_param!(m, :n2opre, parameters[:shared][:n2opre]) + connect_param!(m, :climateforcing, :n2opre, :n2opre) + connect_param!(m, :climaten2ocycle, :n2opre, :n2opre) + + add_shared_param!(m, :sf6pre, parameters[:shared][:sf6pre]) + connect_param!(m, :climateforcing, :sf6pre, :sf6pre) + connect_param!(m, :climatesf6cycle, :sf6pre, :sf6pre) + + add_shared_param!(m, :co2pre, parameters[:shared][:co2pre]) + connect_param!(m, :climateforcing, :co2pre, :co2pre) + connect_param!(m, :impactagriculture, :co2pre, :co2pre) + connect_param!(m, :impactextratropicalstorms, :co2pre, :co2pre) + connect_param!(m, :impactforests, :co2pre, :co2pre) + + add_shared_param!(m, :nospecbase, parameters[:shared][:nospecbase]) + connect_param!(m, :biodiversity, :nospecbase, :nospecbase) + connect_param!(m, :impactbiodiversity, :nospecbase, :nospecbase) + + add_shared_param!(m, :dbsta, parameters[:shared][:dbsta]) + connect_param!(m, :biodiversity, :dbsta, :dbsta) + connect_param!(m, :impactbiodiversity, :dbsta, :dbsta) + + add_shared_param!(m, :bregtmp, parameters[:shared][:bregtmp], dims=[:regions]) + connect_param!(m, :climateregional, :bregtmp, :bregtmp) + connect_param!(m, :impactdiarrhoea, :bregtmp, :bregtmp) + + add_shared_param!(m, :plus90, parameters[:shared][:plus90], dims=[:regions]) + connect_param!(m, :impactcardiovascularrespiratory, :plus90, :plus90) + connect_param!(m, :socioeconomic, :plus90, :plus90) + + add_shared_param!(m, :gdp90, parameters[:shared][:gdp90], dims=[:regions]) + connect_param!(m, :emissions, :gdp90, :gdp90) + connect_param!(m, :impactagriculture, :gdp90, :gdp90) + connect_param!(m, :impactcooling, :gdp90, :gdp90) + connect_param!(m, :impactdiarrhoea, :gdp90, :gdp90) + connect_param!(m, :impactextratropicalstorms, :gdp90, :gdp90) + connect_param!(m, :impactforests, :gdp90, :gdp90) + connect_param!(m, :impactheating, :gdp90, :gdp90) + connect_param!(m, :impacttropicalstorms, :gdp90, :gdp90) + connect_param!(m, :impactvectorbornediseases, :gdp90, :gdp90) + connect_param!(m, :impactwaterresources, :gdp90, :gdp90) + connect_param!(m, :socioeconomic, :gdp90, :gdp90) + + add_shared_param!(m, :pop90, parameters[:shared][:pop90], dims=[:regions]) + connect_param!(m, :emissions, :pop90, :pop90) + connect_param!(m, :impactagriculture, :pop90, :pop90) + connect_param!(m, :impactcooling, :pop90, :pop90) + connect_param!(m, :impactdiarrhoea, :pop90, :pop90) + connect_param!(m, :impactextratropicalstorms, :pop90, :pop90) + connect_param!(m, :impactforests, :pop90, :pop90) + connect_param!(m, :impactheating, :pop90, :pop90) + connect_param!(m, :impacttropicalstorms, :pop90, :pop90) + connect_param!(m, :impactvectorbornediseases, :pop90, :pop90) + connect_param!(m, :impactwaterresources, :pop90, :pop90) + connect_param!(m, :socioeconomic, :pop90, :pop90) + # Reset the time dimension if needed reset_time_dimension ? set_dimension!(m, :time, collect(1950:1950 + nsteps)) : nothing diff --git a/src/helper.jl b/src/helper.jl index 8cf52b0d..ba9ab1ea 100644 --- a/src/helper.jl +++ b/src/helper.jl @@ -10,17 +10,31 @@ end """ -Reads parameter csvs from data directory into a dictionary (parameter_name => default_value). +Reads parameter csvs from data directory into a dictionary with two keys: +* :shared => (parameter_name => default_value) for parameters shared in the model +* :unshared => ((component_name, parameter_name) => default_value) for component specific parameters that are not shared + For parameters defined as distributions, this sets the value to their mode. """ function load_default_parameters(datadir = joinpath(dirname(@__FILE__), "..", "data")) - files = readdir(datadir) - filter!(i -> i != "desktop.ini", files) - parameters = Dict{Symbol, Any}(Symbol(splitext(file)[1]) => readdlm(joinpath(datadir,file), ',', comments = true) for file in files) - prepparameters!(parameters) + # Load the unshared parameters + files = readdir(joinpath(datadir, "unshared_parameters")) + filter!(i -> (i != "desktop.ini" && i != ".DS_Store"), files) + unshared_parameters = Dict{Tuple{Symbol,Symbol}, Any}() + for file in files + param_info = Symbol.(split(splitext(file)[1], "-")) + unshared_parameters[(param_info[1], param_info[2])] = readdlm(joinpath(datadir,"unshared_parameters",file), ',', comments = true) + end + prepparameters!(unshared_parameters) + + # Handle the shared parameters + files = readdir(joinpath(datadir, "shared_parameters")) + filter!(i -> (i != "desktop.ini" && i != ".DS_Store"), files) + shared_parameters = Dict{Symbol, Any}(Symbol(splitext(file)[1]) => readdlm(joinpath(datadir,"shared_parameters",file), ',', comments = true) for file in files) + prepparameters!(shared_parameters) - return parameters + return Dict(:shared => shared_parameters, :unshared => unshared_parameters) end diff --git a/src/marginaldamage3.jl b/src/marginaldamage3.jl index 602c9544..e0a61c31 100644 --- a/src/marginaldamage3.jl +++ b/src/marginaldamage3.jl @@ -11,7 +11,7 @@ function getmarginalmodels(; gas = :C, emissionyear = 2010, parameters = nothing add_comp!(m2, Mimi.adder, :marginalemission, before = :climateco2cycle, first = 1951) addem = zeros(yearstorun) addem[getindexfromyear(emissionyear)-1:getindexfromyear(emissionyear) + 8] .= 1.0 - set_param!(m2, :marginalemission, :add, addem) + update_param!(m2, :marginalemission, :add, addem) # Reconnect the appropriate emissions in the marginal model if gas == :C diff --git a/src/marginaldamages.jl b/src/marginaldamages.jl index 86af1e3d..4d9af3f5 100644 --- a/src/marginaldamages.jl +++ b/src/marginaldamages.jl @@ -14,7 +14,7 @@ function getmarginaldamages(; emissionyear=2010, parameters = nothing, yearstoag add_comp!(m2, Mimi.adder, :marginalemission, before = :climateco2cycle, first = 1951) addem = zeros(yearstorun) addem[getindexfromyear(emissionyear)-1:getindexfromyear(emissionyear) + 8] .= 1.0 - set_param!(m2, :marginalemission, :add, addem) + update_param!(m2, :marginalemission, :add, addem) # Reconnect the appropriate emissions in the marginal model if gas == :C diff --git a/src/montecarlo/defmcs.jl b/src/montecarlo/defmcs.jl index 9318e90a..e0263c95 100644 --- a/src/montecarlo/defmcs.jl +++ b/src/montecarlo/defmcs.jl @@ -9,7 +9,7 @@ fund_default_mcs = @defsim begin # none ## - ## unshared model parameters, or parameters specific to only one component that are shared due to old set_param! usage + ## unshared model parameters ## scenariouncertainty.aceiadd = ["USA" => Normal(0.0,0.025), "CAN" => Normal(0.0,0.025), "WEU" => Normal(0.0,0.025), "JPK" => Normal(0.0,0.0375), "ANZ" => Normal(0.0,0.0375), "EEU" => Normal(0.0,0.025), "FSU" => Normal(0.0,0.025), "MDE" => Normal(0.0,0.0875), "CAM" => Normal(0.0,0.05625), "LAM" => Normal(0.0,0.05625), "SAS" => Normal(0.0,0.0875), "SEA" => Normal(0.0,0.0875), "CHI" => Normal(0.0,0.0375), "MAF" => Normal(0.0,0.11875), "SSA" => Normal(0.0,0.11875), "SIS" => Normal(0.0,0.05625)] diff --git a/src/montecarlo/load_mcs_RVs.jl b/src/montecarlo/load_mcs_RVs.jl index 6490146e..a460a9e9 100644 --- a/src/montecarlo/load_mcs_RVs.jl +++ b/src/montecarlo/load_mcs_RVs.jl @@ -6,7 +6,7 @@ This function loads the FUND input parameters stored in datadir into the syntax needed for the @defmcs macro. This script writes to a text file which can then be copied into a @defmcs macro. """ -function load_mcs_RVs(; txt_out = joinpath(@__DIR__, "mcs_RVs.txt"), datadir = joinpath(@__DIR__, "../../data_for_load_mcs_RVs"), string_labels = false) +function load_mcs_RVs(; txt_out = joinpath(@__DIR__, "mcs_RVs.txt"), datadir = joinpath(@__DIR__, "../../data/data_for_load_mcs_RVs"), string_labels = false) files = readdir(datadir) filter!(i->i!="desktop.ini", files) diff --git a/src/new_marginaldamages.jl b/src/new_marginaldamages.jl index a9f0ff25..9fab73fd 100644 --- a/src/new_marginaldamages.jl +++ b/src/new_marginaldamages.jl @@ -349,7 +349,7 @@ function add_marginal_emissions!(m, year::Union{Int, Nothing} = nothing; gas::Sy # 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) + update_param!(m, :emissionspulse, :add, addem) # Reconnect the appropriate emissions in m if gas == :CO2 diff --git a/test/runtests.jl b/test/runtests.jl index 8f91645b..3d6e2ea5 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -103,7 +103,7 @@ scch4 = MimiFUND.compute_scch4(year = 2020) # Test with a modified model m_high_cs = MimiFUND.get_model() -set_param!(m_high_cs, :climatesensitivity, 5) +update_param!(m_high_cs, :climatedynamics, :climatesensitivity, 5) scc6 = MimiFUND.compute_scco2(m_high_cs, year=2020, last_year=2300) @test scc6 > scc2 # test that it's higher than the default because of a higher climate sensitivity From 61e2c09dfe5749dac5b66be403c77c655e716a5f Mon Sep 17 00:00:00 2001 From: lrennels Date: Thu, 30 Dec 2021 20:38:54 -0800 Subject: [PATCH 2/2] Add comments --- src/MimiFUND.jl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/MimiFUND.jl b/src/MimiFUND.jl index 8ade2d7c..03d69ce7 100644 --- a/src/MimiFUND.jl +++ b/src/MimiFUND.jl @@ -265,7 +265,9 @@ function get_model(; nsteps = default_nsteps, datadir = default_datadir, params # Set shared parameters - name is a Symbol representing the param_name, here # we will create a shared model parameter with the same name as the component # parameter and then connect our component parameters to this shared model parameter - + + # * for convenience later, name shared model parameter same as the component + # parameters, but this is not required could give a unique name * add_shared_param!(m, :ch4pre, parameters[:shared][:ch4pre]) connect_param!(m, :climateforcing, :ch4pre, :ch4pre) connect_param!(m, :climatech4cycle, :ch4pre, :ch4pre)