Restructuring

README.md

@@ -42,7 +42,7 @@ pip install earthkit-climate
 Example usage:
 
 ```python
-from earthkit.climate.atmos import precipitation, temperature
+from earthkit.climate.indicators import precipitation, temperature
 from earthkit.climate.utils import conversions
 
 # Example: compute a precipitation index

docs/getting-started.rst

@@ -18,5 +18,5 @@ Compute a precipitation indicator from xclim:
 
 .. code-block:: python
 
-   from earthkit.climate.atmos import precipitation
+   from earthkit.climate.indicators import precipitation
    pr = precipitation.simple_daily_intensity(precip_data, freq="monthly")

docs/how-tos/intro_precipitation_indices.ipynb

@@ -34,7 +34,7 @@
     "import matplotlib.pyplot as plt\n",
     "import xarray as xr\n",
     "\n",
-    "from earthkit.climate.atmos import precipitation\n",
+    "from earthkit.climate.indicators import precipitation\n",
     "\n",
     "warnings.filterwarnings(\"ignore\")\n",
     "\n",

docs/how-tos/intro_temperature_indices.ipynb

@@ -35,7 +35,7 @@
     "import matplotlib.pyplot as plt\n",
     "import xarray as xr\n",
     "\n",
-    "from earthkit.climate.atmos import temperature\n",
+    "from earthkit.climate.indicators import temperature\n",
     "from earthkit.climate.utils.percentile import calculate_percentile_doy\n",
     "\n",
     "warnings.filterwarnings(\"ignore\")\n",

docs/tutorials/era5_decadal_warming.ipynb

@@ -37,7 +37,7 @@
     "import matplotlib.pyplot as plt\n",
     "import pandas as pd\n",
     "\n",
-    "from earthkit.climate.atmos import temperature"
+    "from earthkit.climate.indicators import temperature"
    ]
   },
   {

docs/tutorials/frost_days_pyrenees.ipynb

@@ -44,7 +44,7 @@
     "import earthkit.transforms as ekt\n",
     "import numpy as np\n",
     "\n",
-    "from earthkit.climate.atmos import temperature"
+    "from earthkit.climate.indicators import temperature"
    ]
   },
   {

docs/tutorials/heatwave_evolution.ipynb

@@ -31,7 +31,7 @@
     "import numpy\n",
     "import xarray\n",
     "\n",
-    "from earthkit.climate.atmos import temperature\n",
+    "from earthkit.climate.indicators import temperature\n",
     "\n",
     "warnings.filterwarnings(\"ignore\")"
    ]

docs/tutorials/tropical_nights_cooling_demand.ipynb

@@ -30,7 +30,7 @@
     "import earthkit.plots as ekp\n",
     "import matplotlib.pyplot as plt\n",
     "\n",
-    "from earthkit.climate.atmos import temperature\n",
+    "from earthkit.climate.indicators import temperature\n",
     "\n",
     "warnings.filterwarnings(\"ignore\")\n",
     "plt.rcParams[\"figure.figsize\"] = (12, 6)"

docs/user-guide.rst

@@ -5,7 +5,7 @@ Example usage:
 
 .. code-block:: python
 
-   from earthkit.climate.atmos import precipitation, temperature
+   from earthkit.climate.indicators import precipitation, temperature
    from earthkit.climate.utils import conversions
 
    # Example: compute a precipitation index

src/earthkit/climate/__init__.py

@@ -15,13 +15,9 @@
     __version__ = "999"
 
 
-import earthkit.climate.atmos as atmos
-import earthkit.climate.land as land
-import earthkit.climate.ocean as ocean
+import earthkit.climate.indicators as indicators  # noqa
 
 __all__ = [
     "__version__",
-    "atmos",
-    "land",
-    "ocean",
+    "indicators",
 ]

src/earthkit/climate/indicators/__init__.py

@@ -0,0 +1,12 @@
+# (C) Copyright 2025 - ECMWF and individual contributors.
+
+"""Climate indicators."""
+
+from earthkit.climate.indicators.hydrology import *  # noqa
+from earthkit.climate.indicators.land import *  # noqa
+from earthkit.climate.indicators.precipitation import *  # noqa
+from earthkit.climate.indicators.sea_ice import *  # noqa
+from earthkit.climate.indicators.snow import *  # noqa
+from earthkit.climate.indicators.synoptic import *  # noqa
+from earthkit.climate.indicators.temperature import *  # noqa
+from earthkit.climate.indicators.wind import *  # noqa

tests/integration/conftest.py

@@ -15,8 +15,8 @@
 import pytest
 import xarray as xr
 
-import earthkit.climate.atmos.precipitation as ek_pr
-import earthkit.climate.atmos.temperature as ek_temp
+import earthkit.climate.indicators.precipitation as ek_pr
+import earthkit.climate.indicators.temperature as ek_temp
 from earthkit.climate.utils import percentile_doy
 
 

tests/integration/test_performance.py

@@ -29,8 +29,8 @@
 import pytest
 import xarray as xr
 
-import earthkit.climate.atmos.precipitation as ek_pr
-import earthkit.climate.atmos.temperature as ek_temp
+import earthkit.climate.indicators.precipitation as ek_pr
+import earthkit.climate.indicators.temperature as ek_temp
 from earthkit.climate.utils.percentile import percentile_doy
 
 warnings.filterwarnings("ignore")

tests/unit/atmos/test_precipitation.py

@@ -14,7 +14,7 @@
 import xarray
 from pytest_mock import MockerFixture
 
-from earthkit.climate.atmos import precipitation
+from earthkit.climate.indicators import precipitation
 
 INDICATORS = [
     (precipitation.antecedent_precipitation_index, "antecedent_precipitation_index", {"val": "test"}),

tests/unit/atmos/test_synoptic.py

@@ -14,7 +14,7 @@
 import xarray
 from pytest_mock import MockerFixture
 
-from earthkit.climate.atmos import synoptic
+from earthkit.climate.indicators import synoptic
 
 INDICATORS = [
     (synoptic.jetstream_metric_woollings, "jetstream_metric_woollings"),

tests/unit/atmos/test_temperature.py

@@ -14,7 +14,7 @@
 import xarray
 from pytest_mock import MockerFixture
 
-from earthkit.climate.atmos import temperature
+from earthkit.climate.indicators import temperature
 
 INDICATORS = [
     (temperature.australian_hardiness_zones, "australian_hardiness_zones"),

tests/unit/atmos/test_wind.py

@@ -14,7 +14,7 @@
 import xarray
 from pytest_mock import MockerFixture
 
-from earthkit.climate.atmos import wind
+from earthkit.climate.indicators import wind
 
 INDICATORS = [
     (wind.calm_days, "calm_days"),

tests/unit/land/test_hydrology.py

@@ -14,7 +14,7 @@
 import xarray
 from pytest_mock import MockerFixture
 
-from earthkit.climate.land import hydrology
+from earthkit.climate.indicators import hydrology
 
 INDICATORS = [
     (hydrology.base_flow_index, "base_flow_index", {"val": "test"}),

tests/unit/land/test_land.py

@@ -14,7 +14,7 @@
 import xarray
 from pytest_mock import MockerFixture
 
-from earthkit.climate.land import land
+from earthkit.climate.indicators import land
 
 INDICATORS = [
     (land.flow_index, "flow_index", {"val": "test"}),

tests/unit/land/test_snow.py

@@ -14,7 +14,7 @@
 import xarray
 from pytest_mock import MockerFixture
 
-from earthkit.climate.land import snow
+from earthkit.climate.indicators import snow
 
 INDICATORS = [
     (snow.blowing_snow, "blowing_snow", {"val": "test"}),

tests/unit/ocean/test_sea_ice.py

@@ -14,7 +14,7 @@
 import xarray
 from pytest_mock import MockerFixture
 
-from earthkit.climate.ocean import sea_ice
+from earthkit.climate.indicators import sea_ice
 
 INDICATORS = [
     (sea_ice.sea_ice_area, "sea_ice_area", {"val": "test"}),