diff --git a/CHANGELOG.md b/CHANGELOG.md index cb8d288..8483d79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Use `.expand_dims` instead of `.assign_coords` to make sure we have both time dimension and time coordinates when loading from files [!15](https://github.com/dmidk/sunflow/pull/15), @JoachimKoenigslieb - `check_solar_elevation` now does not assume location is in Copenhagen by default [!15](https://github.com/dmidk/sunflow/pull/15), @JoachimKoenigslieb +- Renamed MTG and MTG_pvlib to specMAGIC_MTG and specMAGIC_MTG_pvlib, respectively [!24](https://github.com/dmidk/sunflow/pull/24), @KristianHMoller ## [v1.2.0] diff --git a/config.yaml b/config.yaml index 192efd4..70fa4c6 100644 --- a/config.yaml +++ b/config.yaml @@ -37,7 +37,7 @@ DWD: # Supports subdirectories via path separators, e.g.: "{year}/{month}/{day}/{dataset_name}_{timestamp}_{domain_satellite_name}.nc" filename_format: "{dataset_name}_{timestamp}_{domain_satellite_name}.nc" -MTG: +specMAGIC_MTG: nc_variable_names: sds: GHI sds_cs: CSR @@ -47,7 +47,7 @@ MTG: method: file path: "CSR/CSR{year}{month}{day}{hour}{minute}.nc" -MTG_pvlib: +specMAGIC_MTG_pvlib: nc_variable_names: sds: GHI sds_cs: GHI_clearsky diff --git a/sunflow/main.py b/sunflow/main.py index bfd57ac..1be43f0 100644 --- a/sunflow/main.py +++ b/sunflow/main.py @@ -114,10 +114,13 @@ def parse_datetime_with_timezone(datetime_str: str) -> datetime: ) parser.add_argument( "--dataset", - choices=["KNMI", "DWD", "MTG", "MTG_pvlib"], + choices=["KNMI", "DWD", "specMAGIC_MTG", "specMAGIC_MTG_pvlib"], default="KNMI", - help="Choose dataset: Currently, only KNMI and DWD data are supported " - "(default: KNMI)", + help="Dataset (default: KNMI): \n" + "KNMI: MSG-CPP data from KNMI\n" + "DWD: MSG-based data from DWD\n" + "specMAGIC_MTG: MTG-based GHI data from specMAGIC\n" + "specMAGIC_MTG_pvlib: MTG-based GHI data from specMAGIC with pvlib clearsky", ) parser.add_argument( "--domain_satellite",