pyepwmorph 3.1.0__tar.gz → 3.3.0__tar.gz

{pyepwmorph-3.1.0 → pyepwmorph-3.3.0}/.gitignore

@@ -159,3 +159,7 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 .idea/
+
+# Example inputs and outputs of examples/run_amy_meteoswiss.py
+examples/amy_data/
+examples/amy_result/

{pyepwmorph-3.1.0 → pyepwmorph-3.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyepwmorph
-Version: 3.1.0
+Version: 3.3.0
 Summary: A python package to enable simple and easy gathering of climate model data and morphing of EPW files
 Project-URL: Homepage, https://github.com/justinfmccarty/pyepwmorph
 Project-URL: Issues, https://github.com/justinfmccarty/pyepwmorph/issues
@@ -148,10 +148,33 @@ morphed = results["gwl2.0"]["50"]
 
 The site is matched to the nearest station that has the requested variables (or, with `ch2025_full_coverage=True`, the nearest station that has every CH2025 variable), with an elevation penalty so a much higher station is not chosen just because it is close on the map. Supported variables are temperature, humidity, dew point, wind, and radiation (global, diffuse, and direct). Pressure and cloud cover are not in CH2025; requesting them raises an error. Sky cover is left at the EPW's baseline values when radiation is morphed, so longwave sky temperature in EnergyPlus does not follow the shortwave change.
 
-The signal is the change from the 1991-2020 reference climate to the chosen warming level. Each model chain's change is computed first, over the chains that reach that warming level, and the percentiles are taken of those changes. If the EPW's years fall outside 1991-2020, a `UserWarning` recommends a TMY built from 1991-2020 data and the signal is still applied to the file as it stands. The same caveats are listed in `MorphConfig.ch2025_notes` and the matched station in `MorphConfig.ch2025_station`.
+The signal is the change from the 1991-2020 reference climate to the chosen warming level. Each model chain's change is computed first, over the chains that reach that warming level, and the percentiles are taken of those changes. The EPW's period is read from the `Period of Record` in its header. If that is not exactly 1991-2020, a `UserWarning` recommends a TMY built from 1991-2020 data. If the header states no period, a second warning says the period could not be detected, and the mismatch warning still fires if the data rows' years fall outside 1991-2020. The signal is applied to the file as it stands either way. `tools.io.write_period_of_record` adds the statement to files built without one. The same caveats are listed in `MorphConfig.ch2025_notes` and the matched station in `MorphConfig.ch2025_station`.
 
 CH2025 data: MeteoSwiss & ETH Zurich (2025), Climate CH2025 - Daily Datasets, CC-BY 4.0, https://doi.org/10.18751/climate/scenarios/ch2025/data/1.0/
 
+### Measured data (actual meteorological year)
+
+Turn one real year of station measurements, hourly or 10-minute, into an EPW
+for calibration. The table needs fixed column names and hour-ending
+timestamps; `pyepwmorph.tools.amy.describe_columns()` lists them.
+
+```python
+from pyepwmorph.tools import amy, amy_meteoswiss
+
+table = amy_meteoswiss.read_meteoswiss_ogd("ogd-smn_sma_t_historical_2020-2029.csv")  # UTC, hour-ending
+location = amy_meteoswiss.meteoswiss_location("ogd-smn_meta_stations.csv", "SMA")
+report = amy.station_table_to_epw(
+    table, location, 2025, "zurich_fluntern_2025.epw",
+    source_name="MeteoSwiss Zurich-Fluntern", attribution=amy_meteoswiss.ATTRIBUTION,
+)
+print(report.to_text())
+```
+
+Other networks only need a table with the documented columns and
+`timestamp_label` / `table_utc_offset` set to match their clock. Direct and
+diffuse irradiance and sky cover are derived when the station does not measure
+them (the report and the EPW header say how).
+
 ## Climate scenarios
 
 | Scenario              | SSP    | Description                             | Expected warming |

{pyepwmorph-3.1.0 → pyepwmorph-3.3.0}/README.md

@@ -109,10 +109,33 @@ morphed = results["gwl2.0"]["50"]
 
 The site is matched to the nearest station that has the requested variables (or, with `ch2025_full_coverage=True`, the nearest station that has every CH2025 variable), with an elevation penalty so a much higher station is not chosen just because it is close on the map. Supported variables are temperature, humidity, dew point, wind, and radiation (global, diffuse, and direct). Pressure and cloud cover are not in CH2025; requesting them raises an error. Sky cover is left at the EPW's baseline values when radiation is morphed, so longwave sky temperature in EnergyPlus does not follow the shortwave change.
 
-The signal is the change from the 1991-2020 reference climate to the chosen warming level. Each model chain's change is computed first, over the chains that reach that warming level, and the percentiles are taken of those changes. If the EPW's years fall outside 1991-2020, a `UserWarning` recommends a TMY built from 1991-2020 data and the signal is still applied to the file as it stands. The same caveats are listed in `MorphConfig.ch2025_notes` and the matched station in `MorphConfig.ch2025_station`.
+The signal is the change from the 1991-2020 reference climate to the chosen warming level. Each model chain's change is computed first, over the chains that reach that warming level, and the percentiles are taken of those changes. The EPW's period is read from the `Period of Record` in its header. If that is not exactly 1991-2020, a `UserWarning` recommends a TMY built from 1991-2020 data. If the header states no period, a second warning says the period could not be detected, and the mismatch warning still fires if the data rows' years fall outside 1991-2020. The signal is applied to the file as it stands either way. `tools.io.write_period_of_record` adds the statement to files built without one. The same caveats are listed in `MorphConfig.ch2025_notes` and the matched station in `MorphConfig.ch2025_station`.
 
 CH2025 data: MeteoSwiss & ETH Zurich (2025), Climate CH2025 - Daily Datasets, CC-BY 4.0, https://doi.org/10.18751/climate/scenarios/ch2025/data/1.0/
 
+### Measured data (actual meteorological year)
+
+Turn one real year of station measurements, hourly or 10-minute, into an EPW
+for calibration. The table needs fixed column names and hour-ending
+timestamps; `pyepwmorph.tools.amy.describe_columns()` lists them.
+
+```python
+from pyepwmorph.tools import amy, amy_meteoswiss
+
+table = amy_meteoswiss.read_meteoswiss_ogd("ogd-smn_sma_t_historical_2020-2029.csv")  # UTC, hour-ending
+location = amy_meteoswiss.meteoswiss_location("ogd-smn_meta_stations.csv", "SMA")
+report = amy.station_table_to_epw(
+    table, location, 2025, "zurich_fluntern_2025.epw",
+    source_name="MeteoSwiss Zurich-Fluntern", attribution=amy_meteoswiss.ATTRIBUTION,
+)
+print(report.to_text())
+```
+
+Other networks only need a table with the documented columns and
+`timestamp_label` / `table_utc_offset` set to match their clock. Direct and
+diffuse irradiance and sky cover are derived when the station does not measure
+them (the report and the EPW header say how).
+
 ## Climate scenarios
 
 | Scenario              | SSP    | Description                             | Expected warming |

{pyepwmorph-3.1.0 → pyepwmorph-3.3.0}/pyepwmorph/models/ch2025.py

@@ -93,10 +93,8 @@ def reference_key(state: str) -> str:
 
 
 def baseline_matches(baseline_range) -> bool:
-    """Return whether an EPW baseline lies inside the CH2025 reference period."""
-    start, end = (int(year) for year in baseline_range)
-    ref_start, ref_end = CH2025_BASELINE_RANGE
-    return ref_start <= start and end <= ref_end
+    """Return whether an EPW baseline is exactly the CH2025 reference period."""
+    return tuple(int(year) for year in baseline_range) == CH2025_BASELINE_RANGE
 
 
 def in_switzerland(latitude: float, longitude: float) -> bool:

{pyepwmorph-3.1.0 → pyepwmorph-3.3.0}/pyepwmorph/morph/procedures.py

@@ -7,6 +7,8 @@ Container for all of the individual morphing calculations which can be traced ba
         55 514–524 ISSN 0960-1481 URL https://www.sciencedirect.com/science/article/pii/S0960148113000232
 
 """
+import calendar
+
 import numpy as np
 import pandas as pd
 
@@ -33,10 +35,17 @@ def _index_of(*candidates):
 
 
 def _year_of(index):
-    """Return the year of a DatetimeIndex, or the default solar year."""
+    """Return a non-leap year to build solar geometry for the data in *index*.
+
+    EPW files always hold 8760 hours with no 29 February, so their calendar
+    is a non-leap year's even when the first data row says 2016. Building
+    daily series for a leap year would add an empty 29 February and shift
+    every later day by one, so a leap year is replaced by the year before.
+    """
     if index is None or len(index) == 0:
         return morph_solar_utils.DEFAULT_SOLAR_YEAR
-    return int(index[0].year)
+    year = int(index[0].year)
+    return year - 1 if calendar.isleap(year) else year
 
 
 def _as_series(values, index, name, decimals=2):