From ed361d2c32c1611c90266cf1e7c0bd133bec2f7e Mon Sep 17 00:00:00 2001 From: Brandon N Benton Date: Wed, 6 Nov 2024 06:34:03 -0800 Subject: [PATCH 1/6] Update gh_pages.yml --- .github/workflows/gh_pages.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/gh_pages.yml b/.github/workflows/gh_pages.yml index 4d458fa29..0655857b1 100644 --- a/.github/workflows/gh_pages.yml +++ b/.github/workflows/gh_pages.yml @@ -3,6 +3,7 @@ name: Documentation on: push: branches: [main, master] + workflow_dispatch: jobs: make-pages: From 24569d1203650b2fd701dd4b778a932d9bd3c1fe Mon Sep 17 00:00:00 2001 From: Brandon N Benton Date: Wed, 6 Nov 2024 06:44:07 -0800 Subject: [PATCH 2/6] Update README.rst --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 8c49c9d90..3be3d484c 100644 --- a/README.rst +++ b/README.rst @@ -73,7 +73,7 @@ Recommended Citation Update with current version and DOI: -Brandon Benton, Grant Buster, Andrew Glaws, Ryan King. Super Resolution for Renewable Resource Data (sup3r). https://github.com/NREL/sup3r (version v0.0.3), 2022. DOI: 10.5281/zenodo.6808547 +Brandon Benton, Grant Buster, Andrew Glaws, Ryan King. Super Resolution for Renewable Resource Data (sup3r). https://github.com/NREL/sup3r (version v0.2.0), 2024. DOI: 10.5281/zenodo.14042894 Acknowledgments =============== From 8083db8729763ea5dd35fcdd080101fbb717588e Mon Sep 17 00:00:00 2001 From: Brandon N Benton Date: Wed, 6 Nov 2024 06:48:30 -0800 Subject: [PATCH 3/6] Update README.rst --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 3be3d484c..76ddeffc1 100644 --- a/README.rst +++ b/README.rst @@ -11,10 +11,10 @@ Welcome to SUP3R! .. |Linter| image:: https://github.com/NREL/sup3r/workflows/Lint%20Code%20Base/badge.svg :target: https://github.com/NREL/sup3r/actions?query=workflow%3A%22Lint+Code+Base%22 -.. |PyPi| image:: https://img.shields.io/pypi/pyversions/NREL-sup3r.svg +.. |PyPi| image:: https://img.shields.io/pypi/pyversions/NREL-sup3r.svg&kill_cache=1 :target: https://pypi.org/project/NREL-sup3r/ -.. |PythonV| image:: https://badge.fury.io/py/NREL-sup3r.svg +.. |PythonV| image:: https://badge.fury.io/py/NREL-sup3r.svg&kill_cache=1 :target: https://badge.fury.io/py/NREL-sup3r .. |Codecov| image:: https://codecov.io/gh/nrel/sup3r/branch/main/graph/badge.svg From 34760ba8a7f225a2df4469267712177d506ab6eb Mon Sep 17 00:00:00 2001 From: Brandon N Benton Date: Wed, 6 Nov 2024 06:49:16 -0800 Subject: [PATCH 4/6] Update README.rst --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 76ddeffc1..3be3d484c 100644 --- a/README.rst +++ b/README.rst @@ -11,10 +11,10 @@ Welcome to SUP3R! .. |Linter| image:: https://github.com/NREL/sup3r/workflows/Lint%20Code%20Base/badge.svg :target: https://github.com/NREL/sup3r/actions?query=workflow%3A%22Lint+Code+Base%22 -.. |PyPi| image:: https://img.shields.io/pypi/pyversions/NREL-sup3r.svg&kill_cache=1 +.. |PyPi| image:: https://img.shields.io/pypi/pyversions/NREL-sup3r.svg :target: https://pypi.org/project/NREL-sup3r/ -.. |PythonV| image:: https://badge.fury.io/py/NREL-sup3r.svg&kill_cache=1 +.. |PythonV| image:: https://badge.fury.io/py/NREL-sup3r.svg :target: https://badge.fury.io/py/NREL-sup3r .. |Codecov| image:: https://codecov.io/gh/nrel/sup3r/branch/main/graph/badge.svg From 721adb11e4a772a39faff8fc223ce2b38cd727d5 Mon Sep 17 00:00:00 2001 From: bnb32 Date: Wed, 6 Nov 2024 13:36:22 -0700 Subject: [PATCH 5/6] doc string updates for time slice argument --- sup3r/preprocessing/data_handlers/factory.py | 7 ++++--- sup3r/preprocessing/rasterizers/base.py | 5 +++-- sup3r/preprocessing/rasterizers/extended.py | 7 ++++--- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/sup3r/preprocessing/data_handlers/factory.py b/sup3r/preprocessing/data_handlers/factory.py index 4adc81ec5..99ef6d184 100644 --- a/sup3r/preprocessing/data_handlers/factory.py +++ b/sup3r/preprocessing/data_handlers/factory.py @@ -88,10 +88,11 @@ def __init__( or raster_file. shape : tuple (rows, cols) grid size. Either need target+shape or raster_file. - time_slice : slice + time_slice : slice | list Slice specifying extent and step of temporal extraction. e.g. - slice(start, stop, step). If equal to slice(None, None, 1) the - full time dimension is selected. + slice(start, stop, step). If equal to slice(None, None, 1) the full + time dimension is selected. Can be also be a list ``[start, stop, + step]`` threshold : float Nearest neighbor euclidean distance threshold. If the coordinates are more than this value away from the target lat/lon, an error is diff --git a/sup3r/preprocessing/rasterizers/base.py b/sup3r/preprocessing/rasterizers/base.py index 5f8af8018..897b9c033 100644 --- a/sup3r/preprocessing/rasterizers/base.py +++ b/sup3r/preprocessing/rasterizers/base.py @@ -51,10 +51,11 @@ def __init__( raster_file. shape : tuple (rows, cols) grid size. Either need target+shape or raster_file. - time_slice : slice + time_slice : slice | list Slice specifying extent and step of temporal extraction. e.g. slice(start, stop, step). If equal to slice(None, None, 1) the full - time dimension is selected. + time dimension is selected. Can be also be a list ``[start, stop, + step]`` threshold : float Nearest neighbor euclidean distance threshold. If the coordinates are more than this value away from the target lat/lon, an error is diff --git a/sup3r/preprocessing/rasterizers/extended.py b/sup3r/preprocessing/rasterizers/extended.py index 29293bd4a..d62874c0f 100644 --- a/sup3r/preprocessing/rasterizers/extended.py +++ b/sup3r/preprocessing/rasterizers/extended.py @@ -58,10 +58,11 @@ def __init__( shape : tuple (rows, cols) grid size. Either need target+shape or raster_file. - time_slice : slice + time_slice : slice | list Slice specifying extent and step of temporal extraction. e.g. - slice(start, stop, step). If equal to slice(None, None, 1) the - full time dimension is selected. + slice(start, stop, step). If equal to slice(None, None, 1) the full + time dimension is selected. Can be also be a list ``[start, stop, + step]`` threshold : float Nearest neighbor euclidean distance threshold. If the coordinates are more than this value away from the target From e3c4b4501214734a3b4fc35c425facec7b2358db Mon Sep 17 00:00:00 2001 From: Grant Buster Date: Wed, 6 Nov 2024 15:48:54 -0700 Subject: [PATCH 6/6] Update README.rst - more authors, funding offices, py3.11 --- README.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 3be3d484c..b1c62ffac 100644 --- a/README.rst +++ b/README.rst @@ -41,7 +41,7 @@ as your package/environment manager. Option 1: Install from PIP (recommended for analysts): ------------------------------------------------------ -1. Create a new environment: ``conda create --name sup3r python=3.9`` +1. Create a new environment: ``conda create --name sup3r python=3.11`` 2. Activate environment: ``conda activate sup3r`` @@ -73,9 +73,9 @@ Recommended Citation Update with current version and DOI: -Brandon Benton, Grant Buster, Andrew Glaws, Ryan King. Super Resolution for Renewable Resource Data (sup3r). https://github.com/NREL/sup3r (version v0.2.0), 2024. DOI: 10.5281/zenodo.14042894 +Brandon Benton, Grant Buster, Guilherme Pimenta Castelao, Malik Hassanaly, Pavlo Pinchuk, Slater Podgorny, Andrew Glaws, and Ryan King. Super Resolution for Renewable Resource Data (sup3r). https://github.com/NREL/sup3r (version v0.2.0), 2024. DOI: 10.5281/zenodo.14042894 Acknowledgments =============== -This work was authored by the National Renewable Energy Laboratory, operated by Alliance for Sustainable Energy, LLC, for the U.S. Department of Energy (DOE) under Contract No. DE-AC36-08GO28308. Funding provided by the DOE Grid Deployment Office (GDO), the DOE Advanced Scientific Computing Research (ASCR) program, the DOE Solar Energy Technologies Office (SETO), the DOE Wind Energy Technologies Office (WETO), the United States Agency for International Development (USAID), and the Laboratory Directed Research and Development (LDRD) program at the National Renewable Energy Laboratory. The research was performed using computational resources sponsored by the Department of Energy's Office of Energy Efficiency and Renewable Energy and located at the National Renewable Energy Laboratory. The views expressed in the article do not necessarily represent the views of the DOE or the U.S. Government. The U.S. Government retains and the publisher, by accepting the article for publication, acknowledges that the U.S. Government retains a nonexclusive, paid-up, irrevocable, worldwide license to publish or reproduce the published form of this work, or allow others to do so, for U.S. Government purposes. +This work was authored by the National Renewable Energy Laboratory, operated by Alliance for Sustainable Energy, LLC, for the U.S. Department of Energy (DOE) under Contract No. DE-AC36-08GO28308. This research was supported by the Grid Modernization Initiative of the U.S. Department of Energy (DOE) as part of its Grid Modernization Laboratory Consortium, a strategic partnership between DOE and the national laboratories to bring together leading experts, technologies, and resources to collaborate on the goal of modernizing the nation’s grid. Funding provided by the the DOE Office of Energy Efficiency and Renewable Energy (EERE), the DOE Office of Electricity (OE), DOE Grid Deployment Office (GDO), the DOE Office of Fossil Energy and Carbon Management (FECM), and the DOE Office of Cybersecurity, Energy Security, and Emergency Response (CESER), the DOE Advanced Scientific Computing Research (ASCR) program, the DOE Solar Energy Technologies Office (SETO), the DOE Wind Energy Technologies Office (WETO), the United States Agency for International Development (USAID), and the Laboratory Directed Research and Development (LDRD) program at the National Renewable Energy Laboratory. The research was performed using computational resources sponsored by the Department of Energy's Office of Energy Efficiency and Renewable Energy and located at the National Renewable Energy Laboratory. The views expressed in the article do not necessarily represent the views of the DOE or the U.S. Government. The U.S. Government retains and the publisher, by accepting the article for publication, acknowledges that the U.S. Government retains a nonexclusive, paid-up, irrevocable, worldwide license to publish or reproduce the published form of this work, or allow others to do so, for U.S. Government purposes.