diff --git a/config.default.yaml b/config.default.yaml index 8d4b1049..575d6c78 100644 --- a/config.default.yaml +++ b/config.default.yaml @@ -1,3 +1,5 @@ +version: 0.2.0 + logging_level: INFO results_dir: 'results/' diff --git a/config.myopic.yaml b/config.myopic.yaml index 565648ae..48f6cb62 100644 --- a/config.myopic.yaml +++ b/config.myopic.yaml @@ -1,3 +1,5 @@ +version: 0.2.0 + logging_level: INFO results_dir: 'results/' diff --git a/data/Country_codes.csv b/data/Country_codes.csv old mode 100755 new mode 100644 diff --git a/data/co2_budget.csv b/data/co2_budget.csv old mode 100755 new mode 100644 diff --git a/data/existing_infrastructure/existing_heating_raw.csv b/data/existing_infrastructure/existing_heating_raw.csv old mode 100755 new mode 100644 diff --git a/data/existing_infrastructure/offwind_capacity_IRENA.csv b/data/existing_infrastructure/offwind_capacity_IRENA.csv old mode 100755 new mode 100644 diff --git a/data/existing_infrastructure/onwind_capacity_IRENA.csv b/data/existing_infrastructure/onwind_capacity_IRENA.csv old mode 100755 new mode 100644 diff --git a/data/existing_infrastructure/solar_capacity_IRENA.csv b/data/existing_infrastructure/solar_capacity_IRENA.csv old mode 100755 new mode 100644 diff --git a/doc/conf.py b/doc/conf.py index b805803d..51b14c2e 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -70,9 +70,9 @@ # built documents. # # The short X.Y version. -version = u'0.1' +version = u'0.2' # The full version, including alpha/beta/rc tags. -release = u'0.1.0' +release = u'0.2.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/myopic.rst b/doc/myopic.rst index c20e06a6..1b1cdb01 100644 --- a/doc/myopic.rst +++ b/doc/myopic.rst @@ -12,7 +12,7 @@ The current code applies the myopic approach to generators, storage technologies The transport sector and industry are not affected by the myopic code. In essence, the electrification of road and rail transport, the percentage of electric vehicles that allow demand-side management and vehicle-to-grid services, and the transformation in the different industrial subsectors do not evolve with time. They are kept fixed at the values specified in the configuration file. Including the transport sector and industry in the myopic code is planned for the near future. - +See also other `outstanding issues `_. Configuration ================= diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 643d6a25..4c8fdf28 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -11,7 +11,7 @@ It is known to work with PyPSA-Eur v0.1.0 (commit bb3477cd69), PyPSA v0.17.1 and New features: -* Option for pathway optimization with myopic foresight, based on the paper `Early decarbonisation of the European Energy system pays off (2020) `_. Investments are optimized sequentially for multiple years (e.g. 2020, 2030, 2040, 2050) taking account of existing assets built in previous years and their lifetimes. The script uses data on the existing assets for electricity and building heating technologies, but there are no assumptions yet for existing transport and industry (if you include these, the model will greenfield them). To use myopic foresight, set ``foresight : 'myopic'`` in the ``config.yaml`` instead of the default ``foresight : 'overnight'``. An example configuration can be found in ``config.myopic.yaml``. More details on the implementation can be found in :doc:`myopic`. +* Option for pathway optimization with myopic foresight, based on the paper `Early decarbonisation of the European Energy system pays off (2020) `_. Investments are optimized sequentially for multiple years (e.g. 2020, 2030, 2040, 2050) taking account of existing assets built in previous years and their lifetimes. The script uses data on the existing assets for electricity and building heating technologies, but there are no assumptions yet for existing transport and industry (if you include these, the model will greenfield them). There are also some `outstanding issues `_ on e.g. the distribution of existing wind, solar and heating technologies within each country. To use myopic foresight, set ``foresight : 'myopic'`` in the ``config.yaml`` instead of the default ``foresight : 'overnight'``. An example configuration can be found in ``config.myopic.yaml``. More details on the implementation can be found in :doc:`myopic`. * Technology assumptions (costs, efficiencies, etc.) are no longer stored in the repository. Instead, you have to install the `technology-data `_ database in a parallel directory. These assumptions are largely based on the `Danish Energy Agency Technology Data `_. More details on the installation can be found in :doc:`installation`. diff --git a/scripts/make_summary.py b/scripts/make_summary.py old mode 100755 new mode 100644 diff --git a/scripts/plot_summary.py b/scripts/plot_summary.py old mode 100755 new mode 100644