Merge pull request #104 from fund-model/params

Use `update_param!` instead of `set_param!`
fund-model · Jun 8, 2023 · ea4408b · ea4408b
2 parents 09545c8 + 61e2c09
commit ea4408b
Show file tree

Hide file tree

Showing 154 changed files with 114 additions and 16 deletions.
diff --git 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 → ...data_for_load_mcs_RVs/emissions.taxmp.csv b/data_for_load_mcs_RVs/emissions.taxmp.csv → ...data_for_load_mcs_RVs/emissions.taxmp.csv
diff --git a/..._load_mcs_RVs/impactagriculture.agcbm.csv → ..._load_mcs_RVs/impactagriculture.agcbm.csv b/..._load_mcs_RVs/impactagriculture.agcbm.csv → ..._load_mcs_RVs/impactagriculture.agcbm.csv
diff --git a/...oad_mcs_RVs/impactagriculture.aglparl.csv → ...oad_mcs_RVs/impactagriculture.aglparl.csv b/...oad_mcs_RVs/impactagriculture.aglparl.csv → ...oad_mcs_RVs/impactagriculture.aglparl.csv
diff --git a/...oad_mcs_RVs/impactagriculture.aglparq.csv → ...oad_mcs_RVs/impactagriculture.aglparq.csv b/...oad_mcs_RVs/impactagriculture.aglparq.csv → ...oad_mcs_RVs/impactagriculture.aglparq.csv
diff --git a/..._load_mcs_RVs/impactagriculture.agrbm.csv → ..._load_mcs_RVs/impactagriculture.agrbm.csv b/..._load_mcs_RVs/impactagriculture.agrbm.csv → ..._load_mcs_RVs/impactagriculture.agrbm.csv
diff --git a/...load_mcs_RVs/impactagriculture.agtime.csv → ...load_mcs_RVs/impactagriculture.agtime.csv b/...load_mcs_RVs/impactagriculture.agtime.csv → ...load_mcs_RVs/impactagriculture.agtime.csv
diff --git a/...oad_mcs_RVs/impactbiodiversity.valinc.csv → ...oad_mcs_RVs/impactbiodiversity.valinc.csv b/...oad_mcs_RVs/impactbiodiversity.valinc.csv → ...oad_mcs_RVs/impactbiodiversity.valinc.csv
diff --git a/...mpactcardiovascularrespiratory.ccmlbm.csv → ...mpactcardiovascularrespiratory.ccmlbm.csv b/...mpactcardiovascularrespiratory.ccmlbm.csv → ...mpactcardiovascularrespiratory.ccmlbm.csv
diff --git a/...mpactcardiovascularrespiratory.ccmqbm.csv → ...mpactcardiovascularrespiratory.ccmqbm.csv b/...mpactcardiovascularrespiratory.ccmqbm.csv → ...mpactcardiovascularrespiratory.ccmqbm.csv
diff --git a/...mpactcardiovascularrespiratory.ccplbm.csv → ...mpactcardiovascularrespiratory.ccplbm.csv b/...mpactcardiovascularrespiratory.ccplbm.csv → ...mpactcardiovascularrespiratory.ccplbm.csv
diff --git a/...mpactcardiovascularrespiratory.ccpqbm.csv → ...mpactcardiovascularrespiratory.ccpqbm.csv b/...mpactcardiovascularrespiratory.ccpqbm.csv → ...mpactcardiovascularrespiratory.ccpqbm.csv
diff --git a/...mpactcardiovascularrespiratory.chmlbm.csv → ...mpactcardiovascularrespiratory.chmlbm.csv b/...mpactcardiovascularrespiratory.chmlbm.csv → ...mpactcardiovascularrespiratory.chmlbm.csv
diff --git a/...mpactcardiovascularrespiratory.chmqbm.csv → ...mpactcardiovascularrespiratory.chmqbm.csv b/...mpactcardiovascularrespiratory.chmqbm.csv → ...mpactcardiovascularrespiratory.chmqbm.csv
diff --git a/...mpactcardiovascularrespiratory.chplbm.csv → ...mpactcardiovascularrespiratory.chplbm.csv b/...mpactcardiovascularrespiratory.chplbm.csv → ...mpactcardiovascularrespiratory.chplbm.csv
diff --git a/...mpactcardiovascularrespiratory.chpqbm.csv → ...mpactcardiovascularrespiratory.chpqbm.csv b/...mpactcardiovascularrespiratory.chpqbm.csv → ...mpactcardiovascularrespiratory.chpqbm.csv
diff --git a/.../impactcardiovascularrespiratory.rlbm.csv → .../impactcardiovascularrespiratory.rlbm.csv b/.../impactcardiovascularrespiratory.rlbm.csv → .../impactcardiovascularrespiratory.rlbm.csv
diff --git a/.../impactcardiovascularrespiratory.rqbm.csv → .../impactcardiovascularrespiratory.rqbm.csv b/.../impactcardiovascularrespiratory.rqbm.csv → .../impactcardiovascularrespiratory.rqbm.csv
diff --git a/data_for_load_mcs_RVs/impactcooling.cebm.csv → ...a_for_load_mcs_RVs/impactcooling.cebm.csv b/data_for_load_mcs_RVs/impactcooling.cebm.csv → ...a_for_load_mcs_RVs/impactcooling.cebm.csv
diff --git a/..._for_load_mcs_RVs/impactforests.forbm.csv → ..._for_load_mcs_RVs/impactforests.forbm.csv b/..._for_load_mcs_RVs/impactforests.forbm.csv → ..._for_load_mcs_RVs/impactforests.forbm.csv
diff --git a/data_for_load_mcs_RVs/impactheating.hebm.csv → ...a_for_load_mcs_RVs/impactheating.hebm.csv b/data_for_load_mcs_RVs/impactheating.hebm.csv → ...a_for_load_mcs_RVs/impactheating.hebm.csv
diff --git a/..._load_mcs_RVs/impactsealevelrise.dlbm.csv → ..._load_mcs_RVs/impactsealevelrise.dlbm.csv b/..._load_mcs_RVs/impactsealevelrise.dlbm.csv → ..._load_mcs_RVs/impactsealevelrise.dlbm.csv
diff --git a/...s/impactsealevelrise.drylandlossparam.csv → ...s/impactsealevelrise.drylandlossparam.csv b/...s/impactsealevelrise.drylandlossparam.csv → ...s/impactsealevelrise.drylandlossparam.csv
diff --git a/...ad_mcs_RVs/impactsealevelrise.migrate.csv → ...ad_mcs_RVs/impactsealevelrise.migrate.csv b/...ad_mcs_RVs/impactsealevelrise.migrate.csv → ...ad_mcs_RVs/impactsealevelrise.migrate.csv
diff --git a/...or_load_mcs_RVs/impactsealevelrise.pc.csv → ...or_load_mcs_RVs/impactsealevelrise.pc.csv b/...or_load_mcs_RVs/impactsealevelrise.pc.csv → ...or_load_mcs_RVs/impactsealevelrise.pc.csv
diff --git a/..._load_mcs_RVs/impactsealevelrise.wlbm.csv → ..._load_mcs_RVs/impactsealevelrise.wlbm.csv b/..._load_mcs_RVs/impactsealevelrise.wlbm.csv → ..._load_mcs_RVs/impactsealevelrise.wlbm.csv
diff --git a/..._load_mcs_RVs/impactsealevelrise.wmbm.csv → ..._load_mcs_RVs/impactsealevelrise.wmbm.csv b/..._load_mcs_RVs/impactsealevelrise.wmbm.csv → ..._load_mcs_RVs/impactsealevelrise.wmbm.csv
diff --git a/...cs_RVs/impactvectorbornediseases.dfch.csv → ...cs_RVs/impactvectorbornediseases.dfch.csv b/...cs_RVs/impactvectorbornediseases.dfch.csv → ...cs_RVs/impactvectorbornediseases.dfch.csv
diff --git a/...s_RVs/impactvectorbornediseases.malch.csv → ...s_RVs/impactvectorbornediseases.malch.csv b/...s_RVs/impactvectorbornediseases.malch.csv → ...s_RVs/impactvectorbornediseases.malch.csv
diff --git a/...cs_RVs/impactvectorbornediseases.smch.csv → ...cs_RVs/impactvectorbornediseases.smch.csv b/...cs_RVs/impactvectorbornediseases.smch.csv → ...cs_RVs/impactvectorbornediseases.smch.csv
diff --git a/...oad_mcs_RVs/impactwaterresources.wrbm.csv → ...oad_mcs_RVs/impactwaterresources.wrbm.csv b/...oad_mcs_RVs/impactwaterresources.wrbm.csv → ...oad_mcs_RVs/impactwaterresources.wrbm.csv
diff --git a/...d_mcs_RVs/scenariouncertainty.aceiadd.csv → ...d_mcs_RVs/scenariouncertainty.aceiadd.csv b/...d_mcs_RVs/scenariouncertainty.aceiadd.csv → ...d_mcs_RVs/scenariouncertainty.aceiadd.csv
diff --git a/...d_mcs_RVs/scenariouncertainty.aeeiadd.csv → ...d_mcs_RVs/scenariouncertainty.aeeiadd.csv b/...d_mcs_RVs/scenariouncertainty.aeeiadd.csv → ...d_mcs_RVs/scenariouncertainty.aeeiadd.csv
diff --git a/...d_mcs_RVs/scenariouncertainty.ecgradd.csv → ...d_mcs_RVs/scenariouncertainty.ecgradd.csv b/...d_mcs_RVs/scenariouncertainty.ecgradd.csv → ...d_mcs_RVs/scenariouncertainty.ecgradd.csv
diff --git a/..._mcs_RVs/scenariouncertainty.foremadd.csv → ..._mcs_RVs/scenariouncertainty.foremadd.csv b/..._mcs_RVs/scenariouncertainty.foremadd.csv → ..._mcs_RVs/scenariouncertainty.foremadd.csv
diff --git a/...oad_mcs_RVs/scenariouncertainty.pgadd.csv → ...oad_mcs_RVs/scenariouncertainty.pgadd.csv b/...oad_mcs_RVs/scenariouncertainty.pgadd.csv → ...oad_mcs_RVs/scenariouncertainty.pgadd.csv
diff --git a/data/bregtmp.csv → data/shared_parameters/bregtmp.csv b/data/bregtmp.csv → data/shared_parameters/bregtmp.csv
diff --git a/data/ch4pre.csv → data/shared_parameters/ch4pre.csv b/data/ch4pre.csv → data/shared_parameters/ch4pre.csv
diff --git a/data/co2pre.csv → data/shared_parameters/co2pre.csv b/data/co2pre.csv → data/shared_parameters/co2pre.csv
diff --git a/data/dbsta.csv → data/shared_parameters/dbsta.csv b/data/dbsta.csv → data/shared_parameters/dbsta.csv
diff --git a/data/gdp90.csv → data/shared_parameters/gdp90.csv b/data/gdp90.csv → data/shared_parameters/gdp90.csv
diff --git a/data/n2opre.csv → data/shared_parameters/n2opre.csv b/data/n2opre.csv → data/shared_parameters/n2opre.csv
diff --git a/data/nospecbase.csv → data/shared_parameters/nospecbase.csv b/data/nospecbase.csv → data/shared_parameters/nospecbase.csv
diff --git a/data/plus90.csv → data/shared_parameters/plus90.csv b/data/plus90.csv → data/shared_parameters/plus90.csv
diff --git a/data/pop90.csv → data/shared_parameters/pop90.csv b/data/pop90.csv → data/shared_parameters/pop90.csv
diff --git a/data/sf6pre.csv → data/shared_parameters/sf6pre.csv b/data/sf6pre.csv → data/shared_parameters/sf6pre.csv
diff --git a/data/cbox10.csv → ...red_parameters/climateco2cycle-cbox10.csv b/data/cbox10.csv → ...red_parameters/climateco2cycle-cbox10.csv
diff --git a/data/cbox20.csv → ...red_parameters/climateco2cycle-cbox20.csv b/data/cbox20.csv → ...red_parameters/climateco2cycle-cbox20.csv
diff --git a/data/cbox30.csv → ...red_parameters/climateco2cycle-cbox30.csv b/data/cbox30.csv → ...red_parameters/climateco2cycle-cbox30.csv
diff --git a/data/cbox40.csv → ...red_parameters/climateco2cycle-cbox40.csv b/data/cbox40.csv → ...red_parameters/climateco2cycle-cbox40.csv
diff --git a/data/cbox50.csv → ...red_parameters/climateco2cycle-cbox50.csv b/data/cbox50.csv → ...red_parameters/climateco2cycle-cbox50.csv
diff --git a/data/lifetempconst.csv → ...ameters/climatedynamics-lifetempconst.csv b/data/lifetempconst.csv → ...ameters/climatedynamics-lifetempconst.csv
diff --git a/data/lifetemplin.csv → ...arameters/climatedynamics-lifetemplin.csv b/data/lifetemplin.csv → ...arameters/climatedynamics-lifetemplin.csv
diff --git a/data/lifetempqd.csv → ...parameters/climatedynamics-lifetempqd.csv b/data/lifetempqd.csv → ...parameters/climatedynamics-lifetempqd.csv
diff --git a/data/rfso2.csv → ...hared_parameters/climateforcing-rfso2.csv b/data/rfso2.csv → ...hared_parameters/climateforcing-rfso2.csv
diff --git a/data/bregstmp.csv → ...d_parameters/climateregional-bregstmp.csv b/data/bregstmp.csv → ...d_parameters/climateregional-bregstmp.csv
diff --git a/data/unshared_parameters/climateregional-bregtmp.csv 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 → ...d_parameters/climateregional-scentemp.csv b/data/currtax.csv → ...d_parameters/climateregional-scentemp.csv
diff --git a/data/ch4em.csv → data/unshared_parameters/emissions-ch4em.csv b/data/ch4em.csv → data/unshared_parameters/emissions-ch4em.csv
diff --git a/data/ch4par1.csv → ...unshared_parameters/emissions-ch4par1.csv b/data/ch4par1.csv → ...unshared_parameters/emissions-ch4par1.csv
diff --git a/data/ch4par2.csv → ...unshared_parameters/emissions-ch4par2.csv b/data/ch4par2.csv → ...unshared_parameters/emissions-ch4par2.csv
diff --git a/data/currtaxch4.csv → ...unshared_parameters/emissions-currtax.csv b/data/currtaxch4.csv → ...unshared_parameters/emissions-currtax.csv
diff --git a/data/currtaxn2o.csv → ...hared_parameters/emissions-currtaxch4.csv b/data/currtaxn2o.csv → ...hared_parameters/emissions-currtaxch4.csv
diff --git a/data/dead_other.csv → ...hared_parameters/emissions-currtaxn2o.csv b/data/dead_other.csv → ...hared_parameters/emissions-currtaxn2o.csv
diff --git a/data/emissint0.csv → ...shared_parameters/emissions-emissint0.csv b/data/emissint0.csv → ...shared_parameters/emissions-emissint0.csv
diff --git a/data/n2oem.csv → data/unshared_parameters/emissions-n2oem.csv b/data/n2oem.csv → data/unshared_parameters/emissions-n2oem.csv
diff --git a/data/n2opar1.csv → ...unshared_parameters/emissions-n2opar1.csv b/data/n2opar1.csv → ...unshared_parameters/emissions-n2opar1.csv
diff --git a/data/n2opar2.csv → ...unshared_parameters/emissions-n2opar2.csv b/data/n2opar2.csv → ...unshared_parameters/emissions-n2opar2.csv
diff --git a/data/sf60.csv → data/unshared_parameters/emissions-sf60.csv b/data/sf60.csv → data/unshared_parameters/emissions-sf60.csv
diff --git a/data/taxmp.csv → data/unshared_parameters/emissions-taxmp.csv b/data/taxmp.csv → data/unshared_parameters/emissions-taxmp.csv
diff --git a/data/area0.csv → data/unshared_parameters/geography-area0.csv b/data/area0.csv → data/unshared_parameters/geography-area0.csv
diff --git a/data/eloss_other.csv → ...ameters/impactaggregation-eloss_other.csv b/data/eloss_other.csv → ...ameters/impactaggregation-eloss_other.csv
diff --git a/data/scentemp.csv → ...ameters/impactaggregation-sloss_other.csv b/data/scentemp.csv → ...ameters/impactaggregation-sloss_other.csv
diff --git a/data/agcbm.csv → ...ed_parameters/impactagriculture-agcbm.csv b/data/agcbm.csv → ...ed_parameters/impactagriculture-agcbm.csv
diff --git a/data/aglparl.csv → ..._parameters/impactagriculture-aglparl.csv b/data/aglparl.csv → ..._parameters/impactagriculture-aglparl.csv
diff --git a/data/aglparq.csv → ..._parameters/impactagriculture-aglparq.csv b/data/aglparq.csv → ..._parameters/impactagriculture-aglparq.csv
diff --git a/data/agrbm.csv → ...ed_parameters/impactagriculture-agrbm.csv b/data/agrbm.csv → ...ed_parameters/impactagriculture-agrbm.csv
diff --git a/data/agrish0.csv → ..._parameters/impactagriculture-agrish0.csv b/data/agrish0.csv → ..._parameters/impactagriculture-agrish0.csv
diff --git a/data/agtime.csv → ...d_parameters/impactagriculture-agtime.csv b/data/agtime.csv → ...d_parameters/impactagriculture-agtime.csv
diff --git a/data/valinc.csv → ..._parameters/impactbiodiversity-valinc.csv b/data/valinc.csv → ..._parameters/impactbiodiversity-valinc.csv
diff --git a/data/cardvasc90.csv → ...tcardiovascularrespiratory-cardvasc90.csv b/data/cardvasc90.csv → ...tcardiovascularrespiratory-cardvasc90.csv
diff --git a/data/ccmlbm.csv → ...mpactcardiovascularrespiratory-ccmlbm.csv b/data/ccmlbm.csv → ...mpactcardiovascularrespiratory-ccmlbm.csv
diff --git a/data/ccmqbm.csv → ...mpactcardiovascularrespiratory-ccmqbm.csv b/data/ccmqbm.csv → ...mpactcardiovascularrespiratory-ccmqbm.csv
diff --git a/data/ccplbm.csv → ...mpactcardiovascularrespiratory-ccplbm.csv b/data/ccplbm.csv → ...mpactcardiovascularrespiratory-ccplbm.csv
diff --git a/data/ccpqbm.csv → ...mpactcardiovascularrespiratory-ccpqbm.csv b/data/ccpqbm.csv → ...mpactcardiovascularrespiratory-ccpqbm.csv
diff --git a/data/chmlbm.csv → ...mpactcardiovascularrespiratory-chmlbm.csv b/data/chmlbm.csv → ...mpactcardiovascularrespiratory-chmlbm.csv
diff --git a/data/chmqbm.csv → ...mpactcardiovascularrespiratory-chmqbm.csv b/data/chmqbm.csv → ...mpactcardiovascularrespiratory-chmqbm.csv
diff --git a/data/chplbm.csv → ...mpactcardiovascularrespiratory-chplbm.csv b/data/chplbm.csv → ...mpactcardiovascularrespiratory-chplbm.csv
diff --git a/data/chpqbm.csv → ...mpactcardiovascularrespiratory-chpqbm.csv b/data/chpqbm.csv → ...mpactcardiovascularrespiratory-chpqbm.csv
diff --git a/data/resp90.csv → ...mpactcardiovascularrespiratory-resp90.csv b/data/resp90.csv → ...mpactcardiovascularrespiratory-resp90.csv
diff --git a/data/rlbm.csv → .../impactcardiovascularrespiratory-rlbm.csv b/data/rlbm.csv → .../impactcardiovascularrespiratory-rlbm.csv
diff --git a/data/rqbm.csv → .../impactcardiovascularrespiratory-rqbm.csv b/data/rqbm.csv → .../impactcardiovascularrespiratory-rqbm.csv
diff --git a/data/cebm.csv → ...nshared_parameters/impactcooling-cebm.csv b/data/cebm.csv → ...nshared_parameters/impactcooling-cebm.csv
diff --git a/data/d2dc.csv → ..._parameters/impactdeathmorbidity-d2dc.csv b/data/d2dc.csv → ..._parameters/impactdeathmorbidity-d2dc.csv
diff --git a/data/d2dd.csv → ..._parameters/impactdeathmorbidity-d2dd.csv b/data/d2dd.csv → ..._parameters/impactdeathmorbidity-d2dd.csv
diff --git a/data/d2dm.csv → ..._parameters/impactdeathmorbidity-d2dm.csv b/data/d2dm.csv → ..._parameters/impactdeathmorbidity-d2dm.csv
diff --git a/data/d2dr.csv → ..._parameters/impactdeathmorbidity-d2dr.csv b/data/d2dr.csv → ..._parameters/impactdeathmorbidity-d2dr.csv
diff --git a/data/d2ds.csv → ..._parameters/impactdeathmorbidity-d2ds.csv b/data/d2ds.csv → ..._parameters/impactdeathmorbidity-d2ds.csv
diff --git a/data/d2lc.csv → ..._parameters/impactdeathmorbidity-d2lc.csv b/data/d2lc.csv → ..._parameters/impactdeathmorbidity-d2lc.csv
diff --git a/data/d2ld.csv → ..._parameters/impactdeathmorbidity-d2ld.csv b/data/d2ld.csv → ..._parameters/impactdeathmorbidity-d2ld.csv
diff --git a/data/d2lm.csv → ..._parameters/impactdeathmorbidity-d2lm.csv b/data/d2lm.csv → ..._parameters/impactdeathmorbidity-d2lm.csv
diff --git a/data/d2lr.csv → ..._parameters/impactdeathmorbidity-d2lr.csv b/data/d2lr.csv → ..._parameters/impactdeathmorbidity-d2lr.csv
diff --git a/data/d2ls.csv → ..._parameters/impactdeathmorbidity-d2ls.csv b/data/d2ls.csv → ..._parameters/impactdeathmorbidity-d2ls.csv
diff --git a/data/sick_other.csv → ...eters/impactdeathmorbidity-dead_other.csv b/data/sick_other.csv → ...eters/impactdeathmorbidity-dead_other.csv
diff --git a/data/sloss_other.csv → ...eters/impactdeathmorbidity-sick_other.csv b/data/sloss_other.csv → ...eters/impactdeathmorbidity-sick_other.csv
diff --git a/data/diamort.csv → ...ed_parameters/impactdiarrhoea-diamort.csv b/data/diamort.csv → ...ed_parameters/impactdiarrhoea-diamort.csv
diff --git a/data/diayld.csv → ...red_parameters/impactdiarrhoea-diayld.csv b/data/diayld.csv → ...red_parameters/impactdiarrhoea-diayld.csv
diff --git a/data/temp90.csv → ...red_parameters/impactdiarrhoea-temp90.csv b/data/temp90.csv → ...red_parameters/impactdiarrhoea-temp90.csv
diff --git a/data/extratropicalstormsbasedam.csv → ...icalstorms-extratropicalstormsbasedam.csv b/data/extratropicalstormsbasedam.csv → ...icalstorms-extratropicalstormsbasedam.csv
diff --git a/data/extratropicalstormsbasedead.csv → ...calstorms-extratropicalstormsbasedead.csv b/data/extratropicalstormsbasedead.csv → ...calstorms-extratropicalstormsbasedead.csv
diff --git a/data/extratropicalstormspar.csv → ...tropicalstorms-extratropicalstormspar.csv b/data/extratropicalstormspar.csv → ...tropicalstorms-extratropicalstormspar.csv
diff --git a/data/forbm.csv → ...shared_parameters/impactforests-forbm.csv b/data/forbm.csv → ...shared_parameters/impactforests-forbm.csv
diff --git a/data/hebm.csv → ...nshared_parameters/impactheating-hebm.csv b/data/hebm.csv → ...nshared_parameters/impactheating-hebm.csv
diff --git a/data/coastpd.csv → ...parameters/impactsealevelrise-coastpd.csv b/data/coastpd.csv → ...parameters/impactsealevelrise-coastpd.csv
diff --git a/data/dlbm.csv → ...ed_parameters/impactsealevelrise-dlbm.csv b/data/dlbm.csv → ...ed_parameters/impactsealevelrise-dlbm.csv
diff --git a/data/drylandlossparam.csv → ...s/impactsealevelrise-drylandlossparam.csv b/data/drylandlossparam.csv → ...s/impactsealevelrise-drylandlossparam.csv
diff --git a/data/maxlandloss.csv → ...meters/impactsealevelrise-maxlandloss.csv b/data/maxlandloss.csv → ...meters/impactsealevelrise-maxlandloss.csv
diff --git a/data/migrate.csv → ...parameters/impactsealevelrise-migrate.csv b/data/migrate.csv → ...parameters/impactsealevelrise-migrate.csv
diff --git a/data/pc.csv → ...ared_parameters/impactsealevelrise-pc.csv b/data/pc.csv → ...ared_parameters/impactsealevelrise-pc.csv
diff --git a/data/slrprtp.csv → ...parameters/impactsealevelrise-slrprtp.csv b/data/slrprtp.csv → ...parameters/impactsealevelrise-slrprtp.csv
diff --git a/data/wetland90.csv → ...rameters/impactsealevelrise-wetland90.csv b/data/wetland90.csv → ...rameters/impactsealevelrise-wetland90.csv
diff --git a/data/wetmax.csv → ..._parameters/impactsealevelrise-wetmax.csv b/data/wetmax.csv → ..._parameters/impactsealevelrise-wetmax.csv
diff --git a/data/wlbm.csv → ...ed_parameters/impactsealevelrise-wlbm.csv b/data/wlbm.csv → ...ed_parameters/impactsealevelrise-wlbm.csv
diff --git a/data/wmbm.csv → ...ed_parameters/impactsealevelrise-wmbm.csv b/data/wmbm.csv → ...ed_parameters/impactsealevelrise-wmbm.csv
diff --git a/data/hurrbasedam.csv → ...ters/impacttropicalstorms-hurrbasedam.csv b/data/hurrbasedam.csv → ...ters/impacttropicalstorms-hurrbasedam.csv
diff --git a/data/hurrbasedead.csv → ...ers/impacttropicalstorms-hurrbasedead.csv b/data/hurrbasedead.csv → ...ers/impacttropicalstorms-hurrbasedead.csv
diff --git a/data/dfbs.csv → ...meters/impactvectorbornediseases-dfbs.csv b/data/dfbs.csv → ...meters/impactvectorbornediseases-dfbs.csv
diff --git a/data/dfch.csv → ...meters/impactvectorbornediseases-dfch.csv b/data/dfch.csv → ...meters/impactvectorbornediseases-dfch.csv
diff --git a/data/malbs.csv → ...eters/impactvectorbornediseases-malbs.csv b/data/malbs.csv → ...eters/impactvectorbornediseases-malbs.csv
diff --git a/data/malch.csv → ...eters/impactvectorbornediseases-malch.csv b/data/malch.csv → ...eters/impactvectorbornediseases-malch.csv
diff --git a/data/smbs.csv → ...meters/impactvectorbornediseases-smbs.csv b/data/smbs.csv → ...meters/impactvectorbornediseases-smbs.csv
diff --git a/data/smch.csv → ...meters/impactvectorbornediseases-smch.csv b/data/smch.csv → ...meters/impactvectorbornediseases-smch.csv
diff --git a/data/wrbm.csv → ..._parameters/impactwaterresources-wrbm.csv b/data/wrbm.csv → ..._parameters/impactwaterresources-wrbm.csv
diff --git a/data/pop0.csv → data/unshared_parameters/population-pop0.csv b/data/pop0.csv → data/unshared_parameters/population-pop0.csv
diff --git a/data/aceiadd.csv → ...arameters/scenariouncertainty-aceiadd.csv b/data/aceiadd.csv → ...arameters/scenariouncertainty-aceiadd.csv
diff --git a/data/aeeiadd.csv → ...arameters/scenariouncertainty-aeeiadd.csv b/data/aeeiadd.csv → ...arameters/scenariouncertainty-aeeiadd.csv
diff --git a/data/ecgradd.csv → ...arameters/scenariouncertainty-ecgradd.csv b/data/ecgradd.csv → ...arameters/scenariouncertainty-ecgradd.csv
diff --git a/data/foremadd.csv → ...rameters/scenariouncertainty-foremadd.csv b/data/foremadd.csv → ...rameters/scenariouncertainty-foremadd.csv
diff --git a/data/pgadd.csv → ..._parameters/scenariouncertainty-pgadd.csv b/data/pgadd.csv → ..._parameters/scenariouncertainty-pgadd.csv
diff --git a/data/scenacei.csv → ...rameters/scenariouncertainty-scenacei.csv b/data/scenacei.csv → ...rameters/scenariouncertainty-scenacei.csv
diff --git a/data/scenaeei.csv → ...rameters/scenariouncertainty-scenaeei.csv b/data/scenaeei.csv → ...rameters/scenariouncertainty-scenaeei.csv
diff --git a/data/scenforestemm.csv → ...ers/scenariouncertainty-scenforestemm.csv b/data/scenforestemm.csv → ...ers/scenariouncertainty-scenforestemm.csv
diff --git a/data/scenpgrowth.csv → ...eters/scenariouncertainty-scenpgrowth.csv b/data/scenpgrowth.csv → ...eters/scenariouncertainty-scenpgrowth.csv
diff --git a/data/scenypcgrowth.csv → ...ers/scenariouncertainty-scenypcgrowth.csv b/data/scenypcgrowth.csv → ...ers/scenariouncertainty-scenypcgrowth.csv
diff --git a/data/gdp0.csv → ...nshared_parameters/socioeconomic-gdp0.csv b/data/gdp0.csv → ...nshared_parameters/socioeconomic-gdp0.csv
diff --git a/data/urbcorr.csv → ...ared_parameters/socioeconomic-urbcorr.csv b/data/urbcorr.csv → ...ared_parameters/socioeconomic-urbcorr.csv
diff --git 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,77 @@ 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
+
+    # * 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)
+
+    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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -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)]
@@ Expand Down @@