Skip to content

Commit

Permalink
Some last minute fixes:
Browse files Browse the repository at this point in the history 
* Fix GCAM-USA config to have global non-CO2 inputs in the right place,
reducing warning messages
* Fix global_ghg_link.xml to set price/demand adjust from 1975 to avoid
warnings about them not being set
* Fix Other industry rewrite in the CO2 emissions by assigned sector
query
  • Loading branch information
@pralitp
pralitp committed Jun 7, 2022
1 parent 7cf761c commit 891304d
Show file tree
Hide file tree
Showing 3 changed files with 1,428 additions and 1,426 deletions.
36 changes: 18 additions & 18 deletions exe/configuration_usa.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,21 @@
<Value name = "municipal_water">../input/gcamdata/xml/water_demand_municipal.xml</Value>
<Value name = "primary_ene_water">../input/gcamdata/xml/water_demand_primary.xml</Value>

<!-- Global nonCO2 GHG files -->
<Value name = "ind_urb_proc">../input/gcamdata/xml/ind_urb_processing_sectors.xml</Value>
<Value name = "nonco2_energy">../input/gcamdata/xml/all_energy_emissions.xml</Value>
<Value name = "nonco2_fgas">../input/gcamdata/xml/all_fgas_emissions.xml</Value>
<Value name = "nonco2_unmgd">../input/gcamdata/xml/all_unmgd_emissions.xml</Value>
<Value name = "nonco2_aglu">../input/gcamdata/xml/all_aglu_emissions_IRR_MGMT.xml</Value>
<Value name = "nonco2_aglu_prot">../input/gcamdata/xml/all_protected_unmgd_emissions.xml</Value>
<Value name = "nonco2_em_controls">../input/gcamdata/xml/emission_factor_controls.xml</Value>

<!-- Global nonCO2 GHG MAC files -->
<Value name = "nonco2_energy">../input/gcamdata/xml/all_energy_emissions_MAC.xml</Value>
<Value name = "nonco2_fgas">../input/gcamdata/xml/all_fgas_emissions_MAC.xml</Value>
<Value name = "nonco2_aglu">../input/gcamdata/xml/all_aglu_emissions_IRR_MGMT_MAC.xml</Value>
<Value name = "nonco2_proc">../input/gcamdata/xml/ind_urb_processing_sectors_MAC.xml</Value>

<Value name = "bio_feedstock_limit">../input/gcamdata/xml/liquids_limits.xml</Value>
<Value name = "bio_elec_w_feed_limit">../input/gcamdata/xml/water_elec_liquids_limits.xml</Value>
<Value name = "bio_neg_emiss_budget">../input/gcamdata/xml/negative_emissions_budget_gSSP2.xml</Value>
Expand All @@ -105,7 +120,6 @@
<Value name = "fert_usa">../input/gcamdata/xml/Fert_USA.xml</Value>

<!-- NEW NESTING STRUCTURE -->

<Value name = "solar_usa">../input/gcamdata/xml/solar_reeds_USA.xml</Value>
<Value name = "wind_usa">../input/gcamdata/xml/wind_reeds_USA.xml</Value>
<Value name = "hydro_usa">../input/gcamdata/xml/elec_hydro_USA.xml</Value>
Expand All @@ -128,22 +142,8 @@
<Value name = "ghg_usa">../input/gcamdata/xml/ghg_emissions_USA.xml</Value>
<Value name = "ghg_usa">../input/gcamdata/xml/elecS_ghg_emissions_water_USA.xml</Value>
<Value name = "ghg_usa">../input/gcamdata/xml/trn_ghg_emissions_USA.xml</Value>

<!-- Global nonCO2 GHG files -->
<Value name = "ind_urb_proc">../input/gcamdata/xml/ind_urb_processing_sectors.xml</Value>
<Value name = "nonco2_energy">../input/gcamdata/xml/all_energy_emissions.xml</Value>
<Value name = "nonco2_fgas">../input/gcamdata/xml/all_fgas_emissions.xml</Value>
<Value name = "nonco2_unmgd">../input/gcamdata/xml/all_unmgd_emissions.xml</Value>
<Value name = "nonco2_aglu">../input/gcamdata/xml/all_aglu_emissions_IRR_MGMT.xml</Value>
<Value name = "nonco2_aglu_prot">../input/gcamdata/xml/all_protected_unmgd_emissions.xml</Value>

<!-- Global nonCO2 GHG MAC files -->
<Value name = "nonco2_energy">../input/gcamdata/xml/all_energy_emissions_MAC.xml</Value>
<Value name = "nonco2_fgas">../input/gcamdata/xml/all_fgas_emissions_MAC.xml</Value>
<Value name = "nonco2_aglu">../input/gcamdata/xml/all_aglu_emissions_IRR_MGMT_MAC.xml</Value>
<Value name = "nonco2_proc">../input/gcamdata/xml/ind_urb_processing_sectors_MAC.xml</Value>

<!-- USA nonGHG files -->
<!--nonGHG EMISSIONS USA-->
<Value name = "bld_emiss_USA">../input/gcamdata/xml/bld_emissions_USA.xml</Value>
<Value name = "othertrn_emiss_USA">../input/gcamdata/xml/othertrn_emissions_USA.xml</Value>
<Value name = "indenergy_emiss_USA">../input/gcamdata/xml/indenergy_emissions_USA.xml</Value>
Expand All @@ -152,8 +152,6 @@
<Value name = "prc_usa">../input/gcamdata/xml/ind_urb_processing_sectors_USA.xml</Value>
<Value name = "process_emiss_USA">../input/gcamdata/xml/ind_urb_proc_emissions_USA.xml</Value>
<Value name = "refining_emiss_USA">../input/gcamdata/xml/refinery_emissions_USA.xml</Value>

<Value name = "ghg_usa">../input/gcamdata/xml/trn_ghg_emissions_USA.xml</Value>

<Value name = "solver">../input/solution/cal_broyden_config.xml</Value>

Expand Down Expand Up @@ -186,7 +184,9 @@
<Value name="climateOutputInterval">5</Value>
<Value name="parallel-grain-size">50</Value>
<Value name="stop-period">-1</Value>
<Value name="stop-year">-1</Value>
<Value name="restart-period">-1</Value>
<Value name="restart-year">-1</Value>
<Value name="max-parallelism">-1</Value>
</Ints>
<Doubles>
Expand Down
Loading

0 comments on commit 891304d

Please sign in to comment.