windkit 2.0.0__tar.gz → 2.1.0rc1__tar.gz

windkit-2.1.0rc1/.triage-policies.yml

@@ -0,0 +1,47 @@
+resource_rules:
+  issues:
+    rules:
+      # Label issues as Stale after 6 months of inactivity
+      - name: Label stale issues
+        conditions:
+          state: opened
+          date:
+            attribute: updated_at
+            condition: older_than
+            interval_type: months
+            interval: 6
+          forbidden_labels:
+            - Stale
+            - "Status: Blocked"
+            - Meta-issue
+        actions:
+          labels:
+            - Stale
+          comment: |
+            This issue has been inactive for 6 months and has been labeled `~Stale`.
+
+            If this issue is still relevant, please comment or update it to reset
+            the inactivity timer. Otherwise, it will be automatically closed in
+            3 months.
+
+      # Close issues 3 months after the Stale label was added
+      - name: Close stale issues
+        conditions:
+          state: opened
+          date:
+            attribute: updated_at
+            condition: older_than
+            interval_type: months
+            interval: 3
+          labels:
+            - Stale
+          forbidden_labels:
+            - "Status: Blocked"
+            - Meta-issue
+        actions:
+          status: close
+          comment: |
+            This issue has been inactive and is being closed
+            automatically per our [stale issue policy](CONTRIBUTING.md#stale-issue-policy).
+
+            If this issue is still relevant, feel free to reopen it.

{windkit-2.0.0 → windkit-2.1.0rc1}/CHANGELOG.md

@@ -2,14 +2,124 @@
 
 All major changes are listed here.
 
-## 2.0.0 (2025-07-21)
+## Unreleased
+
+## [2.1.0 (2026-04-22)](https://docs.wasp.dk/windkit/v2.1.0/)
+
+### Highlights
+
+* **LinRegMCP with residual noise** — new `LinRegMCP.predict_with_noise()` samples Gaussian residuals per sector to recover realistic wind-speed distributions that preserve variance. `MCPRegressor.predict(return_std=True)` exposes the per-timestep residual standard deviation, and `LinearRegression.residual_std` is computed and stored during `fit()`.
+* **New `windkit.io.wasp` low-level subpackage** — read and write `.tab`, `.lib`, and `.owc` / `.omwc` files as plain dicts with numpy arrays, without xarray overhead. `read_tab` / `write_tab` / `format_tab`, `read_lib` / `write_lib` / `format_lib`, `read_owc` / `parse_owc_element`.
+* **Correlated synthetic TSWC data** — `create_tswc(not_empty=True)` now generates temporally and spatially correlated wind data using an AR(1) / Weibull model (one year at 10-minute frequency by default). New `create_tswc_pair` creates correlated TSWC pairs with configurable speed bias, directional bias, and target correlation.
+* **windIO format support (experimental)** — new `windkit.io.windio` subpackage adds readers and writers for the IEA [windIO format](https://ieawindsystems.github.io/windIO/), covering BWC / WWC / TSWC wind climates, wind turbines / WTGs, and full plant composition. Top-level readers and writers (`read_wwc`, `read_bwc`, `read_tswc`, `read_wind_turbines`, `read_wtg`, and their `*_to_file` counterparts) now accept YAML. See *New features* below for the full API.
+* **Dependency minimum bumps (breaking)** — minimum supported versions raised: numpy 2.0, xarray 2024.9, pandas 2.3, scipy 1.13, geopandas 1.0, rasterio 1.4, pyproj 3.7, lxml 5.2, netcdf4 1.7. Users on older versions must upgrade.
+
+### New features
+
+* New `windkit.plot.spatial_structure_2d` and `windkit.plot.spatial_structure_3d` functions for visualising the geometry of WindKit spatial objects (`point`, `stacked_point`, `raster`, `cuboid`). Both functions accept an optional `ax` argument and support subsampling for large datasets. The 3D function also draws vertical tower lines for multi-height structures (`stacked_point`, `cuboid`), which can be toggled via `show_tower_lines`.
+* `create_tswc` now generates temporally and spatially correlated synthetic wind data using an AR(1)/Weibull model when `not_empty=True`, replacing the previous uncorrelated random fill. The default date range is now one year at 10-min frequency (previously ten years).
+* New `create_tswc_pair` function for generating correlated TSWC pairs with configurable speed bias, directional bias, and target correlation.
+* New low-level `windkit.io.wasp` subpackage for reading and writing WAsP file formats without xarray overhead. Initial support for `.tab` files via `read_tab`, `write_tab`, and `format_tab`. These return plain dicts with numpy arrays and use normalized (0-1) frequency values.
+* Added `.lib` file support to `windkit.io.wasp` via `read_lib`, `write_lib`, and `format_lib`. These return plain dicts with numpy arrays and use normalized (0-1) direction frequency values.
+* Added `.owc`/`.omwc` file support to `windkit.io.wasp` via `read_owc` and `parse_owc_element`. These parse WAsP observed wind climate XML files and return plain dicts with numpy arrays.
+* New `style="combined"` option for `histogram()` that shows the marginal (all-sector average) wind speed distribution as a stepped line, per-sector conditional distributions as faint stepped lines, an optional emergent Weibull curve, and a metrics annotation box with mean wind speed, power density, and Weibull parameters.
+* Added `vrt` to the raster map supported file formats.
+* `create_geowc` now accepts a `wsbin_width` argument to control the wind-speed bin width on the returned geostrophic wind climate.
+* New `LinRegMCP.predict_with_noise()` method for predicting with Gaussian noise sampled from the per-sector residual standard deviation, recovering realistic wind speed distributions that preserve variance.
+* `MCPRegressor.predict()` now accepts `return_std=True` to optionally return per-timestep residual standard deviations alongside predictions.
+* `LinearRegression.residual_std` is now computed and stored during `fit()`, providing the per-sector residual standard deviation.
+
+#### windIO format support (experimental)
+
+Added support for reading and writing wind data in the [windIO format](https://ieawindsystems.github.io/windIO/), an open YAML-based data exchange standard developed by the IEA Wind Systems Engineering community. Only the Plant schema is supported.
+
+* New module `windkit.io.windio` with:
+  * **Readers**: `read_plant`, `read_site`, `read_energy_resource`, `read_wind_resource`, `read_wind_farm`, `read_layout`, `read_turbine`
+  * **Writers**: `write_plant`, `write_turbine` (with optional `modular=True` for split files)
+  * `export_site` — convert windkit wind climate datasets (WWC/BWC/TSWC) to windIO site format and write to disk (netCDF or YAML)
+  * **Translation functions**:
+    * `wwc_from_windio` / `wwc_to_windio` — Weibull wind climate
+    * `bwc_from_windio` / `bwc_to_windio` — Binned wind climate
+    * `tswc_from_windio` / `tswc_to_windio` — Time series wind climate
+    * `wind_turbines_from_windio` / `wind_turbines_to_windio` — turbine layouts
+    * `wtg_from_windio` / `wtg_to_windio` — WTG power/thrust curves
+  * `compose_plant` — combine wind climate, turbines, and WTGs into a complete plant structure
+  * `resolve_includes` — expand `!include` directives in windIO files
+* Top-level readers (`read_wwc`, `read_bwc`, `read_tswc`, `read_wind_turbines`, `read_wtg`) now accept YAML files.
+* Top-level writers (`wwc_to_file`, `bwc_to_file`, `tswc_to_file`) now support YAML export.
+* New function `tswc_to_file` for writing time series wind climates.
+* All reader/writer functions support a `level` parameter for partial file operations (e.g., `level="wind_resource"` to read/write only the wind resource portion).
+* Multi-height wind climate support.
+* IEA reference turbine compatibility (tested with IEA-15MW, IEA-22MW).
+* All `*_from_windio` translation functions now automatically detect and resolve `!include` markers, so callers can pass unresolved windIO dicts directly without calling `resolve_includes` first.
+
+### Bug fixes
+
+* `interp_structured_like`, `interp_unstructured_like`, `fit_weibull_wasp_m1_m3_fgtm`, `fit_weibull_wasp_m1_m3`, and `fit_weibull_k_sumlogm` now preserve the dtype of the input data. Previously, all these functions unconditionally upcast results to float64.
+* Fixed `interp_unstructured_like` returning `NaN` near the dateline in geographic CRSs by wrapping longitudes around the target region before building the unstructured interpolator. Longitude wrapping only activates when CRS metadata is present.
+* Fixed `clip_with_margin` to handle reversed coordinate bounds (e.g., ERA5/CFSR data with south_north going from 90 to -90).
+* Fixed typo "marging" to "margin" in `clip_with_margin` warning message.
+* Fixed `BBox.from_ds` and `BBox.reproject_to_utm` raising `ValueError` for single-point datasets where `minx == maxx` or `miny == maxy`. Zero-size bounding boxes are now allowed (by relaxing validation in `BBox.from_cornerpts`).
+* Fixed crash in `nearest_points` (and other spatial operations) when called on a dataset that was previously subset from a stacked-point structure. Internal MultiIndex metadata left from the original stacking would be out of sync with the reduced dataset size, causing an error during spatial conversion.
+* Reprojecting is now loss-less for raster datasets, due to original coordinates being kept internally.
+* Fixed raster map saving with NumPy>=2.0 by passing numpy arrays to rasterio.
+* Fixed `set_crs` crash for CRS types that cannot be converted to WKT1_GDAL (e.g. rotated lat-lon) — now emits a warning instead.
+* Fixed `ValueError` in LTC MCP caused by incorrect unpacking of `wd_to_sector` return values, which had made all MCP functionality (`LinRegMCP`, `VarRatMCP`) non-functional.
+* Fixed mutable default argument (`model_kws={}`) in `MCPRegressor.__init__()`.
+* Fixed `LinearRegression.fit()` not returning `self`.
+* Fixed `wasserstein_distance()` not extracting `.values.flatten()` like other score functions.
+* Fixed `np.empty_like` in `MCPRegressor.predict()` leaving uninitialized values (now uses NaN).
+* Fixed overly broad `except Exception` in `validate_dataset_ltc()` to catch only `WindkitValidationError`.
+* Fixed incorrect docstrings claiming `quantiles` defaults to `True` in `LinRegMCP` / `VarRatMCP`.
+* Fixed sector wrap-around bug in `MCPBase._wd_to_sector()` where wind directions near 0°/360° were assigned to invalid sector index -1.
+* Fixed bug in `tswc_resample` which used vector averages for wind speed. Now (correctly) uses average magnitudes instead.
+* Fixed `create_tswc_pair` where the second dataset silently ignored the `speed_tau` argument.
+
+### Breaking changes
+
+* Minimum supported dependency versions raised: numpy 2.0, xarray 2024.9, pandas 2.3, scipy 1.13, geopandas 1.0, rasterio 1.4, pyproj 3.7, lxml 5.2, netcdf4 1.7. Users on older versions must upgrade.
+
+### Deprecations
+
+* Writing multi-point datasets to multiple `.tab` files via `bwc_to_file` is deprecated and will be removed in windkit 3.0. Write single-point datasets instead.
+* Writing multi-point datasets to multiple `.lib` files via `gwc_to_file` is deprecated and will be removed in windkit 3.0. Write single-point datasets instead.
+
+### Performance
+
+* Preserve MultiIndex when converting between point and stacked_point/raster structures, avoiding unnecessary re-stacking and leading to small performance improvements for large datasets in many windkit and pywasp functions.
+
+### Changes
+
+* Added explicit `compat`, `join`, and `data_vars` parameters to all `xr.merge` and `xr.concat` calls to suppress xarray FutureWarnings.
+* Improved `_read_ts_windpro_txt` to parse date format from the windpro file header instead of hard-coding.
+* Improved `create_raster_map` to generate synthetic 2D raster maps for elevation, roughness and landcover.
+* Improved vector map reading in `_read_vector_map`.
+* Added a `layer` argument and automatic layer detection for vector map files (`.gpkg`, `.zip`) when `layer=None`.
+* Improved download retry logic for `get_tutorial_data`.
+* Changed `read_wtg` to read multiple suggested heights as a new variable `suggested_heights` if present in WTG files.
+* Wind climate dispatch (`mean_wind_speed`, `mean_power_density`, `mean_ws_moment`, `ws_cdf`, `ws_freq_gt_mean`) now uses capability-based detection instead of strict type-identity checks. Datasets that have the right fields but don't pass every validator check (e.g. missing `sector_ceil` / `sector_floor`) now work correctly.
+* Generalized wind climate (GWC) datasets now dispatch to the Weibull handler for `mean_wind_speed`, `mean_power_density`, and `mean_ws_moment`, since they contain Weibull parameters. Previously these operations raised `NotImplementedError`.
+* The `bysector` keyword is now forwarded consistently to all wind climate types, including geostrophic wind climate, where it was previously silently ignored.
+* Standardized deprecation warnings to include the `since` and `removal` version in every message (e.g. "deprecated since windkit 2.1, removed in windkit 3.0").
+* Give informative error in `get_vector_map` when the requested area is too large and when using `source="dtu"`.
+
+
+## [2.0.1 (2026-01-29)](https://docs.wasp.dk/windkit/v2.0.1/)
 
 ### Highlights
 
-### Performance improvements
+#### Performance improvements
 * Significantly reduced import time by lazy loading some packages and data. Should be approx 1/3 of previous import time.
 
-### Sheer and veer functionality
+#### Documentation
+* Restructured user guide into focused, object-based documentation pages:
+  - Wind climates section with dedicated pages for TSWC, BWC, WWC, and GWC including I/O formats and usage examples
+  - Topography section with elevation, roughness, and landcover map documentation including format support tables
+  - Spatial section explaining point, stacked_point, raster, and cuboid structures with operation examples
+  - Wind farms section documenting wind turbine datasets and WTG objects
+  - New overview section with data structures, schemas, and tutorial data documentation
+
+#### Sheer and veer functionality
 
 * Added new function `wk.shear_extrapolate` to extrapolate wind speeds to different heights using a power law shear profile.
 * Added new function `wk.shear_exponent` to calculate a shear exponent from wind speeds
@@ -23,16 +133,24 @@ All major changes are listed here.
 
 * new function `create_geowc`, which creates a dummy geostrophic wind climate
 * functions `mean_wind_speed`, `mean_power_density`, `ws_freq_gt_mean`, `ws_cdf` and `mean_ws_moment` are now also working when a geostrophic wind climate is passed.
-* bug fix to interpolation, which would create invalid spatial structures when a dimension was in exclude dims but not present in the target structure (e.g. when doing interpolation from `stacked_point` to `point`).
 
 ### New features
 * Added new function `wk.extrapolate_to_height` to extrapolate wind climate objects to different heights. Currently, only works for time-series wind climates (TSWC).
-* Fixed bug where a point dataset with several horizontal locations would be converted to a single horizontal location when using the function `to_stacked_point`
 * `wk.roughness_map_to_file` now allows to write to a old fashioned `.map` file for the special case where these is a single polygon and the external roughness length is not specified (None). For this case we assume that the external roughness length is the same as the roughness length inside the polygon.
 * `wk.roughness_map_to_file` now allows users to write to a `.map` as long all displacement heights in the map are zero.
+* For `wv_count` objects (thus also geostrophic wind climates) if all of the bins have nan's, the result of function `mean_wind_speed`, `mean_power_density`, `ws_freq_gt_mean` and `mean_ws_moment` operating on such a function is also nan, whereas before it would be 0.
+* Added new function `wk.load_tutorial_data` to download and load tutorial data directly into memory as windkit-compatible objects (xarray.Dataset and geopandas.GeoDataFrame).
+* Changed `wk.get_tutorial_data` to return a `Path` to the extracted tutorial data folder, allowing users to load files manually using windkit readers or generic loaders. The function now includes detailed docstrings describing all available files for each dataset, including .nc, .omwc, .wtg, .map, and .csv.
+* Added `wk.read_wind_turbines` and `wk.wind_turbines_to_file` functions to read and write wind turbine datasets in various formats. Both only support CSV for now. The CSV should follow the windkit wind turbine format specification.
+
+
+### Bug fixes
+* Fixed pixel misalignment when downloading raster maps from Google Earth Engine. Downloads now use `crs_transform` instead of `scale` to preserve exact pixel alignment with source datasets (e.g., Globcover, SRTM, WorldCover). This fixes half-pixel offsets (~150m for Globcover) and ~12-15m offsets for elevation data.
 * Bugfix in `read_bwc`: it now opens `bwc` stored in netcdf correctly.
 but some of this functionality was only available in pywasp, so it has been moved there.
-* For `wv_count` objects (thus also geostrophic wind climates) if all of the bins have nan's, the result of function `mean_wind_speed`, `mean_power_density`, `ws_freq_gt_mean` and `mean_ws_moment` operating on such a function is also nan, whereas before it would be 0.
+* Fixed bug where a point dataset with several horizontal locations would be converted to a single horizontal location when using the function `to_stacked_point`
+* bug fix to interpolation, which would create invalid spatial structures when a dimension was in exclude dims but not present in the target structure (e.g. when doing interpolation from `stacked_point` to `point`).
+
 
 ### Changes
 * Changed default value of `use_bounds` to `True` in `wk.spatial.BBox.reproject` method.

{windkit-2.0.0 → windkit-2.1.0rc1}/PKG-INFO

@@ -1,50 +1,72 @@
 Metadata-Version: 2.4
 Name: windkit
-Version: 2.0.0
+Version: 2.1.0rc1
 Summary: WindKit provides core functionalities for working with wind resource data
-Home-page: https://docs.wasp.dk/windkit/latest
 Author: DTU Wind Energy
-License: BSD-3-Clause
+License-Expression: BSD-3-Clause
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: lxml>=5.0
-Requires-Dist: netcdf4>=1.6
-Requires-Dist: numpy>=1.26
-Requires-Dist: packaging>=23
-Requires-Dist: pandas>=2.1
-Requires-Dist: pyproj>=3.6
-Requires-Dist: scipy>=1.12
-Requires-Dist: shapely>=2
-Requires-Dist: xarray>=2023.9
-Requires-Dist: rioxarray>=0.17
-Requires-Dist: rasterio>=1.3
 Requires-Dist: geopandas>=1.0
-Requires-Dist: h5netcdf>=1.3
-Requires-Dist: h5py>=3.9
-Requires-Dist: matplotlib>=3.8
-Requires-Dist: pydantic-settings>=2.3
+Requires-Dist: h5netcdf
+Requires-Dist: lxml>=5.2
+Requires-Dist: netcdf4>=1.7
+Requires-Dist: numpy>=2.0
+Requires-Dist: packaging>=24.1
+Requires-Dist: pandas>=2.3
+Requires-Dist: platformdirs>=4.3
 Requires-Dist: pydantic>=2.7
-Requires-Dist: platformdirs>=4.3.8
-Requires-Dist: plotly>=5
-Requires-Dist: kaleido>=0.2.1
-Requires-Dist: requests>=2.31
-Requires-Dist: toml>=0.10
+Requires-Dist: pydantic-settings>=2.3
+Requires-Dist: pyproj>=3.7
+Requires-Dist: pyyaml
+Requires-Dist: rasterio>=1.4
+Requires-Dist: requests
+Requires-Dist: rioxarray>=0.17
+Requires-Dist: scipy>=1.13
+Requires-Dist: shapely>=2.0
+Requires-Dist: toml
+Requires-Dist: xarray>=2024.9
 Provides-Extra: plots
-Requires-Dist: matplotlib>=3.6; extra == "plots"
-Requires-Dist: plotly>=5.12; extra == "plots"
-Requires-Dist: kaleido>=0.2.1; extra == "plots"
-Provides-Extra: data-apis
-Requires-Dist: ee; extra == "data-apis"
-Requires-Dist: pystac_client; extra == "data-apis"
-Requires-Dist: planetary_computer; extra == "data-apis"
-Requires-Dist: fsspec; extra == "data-apis"
-Requires-Dist: adlfs; extra == "data-apis"
-Requires-Dist: zarr; extra == "data-apis"
+Requires-Dist: matplotlib>=3.9; extra == "plots"
+Requires-Dist: plotly>=5.21; extra == "plots"
+Requires-Dist: kaleido>=1.0; extra == "plots"
 Provides-Extra: performance
-Requires-Dist: numba; extra == "performance"
+Requires-Dist: numba>=0.60; extra == "performance"
+Provides-Extra: data-apis
+Requires-Dist: adlfs>=2024.4; extra == "data-apis"
+Requires-Dist: earthengine-api>=1.0; extra == "data-apis"
+Requires-Dist: fsspec>=2024.5; extra == "data-apis"
+Requires-Dist: planetary-computer>=1.0; extra == "data-apis"
+Requires-Dist: pystac-client>=0.8; extra == "data-apis"
+Requires-Dist: zarr>=3.0; extra == "data-apis"
+Provides-Extra: dev
+Requires-Dist: dash; extra == "dev"
+Requires-Dist: ipython; extra == "dev"
+Requires-Dist: nbval; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: pytest-xdist; extra == "dev"
+Requires-Dist: windIO; extra == "dev"
+Provides-Extra: doc
+Requires-Dist: docutils; extra == "doc"
+Requires-Dist: jupyter; extra == "doc"
+Requires-Dist: jupyter-dash; extra == "doc"
+Requires-Dist: jupyter-sphinx; extra == "doc"
+Requires-Dist: myst-parser; extra == "doc"
+Requires-Dist: nbsphinx; extra == "doc"
+Requires-Dist: nbsphinx-link; extra == "doc"
+Requires-Dist: pydata-sphinx-theme; extra == "doc"
+Requires-Dist: recommonmark; extra == "doc"
+Requires-Dist: sphinx; extra == "doc"
+Requires-Dist: sphinx-argparse; extra == "doc"
+Requires-Dist: sphinx-copybutton; extra == "doc"
+Requires-Dist: sphinx-design; extra == "doc"
+Requires-Dist: sphinx-gallery; extra == "doc"
+Requires-Dist: sphinxcontrib-bibtex; extra == "doc"
+Requires-Dist: sphinxext-opengraph; extra == "doc"
 Dynamic: license-file
 
 # WindKit

windkit-2.1.0rc1/pyproject.toml

@@ -0,0 +1,118 @@
+[build-system]
+requires = ["setuptools>=45", "setuptools_scm[toml]>=6.2"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "windkit"
+description = "WindKit provides core functionalities for working with wind resource data"
+readme = "README.md"
+license = "BSD-3-Clause"
+authors = [
+    {name = "DTU Wind Energy"}
+]
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Operating System :: OS Independent",
+]
+dynamic = ["version"]
+requires-python = ">=3.11"
+dependencies = [
+    "geopandas>=1.0",
+    "h5netcdf",
+    "lxml>=5.2",
+    "netcdf4>=1.7",
+    "numpy>=2.0",
+    "packaging>=24.1",
+    "pandas>=2.3",
+    "platformdirs>=4.3",
+    "pydantic>=2.7",
+    "pydantic-settings>=2.3",
+    "pyproj>=3.7",
+    "pyyaml",
+    "rasterio>=1.4",
+    "requests",
+    "rioxarray>=0.17",
+    "scipy>=1.13",
+    "shapely>=2.0",
+    "toml",
+    "xarray>=2024.9",
+]
+
+[project.optional-dependencies]
+plots = [
+    "matplotlib>=3.9",
+    "plotly>=5.21",
+    "kaleido>=1.0",
+]
+performance = [
+    "numba>=0.60",
+]
+data_apis = [
+    "adlfs>=2024.4",
+    "earthengine-api>=1.0",
+    "fsspec>=2024.5",
+    "planetary-computer>=1.0",
+    "pystac-client>=0.8",
+    "zarr>=3.0",
+]
+dev = [
+    "dash",
+    "ipython",
+    "nbval",
+    "pre-commit",
+    "pytest",
+    "pytest-cov",
+    "pytest-xdist",
+    "windIO",
+]
+doc = [
+    "docutils",
+    "jupyter",
+    "jupyter-dash",
+    "jupyter-sphinx",
+    "myst-parser",
+    "nbsphinx",
+    "nbsphinx-link",
+    "pydata-sphinx-theme",
+    "recommonmark",
+    "sphinx",
+    "sphinx-argparse",
+    "sphinx-copybutton",
+    "sphinx-design",
+    "sphinx-gallery",
+    "sphinxcontrib-bibtex",
+    "sphinxext-opengraph",
+]
+
+[project.scripts]
+split_combomap = "windkit.topography.vector_map:_split_combo"
+
+[tool.setuptools_scm]
+write_to = "windkit/_version.py"
+
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.packages.find]
+namespaces = true
+
+[tool.setuptools.package-data]
+"windkit.data" = ["*.json"]
+"windkit.data.landcover_tables" = ["*.json"]
+"windkit.data.loss_tables" = ["*.csv"]
+"windkit.data.uncertainty_tables" = ["*.csv"]
+
+[tool.pytest.ini_options]
+minversion = "6.0"
+norecursedirs = "dist build .tox"
+testpaths = ["test",]
+markers = [
+    "slow: marks tests as slow (deselect with '-m \"not slow\"')",
+    "performance: marks tests as performance tests (run with '-m performance')",
+]
+
+# Added warning filter for warnings that show up for min dependencies.
+# These do not produce any errors and once packages are upgraded, these are not emitted
+filterwarnings = [
+  "ignore:The 'shapely.geos' module is deprecated:DeprecationWarning:geopandas._compat",
+]

windkit-2.1.0rc1/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

{windkit-2.0.0 → windkit-2.1.0rc1}/windkit/__init__.py

@@ -1,4 +1,4 @@
-# (c) 2022 DTU Wind Energy
+# (c) 2026 DTU Wind Energy
 """
 WindKit provides an API for working with wind resource assessment related file formats.
 """
@@ -29,7 +29,9 @@ __all__ = [
     "is_tswc",
     "create_tswc",
     "read_tswc",
+    "tswc_to_file",
     "tswc_from_dataframe",
+    "create_tswc_pair",
     # Binned wind climate
     "validate_bwc",
     "is_bwc",
@@ -105,6 +107,8 @@ __all__ = [
     "create_wind_turbines_from_dataframe",
     "create_wind_turbines_from_arrays",
     "wind_turbines_to_geodataframe",
+    "read_wind_turbines",
+    "wind_turbines_to_file",
     # workspace
     "Workspace",
     # weng_workspace
@@ -118,7 +122,7 @@ __all__ = [
     "polygons_to_lines",
     "snap_to_layer",
     "check_dead_ends",
-    "check_lines_cross"
+    "check_lines_cross",
     # get_map
     "get_raster_map",
     "get_vector_map",
@@ -142,6 +146,7 @@ __all__ = [
     "total_uncertainty_factor",
     # tutorial_data
     "get_tutorial_data",
+    "load_tutorial_data",
 ]
 
 from windkit._version import version as __version__
@@ -168,7 +173,9 @@ from windkit.wind_climate.time_series_wind_climate import (
     is_tswc,
     create_tswc,
     read_tswc,
+    tswc_to_file,
     tswc_from_dataframe,
+    create_tswc_pair,
 )
 from windkit.wind_climate import time_series_wind_climate  # noqa: F401
 from windkit.wind_climate.binned_wind_climate import (
@@ -238,6 +245,8 @@ from windkit.wind_farm.wind_turbines import (
     create_wind_turbines_from_dataframe,
     create_wind_turbines_from_arrays,
     wind_turbines_to_geodataframe,
+    read_wind_turbines,
+    wind_turbines_to_file,
 )
 from windkit.workspace import Workspace
 from windkit.weng_workspace import WengWorkspace
@@ -301,4 +310,4 @@ from windkit.xarray_structures.direction import (
 from windkit.xarray_structures.wsbin import (
     create_wsbin_coords,
 )
-from windkit.tutorial_data import get_tutorial_data
+from windkit.tutorial_data import get_tutorial_data, load_tutorial_data

{windkit-2.0.0 → windkit-2.1.0rc1}/windkit/_errors.py

@@ -1,4 +1,4 @@
-# (c) 2022 DTU Wind Energy
+# (c) 2026 DTU Wind Energy
 """
 Package exceptions message writing
 """

windkit-2.1.0rc1/windkit/_version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '2.1.0rc1'
+__version_tuple__ = version_tuple = (2, 1, 0, 'rc1')
+
+__commit_id__ = commit_id = 'g0a6bf992d'

{windkit-2.0.0 → windkit-2.1.0rc1}/windkit/cfd.py

@@ -1,4 +1,4 @@
-# (c) 2022 DTU Wind Energy
+# (c) 2026 DTU Wind Energy
 """
 Processes WAsP CFD volume results for use in PyWAsP
 """
@@ -124,13 +124,15 @@ def read_cfdres(path, crs):
                     array = array.expand_dims(["height"])
                     sector_list.append(array)
             # combine all data arrays into a dataset
-            ds_sector = xr.merge(sector_list)
+            ds_sector = xr.merge(sector_list, compat="no_conflicts", join="outer")
             # load mesoscale roughness length
             ds_sector.coords["sector"] = sec_dir
             ds_sector = ds_sector.expand_dims(["sector"])
             all_arrays.append(ds_sector)
 
-        ds_cfd = xr.concat(all_arrays, dim="sector")
+        ds_cfd = xr.concat(
+            all_arrays, dim="sector", data_vars="all", compat="equals", join="outer"
+        )
         ds_cfd["z0meso"] = (("sector",), z0meso)
         # make sure all the meta data for sectors are there
         ds_cfd = ds_cfd.assign_coords(