Merge branch 'tz-merge' of https://github.com/OSeMOSYS/osemosys_global …

…into tz-merge

config/config.yaml

@@ -1,5 +1,5 @@
 # Scenario Name 
-scenario: 'TZ-MERGE'
+scenario: "India"
 
 # Temporal Parameters 
 startYear: 2021
@@ -20,131 +20,93 @@ timeshift: 0 # value between -11 and 12
 
 # Spatial Parameters 
 geographic_scope:
-  - 'IDN'
+  - "IND"
 
 crossborderTrade: True
 
 # Emission Parameters 
 emission_penalty: 
 # - [EMISSION, COUNTRY, START_YEAR, END_YEAR, VALUE]
 # where VALUE is in M$/MT CO2
- - ['CO2', 'IDN', 2020, 2050, 2.1]
+ - ["CO2", "IND", 2020, 2050, 2.1]
 
 # Investment Parameters 
 no_invest_technologies: 
-  - 'CSP'
-  - 'WAV'
-#  - 'URN'
-#  - 'WOF'
-  - 'OTH'
-#  - 'WAS'
-#  - 'COA'
-  - 'COG' 
-#  - 'GEO'
-#  - 'CCS'
-#  - 'BIO'
-  - 'PET'
-#  - 'OIL'
+  - "CSP"
+  - "WAV"
+  - "URN"
+  - "OTH"
+  - "WAS"
+  - "COG" 
+  - "GEO"
+  - "BIO"
+  - "PET"
 
 # Result Parameters 
 results_by_country: True
 
 # solver parameters
-solver: 'cplex' # cbc, cplex, gurobi
+solver: "cbc" # cbc, cplex, gurobi
 
 user_defined_capacity:
   # technology: [capacity, 
   #              first_year, 
-  #              'fixed/open', 
+  #              "fixed/open", 
   #              first_year_of_expansion, 
   #              build_rate_per_year, 
   #              cost]
-  TRNIDNXXMYSSK: [0, 2030, 'open', 2030, 10, 861]
+  TRNINDEAINDNE: [0, 2030, "open", 2030, 10, 861]
 
 nodes_to_add:
- #- 'AAAXX' where AAA is a 3-letter country code, 
- # specified in the 'geographic scope' 
+ #- "AAAXX" where AAA is a 3-letter country code, 
+ # specified in the "geographic scope" 
  # and XX is a 2-letter sub-regional node code. 
- # E.g. - 'IDNSM' for a sub-regional node in Sumatra, Indonesia.
- # - 'IDNSM'
-
+ # E.g. - "IDNSM" for a sub-regional node in Sumatra, Indonesia.
 
 nodes_to_remove:
-#- 'AAAXX' where AAA is a 3-letter country code, and XX is a 2-letter 
+#- "AAAXX" where AAA is a 3-letter country code, and XX is a 2-letter 
 # sub-national code
 
 powerplant_build_rates:
- # TECHNOLOGY_TYPE: [COUNTRY, METHOD, VALUE, START_YEAR, END_YEAR, METHOD]
+ # [TECHNOLOGY, COUNTRY, METHOD, VALUE, START_YEAR, END_YEAR]
  # where TECHNOLOGY_TYPE is, for example, all coal powerplants and is in the 
  # format COA.
- # COUNTRY is the 3-letter country code. E.g. 'IDN' for 'Indonesia' 
- # METHOD specifies how the build rate is applied: absolute ('ABS' or as a 
- # percentage ('PCT') of the maximum capacity for a TECHNOLOGY_TYPE.
+ # COUNTRY is the 3-letter country code. E.g. "IND" for "Indonesia" 
+ # METHOD specifies how the build rate is applied: absolute ("ABS" or as a 
+ # percentage ("PCT") of the maximum capacity for a TECHNOLOGY_TYPE.
  # VALUE is the value - either absolute or percentage - by which the capacity 
  # of the associated TECHNOLOGY can increase. It is applied from the START_YEAR 
  # to the END_YEAR.
- # E.g. - ['SPV', 'IDN', 'ABS', 0, 2020, 2025] 
-
+ # E.g. - ["SPV", "IND", "ABS", 0, 2020, 2025] 
+  - ["SPV", "IND", "PCT", 25, 2020, 2025] 
 
 reserve_margin:
 # RESERVE_MARGIN: [PERCENTAGE, START_YEAR, END_YEAR]
 # Years for which there is no PERCENTAGE value will be interpolated
- RM1: [15, 2020, 2029]
- RM2: [15, 2030, 2050]
+  RM1: [15, 2030, 2050]
 
 emission_limit:
 # - [EMISSION, COUNTRY, YEAR, VALUE]
 # where VALUE is emissions in million tonnes of CO2-equivalent and YEAR is  
 # when that constraint must be adhered to. All years between multiple emission 
 # constraints will be interpolated.
