From 3de396d273b3ad4a3a3e474828ed05a1cc13aad3 Mon Sep 17 00:00:00 2001 From: jkikstra Date: Tue, 4 Oct 2022 17:06:29 +0200 Subject: [PATCH 1/5] Make clear that we expect only .xlsx This is done to prepare for the next pyam update, see https://github.com/IAMconsortium/pyam/issues/706#event-7517174208 --- doc/general.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/general.rst b/doc/general.rst index e1debb5..2749986 100644 --- a/doc/general.rst +++ b/doc/general.rst @@ -46,7 +46,8 @@ also analyzed in the Reduced Complexity Model Intercomparison Project (RCMIP) Ph Expected Input (Step 1) ======================= -The expected input is in the following format, as either an Excel or CSV file, covering 2015, and then at minimum decadal (up to yearly detail is accepted) timesteps from 2020 to 2100. +The expected input is in the following format, as either an Excel (.xlsx) or CSV (.csv) file, covering 2015, and then at minimum decadal (up to yearly detail is accepted) timesteps from 2020 to 2100. +Currently, no meta data from the input data is used or preserved in the workflow. At minimum, one needs to report `Emissions|CO2|Energy and Industrial Processes`. Emissions baskets or species not in the table below are not considered for the eventual climate assessment, but are automatically infilled. In this version, negative values are only allowed as input for CO2. From 3d1d2c06d4574ee585eedc7fbd02aec251c69f42 Mon Sep 17 00:00:00 2001 From: jkikstra Date: Wed, 8 Feb 2023 11:25:09 +0000 Subject: [PATCH 2/5] Update citation information and zenodo links --- CITATION.cff | 4 ++-- doc/NOTICE.rst | 12 +++++++----- doc/emulator.rst | 8 +++++++- doc/general.rst | 7 ++++--- doc/index.rst | 12 ++++++------ setup.cfg | 3 +-- 6 files changed, 27 insertions(+), 19 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index b62c9f7..e89ef78 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -37,6 +37,6 @@ identifiers: - description: The concept DOI of the work. type: doi value: 10.5281/zenodo.6624519 - - description: The versioned DOI for version 0.1.0 of the work. + - description: The versioned DOI for version 0.1.1 of the work. type: doi - value: 10.5281/zenodo.6624520 + value: 10.5281/zenodo.6782457 diff --git a/doc/NOTICE.rst b/doc/NOTICE.rst index a36260d..12e53a1 100644 --- a/doc/NOTICE.rst +++ b/doc/NOTICE.rst @@ -23,16 +23,17 @@ Read and understand the file ``LICENSE``; in particular, clause 7 (“Disclaimer 2. Cite the scientific publication ================================== -Cite, at minimum, the following manuscript (exact citation TBD.): +Cite, at minimum, the following manuscript: | Jarmo S. Kikstra, Zebedee R. J. Nicholls, Christopher J. Smith, Jared Lewis, Robin D. Lamboll, Edward Byers, Marit Sandstad, Malte Meinshausen, Matthew J. Gidden, Joeri Rogelj, Elmar Kriegler, Glen P. Peters, Jan S. Fuglestvedt, Ragnhild B. Skeie, Bjørn H. Samset, Laura Wienpahl, Detlef P. van Vuuren, Kaj-Ivar van der Wijst, Alaa Al Khourdajie, Piers M. Forster, Andy Reisinger, Roberto Schaeffer, and Keywan Riahi | "The IPCC Sixth Assessment Report WGIII climate assessment of mitigation pathways: from emissions to global temperatures". - | *Geosci. Model Dev.* - | (in review) + | *Geosci. Model Dev., 15, 9075–9109* + | https://doi.org/10.5194/gmd-15-9075-2022 + | 2022 Additionally, you may cite the source code using the Zenodo reference (DOI: https://doi.org/10.5281/zenodo.6624519). -If you are using the AR6 scenario data (DOI: https://doi.org/10.5281/zenodo.6390767) and the AR6 infiller database (DOI: https://doi.org/10.5281/zenodo.6390767), you should in addition cite those respective sources. +If you are using the AR6 scenario data (DOI: https://doi.org/10.5281/zenodo.5886911) and the AR6 infiller database (DOI: https://doi.org/10.5281/zenodo.6390767), you should in addition cite those respective sources. In addition, to provide credit to the climate emulator modelers, please cite literature describing the climate emulator(s) that you use. @@ -41,6 +42,7 @@ Lastly, you may cite the tools that enabled the development of this climate asse All these citations are also provided in full in the manuscript mentioned above, if further guidance is required on how to cite specific tools and data. - **Cite the code via Zenodo**. - The `DOI 10.5281/zenodo.6624520 `_ represents *all* versions of the :mod:`climate-assessment` code, and will always resolve to the latest version. + The `DOI 10.5281/zenodo.6624519 `_ represents *all* versions of the :mod:`climate-assessment` code, and will always resolve to the latest version. Zenodo also provides citation export in BibTeX and other formats. + If you would like to cite a specific release version, that is possible too and requires using the dedicate URLs, such as `DOI 10.5281/zenodo.6782457 ` for version v0.1.1. - Include a link, e.g. in a footnote, to the online documentation at https://climate-assessment.readthedocs.io. diff --git a/doc/emulator.rst b/doc/emulator.rst index 036ef42..5079240 100644 --- a/doc/emulator.rst +++ b/doc/emulator.rst @@ -168,7 +168,13 @@ Emulator-specific functions References ---------- -Please refer to the following for more detailed use: Nicholls, Z. R. J., Meinshausen, M., Lewis, J., Smith, C. J., Forster, P. M., Fuglestvedt, J. S., Rogelj, J., Kikstra, J. S., Riahi, K., and Byers, E.: Changes in IPCC scenario assessment emulators between SR1.5 and AR6 unravelled (*forthcoming*). +Please refer to the following for more detailed use: + + | Nicholls, Z. R. J., Meinshausen, M., Lewis, J., Smith, C. J., Forster, P. M., Fuglestvedt, J. S., Rogelj, J., Kikstra, J. S., Riahi, K., and Byers, E. + | "Changes in IPCC Scenario Assessment Emulators Between SR1.5 and AR6 Unraveled". + | *Geophysical Research Letters* + | https://doi.org/10.1029/2022GL099788 + | 2022 * More information, multiple references, and an interactive online tool: `magicc.org `_ diff --git a/doc/general.rst b/doc/general.rst index 2749986..4eea6c8 100644 --- a/doc/general.rst +++ b/doc/general.rst @@ -3,12 +3,13 @@ Description of the workflow *************************** On this page, you will find a short summary of the main function of this package. -The workflow is described in detail in the following manuscript (exact citation TBD.): +The workflow is described in detail in the following manuscript: | Jarmo S. Kikstra, Zebedee R. J. Nicholls, Christopher J. Smith, Jared Lewis, Robin D. Lamboll, Edward Byers, Marit Sandstad, Malte Meinshausen, Matthew J. Gidden, Joeri Rogelj, Elmar Kriegler, Glen P. Peters, Jan S. Fuglestvedt, Ragnhild B. Skeie, Bjørn H. Samset, Laura Wienpahl, Detlef P. van Vuuren, Kaj-Ivar van der Wijst, Alaa Al Khourdajie, Piers M. Forster, Andy Reisinger, Roberto Schaeffer, and Keywan Riahi | "The IPCC Sixth Assessment Report WGIII climate assessment of mitigation pathways: from emissions to global temperatures". - | *Geosci. Model Dev.* - | (in review) + | *Geosci. Model Dev., 15, 9075–9109* + | https://doi.org/10.5194/gmd-15-9075-2022 + | 2022 Integrated assessment models (IAMs) produce emissions pathways as part of larger pathway output coming from the modelling of scenarios. These emissions pathways imply a certain temperature development. diff --git a/doc/index.rst b/doc/index.rst index ab48a40..6774d69 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -103,17 +103,17 @@ Acknowledgements Per good scientific practice, you **must** cite the following publication when you use this package in scientific work. - | Jarmo S. Kikstra, Zebedee R. J. Nicholls, Christopher J. Smith, Jared Lewis, Robin D. Lamboll, Edward Byers, Marit Sanstad, Malte Meinshausen, Matthew J. Gidden, Joeri Rogelj, Elmar Kriegler, Glen P. Peters, Jan S. Fuglestvedt, Ragnhild B. Skeie, Bjørn H. Samset, Laura Wienpahl, Detlef P. van Vuuren, Kaj-Ivar van der Wijst, Alaa Al Khourdajie, Piers M. Forster, Andy Reisinger, Roberto Schaeffer, and Keywan Riahi + | Jarmo S. Kikstra, Zebedee R. J. Nicholls, Christopher J. Smith, Jared Lewis, Robin D. Lamboll, Edward Byers, Marit Sandstad, Malte Meinshausen, Matthew J. Gidden, Joeri Rogelj, Elmar Kriegler, Glen P. Peters, Jan S. Fuglestvedt, Ragnhild B. Skeie, Bjørn H. Samset, Laura Wienpahl, Detlef P. van Vuuren, Kaj-Ivar van der Wijst, Alaa Al Khourdajie, Piers M. Forster, Andy Reisinger, Roberto Schaeffer, and Keywan Riahi | "The IPCC Sixth Assessment Report WGIII climate assessment of mitigation pathways: from emissions to global temperatures". - | *Geosci. Model Dev.* - | (in review) - + | *Geosci. Model Dev., 15, 9075–9109* + | https://doi.org/10.5194/gmd-15-9075-2022 + | 2022 You may additionally also cite the package itself: | Kikstra, J. S., Nicholls, Z. R. J., Lewis, J., Smith, C. J., Lamboll, R. D., Byers, E., Sandstad, M., Wienpahl, L., and Hackstock, P.: - | Climate assessment of long-term emissions pathways: IPCC AR6 WGIII version: Release v0.1.0, - | Zenodo, https://doi.org/10.5281/zenodo.6624520, 2022. + | Climate assessment of long-term emissions pathways: IPCC AR6 WGIII version, + | Zenodo, 10.5281/zenodo.6624519, 2022. For more detail, see :doc:`NOTICE`. diff --git a/setup.cfg b/setup.cfg index 9bfc21c..2f20306 100644 --- a/setup.cfg +++ b/setup.cfg @@ -10,8 +10,7 @@ long_description = file:README.rst url = https://github.com/iiasa/climate-assessment project_urls = Source = http://github.com/iiasa/climate-assessment - # ToDo: Change documentation URL before publishing - Documentation = https://iiasa-energy-program-climate-assessment.readthedocs-hosted.com/en/latest/ + Documentation = https://climate-assessment.readthedocs.io/ Bug_Reports = https://github.com/iiasa/climate-assessment/issues classifiers = Development Status :: 3 - Alpha From f81ac0021133efe23ce8ed86b0d2731848b32d32 Mon Sep 17 00:00:00 2001 From: jkikstra Date: Sun, 12 Feb 2023 13:32:48 +0000 Subject: [PATCH 3/5] Run linters --- src/climate_assessment/infilling/__init__.py | 1 - src/climate_assessment/utils.py | 1 - tests/conftest.py | 1 - 3 files changed, 3 deletions(-) diff --git a/src/climate_assessment/infilling/__init__.py b/src/climate_assessment/infilling/__init__.py index be45b32..ee6c866 100644 --- a/src/climate_assessment/infilling/__init__.py +++ b/src/climate_assessment/infilling/__init__.py @@ -249,7 +249,6 @@ def run_infilling( to_infill = to_infill.interpolate(output_timesteps, inplace=False) if lead == ["Emissions|CO2"]: - _, missing_energy = split_df( to_infill, variable=f"{harmonized_prefix}|{co2_energy}" ) diff --git a/src/climate_assessment/utils.py b/src/climate_assessment/utils.py index efc3691..11518eb 100644 --- a/src/climate_assessment/utils.py +++ b/src/climate_assessment/utils.py @@ -13,7 +13,6 @@ def init_logging(logger): - # TODO: remove hard-coded level logger.setLevel(logging.INFO) diff --git a/tests/conftest.py b/tests/conftest.py index e744747..b4847dc 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -321,7 +321,6 @@ def check_alloutput_meta_cols(idf, model_version_str, pyam_df=True): exp = pyam.IamDataFrame(file_expected) if "alloutput" in suffix: - res = check_alloutput_meta_cols(res, model_version_str) exp = check_alloutput_meta_cols(exp, model_version_str) From 935f38078094abfd721a1f1bd31f35880100eb94 Mon Sep 17 00:00:00 2001 From: jkikstra Date: Sun, 12 Feb 2023 13:34:17 +0000 Subject: [PATCH 4/5] Restrict numpy version until cicero is updated on openscm-runner https://github.com/openscm/openscm-runner/issues/81 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 2f20306..95dc86a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -34,7 +34,7 @@ install_requires = importlib-metadata joblib matplotlib - numpy + numpy<= 1.19 openscm-units==0.5.0 openscm-runner==0.9.1 pandas From 1c3c072bdef9d916ae5cfd84b750582289d987a5 Mon Sep 17 00:00:00 2001 From: Jarmo Kikstra <46967503+jkikstra@users.noreply.github.com> Date: Tue, 23 May 2023 14:41:10 +0200 Subject: [PATCH 5/5] Revert numpy pin --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 416d9ef..190deca 100644 --- a/setup.cfg +++ b/setup.cfg @@ -34,7 +34,7 @@ install_requires = importlib-metadata joblib matplotlib - numpy<= 1.19 + numpy openscm-units==0.5.0 openscm-runner==0.9.1 pandas