- - ['CO2', 'IDN', 2040, 1]
+ - ["CO2", "IND", 2040, 1]
 
 fuel_limits:
 # FUEL: [VALUE, COUNTRY/INTERNATIONAL, YEAR]
 # Where FUEL is the fuel on which a limit is being applied (e.g. COA), VALUE is
 # the value in Petajoules (PJ), COUNTRY/INTERNATIONAL specific which domestic 
-# fuel (e.g. IDN) or international fuel ('INT') the limit is being applied to, 
+# fuel (e.g. IND) or international fuel ("INT") the limit is being applied to, 
 # and YEAR is the year for which the limit is applied. All years between multiple 
 # fuel extraction constraints will be interpolated.
 
 
 calibration:
-#  OCG1: [50, 'IDN', 2021]
-#  OCG2: [60, 'IDN', 2022]
-#  OCG3: [49, 'IDN', 2023]
-#  OCG4: [49, 'IDN', 2024]
-#  OCG5: [49, 'IDN', 2025]
-#  OCG6: [48, 'IDN', 2026]
-#  OCG7: [46, 'IDN', 2027]
-#  OCG8: [42, 'IDN', 2028]
-#  OCG9: [41, 'IDN', 2029]
-#  OCG10: [41, 'IDN', 2030]
-#  CCG1: [70, 'IDN', 2021]
-#  CCG2: [70, 'IDN', 2022]
-#  CCG3: [59, 'IDN', 2023]
-#  CCG4: [51, 'IDN', 2024]
-#  CCG5: [50, 'IDN', 2025]
-#  CCG6: [45, 'IDN', 2026]
-#  CCG7: [40, 'IDN', 2027]
-#  CCG8: [36, 'IDN', 2028]
-#  CCG9: [36, 'IDN', 2029]
-#  CCG10: [35, 'IDN', 2030]
-
+#  OCG1: [50, "IND", 2021]
 
 re_targets:
-# E.g. - ['IDN', 2030, 2040, 30]
-# where 'IDN' is the country code; 2030, 2040 are the start and end years
+# E.g. - ["IND", 2030, 2040, 30]
+# where "IND" is the country code; 2030, 2040 are the start and end years
 # respectively; and 30 is the target between the start and end years (inclusive)
 # in %
-# - ['BRN', 2035, 2050, 30]
-#  - ['KHM', 2030, 2050, 25]
-#  - ['IDN', 2030, 2050, 20]
-#  - ['LAO', 2025, 2050, 20]
-#  - ['MYS', 2025, 2034, 31]
-#  - ['MYS', 2035, 2050, 40]
-#  - ['MMR', 2030, 2050, 39]
-#  - ['PHL', 2030, 2039, 35]
-#  - ['PHL', 2040, 2050, 50]
-#  - ['THA', 2037, 2050, 20]
-#  - ['VNM', 2030, 2049, 32]
-#  - ['VNM', 2050, 2050, 43]
+ - ["IND", 2030, 2040, 30]

docs/api/osemosys_global.rst

@@ -53,14 +53,6 @@ osemosys\_global.emissions module
    :undoc-members:
    :show-inheritance:
 
-osemosys\_global.feo\_legacy\_power module
-------------------------------------------
-
-.. automodule:: osemosys_global.feo_legacy_power
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 osemosys\_global.file\_check module
 -----------------------------------
 
@@ -93,14 +85,6 @@ osemosys\_global.node\_mapping module
    :undoc-members:
    :show-inheritance:
 
-osemosys\_global.plot\_input\_data module
------------------------------------------
-
-.. automodule:: osemosys_global.plot_input_data
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 osemosys\_global.powerplant\_data module
 ----------------------------------------
 

docs/changelog.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## Version 1.1.0
+- Merges in Transition Zero functionality. Includes:
+  - User defined capacity 
+  - Reserve margins 
+  - Powerplant build rates 
+  - Emission limits  
+  - Fuel limits 
+  - Renewable energy targets 
+
 ## Version 1.0.0
 - Adds custom node functionality 
 - Adds interactive dashboard 

docs/requirements.txt

@@ -20,5 +20,5 @@ cartopy
 sphinx
 myst-parser
 pydata-sphinx-theme>=0.8.1
-sphinx-book-theme>=0.3.3
+sphinx-book-theme
 docutils==0.17.1

setup.cfg

@@ -64,13 +64,11 @@ install_requires =
     scikit-learn
     otoole>=1.0.0
     sphinx-book-theme
-    #sphinx-book-theme==0.1.6
     myst-parser
     otoole>=1.0.0,<1.1.0
     scipy
     dash
     pydata-sphinx-theme>=0.8.1
-    sphinx-book-theme>=0.3.3
     docutils>=0.17.1
 
 [options.packages.find]