grdwindinversion 0.2.5__tar.gz → 0.2.7__tar.gz

grdwindinversion-0.2.7/.github/workflows/build.yml

@@ -0,0 +1,40 @@
+name: Build and Upload Conda Package
+
+on:
+  release:
+    types:
+      - created
+
+jobs:
+  build-and-upload-conda-package:
+    if: true 
+    runs-on: ubuntu-latest
+    #${{ github.event.workflow_run.conclusion == 'success' }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set up Miniconda
+        uses: conda-incubator/setup-miniconda@v2
+        with:
+          auto-update-conda: true
+          python-version: 3.9
+
+      - name: Install conda-build
+        run: |
+          conda init
+          source ~/.bashrc
+          conda activate base
+          conda install -y -c conda-forge conda-build anaconda-client
+
+      - name: Build and Upload Conda package
+        env:
+          ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
+        run: |
+          cd recipe
+          conda init
+          source ~/.bashrc 
+          conda activate base
+          conda-build . --token $ANACONDA_TOKEN --user tcevaer -c tcevaer -c conda-forge

{grdwindinversion-0.2.5 → grdwindinversion-0.2.7}/.github/workflows/ci.yml

@@ -15,65 +15,69 @@ jobs:
 
         steps:
             # Checkout the code
-            - name: Checkout code
-              uses: actions/checkout@v4
+          - name: Checkout code
+            uses: actions/checkout@v4
 
           - uses: mamba-org/setup-micromamba@v1
             with:
                 micromamba-version: "1.5.9-1" # any version from https://github.com/mamba-org/micromamba-releases
-                channels: tcevaer, conda-forge, defaults
+                channels: tcevaer, conda-forge
                 init-shell: bash
                 post-cleanup: "all"
 
+          - name: Configure Conda channel priority to disabled
+            run: |
+                conda config --set channel_priority disabled
+
           - name: Create environment and install tools
-            run: micromamba create -n grdwind_env pytest conda-build boa python=3.10 -y -c tcevaer -c conda-forge
+            run: micromamba create -n grdwind_env pytest conda-build boa python=3.10 -y
 
           - name: Build package
             run: |
                 cd recipe
                 eval "$(micromamba shell hook --shell bash)"
                 micromamba activate grdwind_env
-                conda mambabuild . -c tcevaer -c conda-forge
+                conda mambabuild .
 
           # Install the built package into the environment
           - name: Install the built package
             run: |
                 eval "$(micromamba shell hook --shell bash)"
                 micromamba activate grdwind_env
-                conda install --use-local grdwindinversion -y -c tcevaer -c conda-forge
+                conda install --use-local grdwindinversion -y
 
             # Cache the test data if previously downloaded (up to 10 GB limit for the cache)
             # WARNING : modify the key if the data is modified !!
-            - name: Cache test data
-              uses: actions/cache@v4
-              id: cache
-              with:
-                  path: ./test_data
-                  key: test-data-v3
-                  restore-keys: test-data-v3
+          - name: Cache test data
+            uses: actions/cache@v4
+            id: cache
+            with:
+                path: ./test_data
+                key: test-data-v3
+                restore-keys: test-data-v3
 
             # Download test data if not already cached
-            - name: Download test data
-              if: steps.cache.outputs.cache-hit != 'true' # Only download if cache miss
-              run: |
+          - name: Download test data
+            if: steps.cache.outputs.cache-hit != 'true' # Only download if cache miss
+            run: |
                   mkdir -p ./test_data/
                   wget https://cloud.ifremer.fr/index.php/s/ExLQ2TnYAqozPWE/download -O /tmp/ecmwf.zip
                   unzip /tmp/ecmwf.zip -d ./test_data/
                   wget https://cloud.ifremer.fr/index.php/s/kRgdOOPsjoZieZR/download -O /tmp/l1.zip
                   unzip /tmp/l1.zip -d ./test_data/
-              timeout-minutes: 200 # Adjust depending on the size of your data
+            timeout-minutes: 200 # Adjust depending on the size of your data
 
             # Set up xsar configuration
-            - name: Setup xsar configuration
-              run: |
+          - name: Setup xsar configuration
+            run: |
                   mkdir -p ~/.xsar
                   echo "data_dir: /tmp" > ~/.xsar/config.yaml
                   echo "auxiliary_dir: ./test_data/auxiliary" >> ~/.xsar/config.yaml
                   echo "path_dataframe_aux: ./test_data/auxiliary/active_aux.csv" >> ~/.xsar/config.yaml
 
             # Set up grdwindinversion configuration
-            - name: Setup grdwindinversion configuration
-              run: |
+          - name: Setup grdwindinversion configuration
+            run: |
                   mkdir -p ~/.grdwindinversion
                   echo "'ecmwf_0100_1h': ./test_data/ECMWF/forecast/hourly/0100deg/netcdf_light/%Y/%j/ECMWF_FORECAST_0100_%Y%m%d%H%M_10U_10V.nc" > ~/.grdwindinversion/data_config.yaml
                   echo "'ecmwf_0125_1h': ./test_data/ECMWF/0.125deg/1h/forecasts/%Y/%j/ecmwf_%Y%m%d%H%M.nc" >> ~/.grdwindinversion/data_config.yaml
@@ -82,8 +86,8 @@ jobs:
                   #echo "'lut_ms1ahw_path': './test_data/GMFS/v1.6/GMF_cmodms1ahw'" >> ~/.grdwindinversion/data_config.yaml
 
             # Run the tests
-            - name: Run tests
-              run: |
+          - name: Run tests
+            run: |
                   eval "$(micromamba shell hook --shell bash)"
                   micromamba activate grdwind_env
                   pytest

{grdwindinversion-0.2.5 → grdwindinversion-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: grdwindinversion
-Version: 0.2.5
+Version: 0.2.7
 Summary: Package to perform Wind inversion from GRD Level-1 SAR images
 License: MIT
 Classifier: Development Status :: 2 - Pre-Alpha
@@ -27,6 +27,9 @@ Requires-Dist: numpy
 Requires-Dist: scipy
 Requires-Dist: fsspec
 Requires-Dist: aiohttp
+Requires-Dist: xarray-safe-s1
+Requires-Dist: xradarsat2
+Requires-Dist: xarray-safe-rcm
 
 
 # grdwindinversion

{grdwindinversion-0.2.5 → grdwindinversion-0.2.7}/grdwindinversion/inversion.py

@@ -101,7 +101,7 @@ def getOutputName2(input_file, outdir, sensor, meta, subdir=True):
             "${MISSIONID}_OK${DATA1}_PK${DATA2}_${DATA3}_${BEAM}_${DATE}_${TIME}_${POLARIZATION1}_${POLARIZATION2}_${PRODUCT}")
         match = regex.match(basename_match)
         MISSIONID, DATA1, DATA2, DATA3, BEAM_MODE, DATE, TIME, POLARIZATION1, POLARIZATION2, LAST = match.groups()
-        new_format = f"{MISSIONID.lower()}-{BEAM.lower()}-owi-xx-{meta_start_date.lower()}-{meta_stop_date.lower()}-_____-_____.nc"
+        new_format = f"{MISSIONID.lower()}-{BEAM_MODE.lower()}-owi-xx-{meta_start_date.lower()}-{meta_stop_date.lower()}-_____-_____.nc"
     else:
         raise ValueError(
             "sensor must be S1A|S1B|RS2|RCM, got sensor %s" % sensor)
@@ -607,6 +607,9 @@ def preprocess(filename, outdir, config_path, overwrite=False, add_streaks=False
         logging.error(e)
         sys.exit(-1)
 
+    # load
+    xr_dataset = xr_dataset.load()
+
     # defining dual_pol, and gmfs by channel
     if len(xr_dataset.pol.values) == 2:
         dual_pol = True
@@ -707,7 +710,7 @@ def preprocess(filename, outdir, config_path, overwrite=False, add_streaks=False
         90. - np.rad2deg(np.arctan2(xr_dataset.model_V10, xr_dataset.model_U10)) + 180) % 360
 
     xr_dataset['ancillary_wind_direction'] = xr.where(xr_dataset['mask'], np.nan,
-                                                      xr_dataset['ancillary_wind_direction'].compute()).transpose(
+                                                      xr_dataset['ancillary_wind_direction']).transpose(
         *xr_dataset['ancillary_wind_direction'].dims)
     xr_dataset['ancillary_wind_direction'].attrs = {}
     xr_dataset['ancillary_wind_direction'].attrs['units'] = 'degrees_north'
@@ -718,7 +721,7 @@ def preprocess(filename, outdir, config_path, overwrite=False, add_streaks=False
     xr_dataset['ancillary_wind_speed'] = np.sqrt(
         xr_dataset['model_U10']**2+xr_dataset['model_V10']**2)
     xr_dataset['ancillary_wind_speed'] = xr.where(xr_dataset['mask'], np.nan,
-                                                  xr_dataset['ancillary_wind_speed'].compute()).transpose(
+                                                  xr_dataset['ancillary_wind_speed']).transpose(
         *xr_dataset['ancillary_wind_speed'].dims)
     xr_dataset['ancillary_wind_speed'].attrs = {}
     xr_dataset['ancillary_wind_speed'].attrs['units'] = 'm s^-1'
@@ -727,7 +730,7 @@ def preprocess(filename, outdir, config_path, overwrite=False, add_streaks=False
     xr_dataset['ancillary_wind_speed'].attrs['standart_name'] = 'wind_speed'
 
     xr_dataset['ancillary_wind'] = xr.where(xr_dataset['mask'], np.nan,
-                                            (xr_dataset.ancillary_wind_speed * np.exp(1j * xsarsea.dir_meteo_to_sample(xr_dataset.ancillary_wind_direction, xr_dataset.ground_heading))).compute()).transpose(
+                                            (xr_dataset.ancillary_wind_speed * np.exp(1j * xsarsea.dir_meteo_to_sample(xr_dataset.ancillary_wind_direction, xr_dataset.ground_heading)))).transpose(
         *xr_dataset['ancillary_wind_speed'].dims)
 
     xr_dataset.attrs['ancillary_source'] = xr_dataset['model_U10'].attrs['history'].split('decoded: ')[
@@ -736,7 +739,7 @@ def preprocess(filename, outdir, config_path, overwrite=False, add_streaks=False
 
     # nrcs processing
     xr_dataset['sigma0_ocean'] = xr.where(xr_dataset['mask'], np.nan,
-                                          xr_dataset['sigma0'].compute()).transpose(*xr_dataset['sigma0'].dims)
+                                          xr_dataset['sigma0']).transpose(*xr_dataset['sigma0'].dims)
     xr_dataset['sigma0_ocean'].attrs = xr_dataset['sigma0'].attrs
     #  we forced it to 1e-15
     xr_dataset['sigma0_ocean'].attrs['comment'] = "clipped, no values <=0 ; 1e-15 instread"
@@ -751,7 +754,7 @@ def preprocess(filename, outdir, config_path, overwrite=False, add_streaks=False
         xr_dataset['sigma0_ocean'] <= 0, 1e-15, xr_dataset['sigma0_ocean'])
 
     xr_dataset['sigma0_ocean_raw'] = xr.where(xr_dataset['mask'], np.nan,
-                                              xr_dataset['sigma0_raw'].compute()).transpose(*xr_dataset['sigma0_raw'].dims)
+                                              xr_dataset['sigma0_raw']).transpose(*xr_dataset['sigma0_raw'].dims)
 
     xr_dataset['sigma0_ocean_raw'].attrs = xr_dataset['sigma0_raw'].attrs
 
@@ -765,7 +768,7 @@ def preprocess(filename, outdir, config_path, overwrite=False, add_streaks=False
             xr_dataset.sigma0.sel(pol=crosspol), xr_dataset.incidence, model=model_cross)
         if config["apply_flattening"]:
             xr_dataset = xr_dataset.assign(nesz_cross_flattened=(
-                ['line', 'sample'], windspeed.nesz_flattening(xr_dataset.nesz.sel(pol=crosspol), xr_dataset.incidence)))
+                ['line', 'sample'], windspeed.nesz_flattening(xr_dataset.nesz.sel(pol=crosspol), xr_dataset.incidence).data))
             xr_dataset['nesz_cross_flattened'].attrs[
                 "comment"] = 'nesz has been flattened using windspeed.nesz_flattening'
             # dsig
@@ -774,7 +777,7 @@ def preprocess(filename, outdir, config_path, overwrite=False, add_streaks=False
         else:
             # dsig
             xr_dataset["dsig_cross"] = windspeed.get_dsig(config["dsig_"+crosspol_gmf+"_NAME"], xr_dataset.incidence,
-                                                          xr_dataset['sigma0_ocean'].sel(pol=crosspol), xr_dataset['sigma0_ocean'].sel(pol=crosspol))
+                                                          xr_dataset['sigma0_ocean'].sel(pol=crosspol), xr_dataset.nesz.sel(pol=crosspol))
 
         xr_dataset.dsig_cross.attrs['comment'] = 'variable used to ponderate copol and crosspol'
         xr_dataset.dsig_cross.attrs['formula_used'] = config["dsig_" +
@@ -819,7 +822,7 @@ def preprocess(filename, outdir, config_path, overwrite=False, add_streaks=False
         xr_dataset_100.land_mask.values = binary_dilation(xr_dataset_100['land_mask'].values.astype('uint8'),
                                                           structure=np.ones((3, 3), np.uint8), iterations=3)
         xr_dataset_100['sigma0_detrend'] = xr.where(
-            xr_dataset_100['land_mask'], np.nan, xr_dataset_100['sigma0'].compute()).transpose(*xr_dataset_100['sigma0'].dims)
+            xr_dataset_100['land_mask'], np.nan, xr_dataset_100['sigma0']).transpose(*xr_dataset_100['sigma0'].dims)
 
         xr_dataset['streaks_direction'] = get_streaks(
             xr_dataset, xr_dataset_100)
@@ -899,8 +902,6 @@ def makeL2(filename, outdir, config_path, overwrite=False, generateCSV=True, add
                                                model_co=model_co,
                                                model_cross=model_cross,
                                                ** kwargs)
-    wind_co.compute()
-
     # windspeed_co
     xr_dataset['windspeed_co'] = np.abs(wind_co)
     xr_dataset["windspeed_co"].attrs["units"] = "m.s⁻1"
@@ -917,7 +918,6 @@ def makeL2(filename, outdir, config_path, overwrite=False, generateCSV=True, add
 
     # windspeed_dual / windspeed_cr / /winddir_dual / winddir_cr
     if dual_pol and wind_dual is not None:
-        wind_dual.compute()
         xr_dataset['windspeed_dual'] = np.abs(wind_dual)
         xr_dataset["windspeed_dual"].attrs["units"] = "m.s⁻1"
         xr_dataset["windspeed_dual"].attrs["long_name"] = "Wind speed inverted from model %s (%s) & %s (%s)" % (
@@ -931,7 +931,7 @@ def makeL2(filename, outdir, config_path, overwrite=False, generateCSV=True, add
         xr_dataset["winddir_dual"].attrs["model"] = "winddir_dual is a copy of copol wind direction"
 
         xr_dataset = xr_dataset.assign(
-            windspeed_cross=(['line', 'sample'], windspeed_cr))
+            windspeed_cross=(['line', 'sample'], windspeed_cr.data))
         xr_dataset["windspeed_cross"].attrs["units"] = "m.s⁻1"
         xr_dataset["windspeed_cross"].attrs["long_name"] = "Wind Speed inverted from model %s (%s)" % (
             model_cross, crosspol)

{grdwindinversion-0.2.5 → grdwindinversion-0.2.7}/grdwindinversion/utils.py

@@ -34,7 +34,7 @@ def check_incidence_range(incidence, models, **kwargs):
                 f"GMF {model_name} inc_range will be changed by kwargs to {kwargs['inc_range']}")
             lut_range = kwargs['inc_range']
 
-        inc_range = [incidence.values.min(), incidence.values.max()]
+        inc_range = [incidence.min(), incidence.max()]
         if (inc_range[0] >= lut_range[0] and inc_range[1] <= lut_range[1]):
             rets.append(True)
         else:

{grdwindinversion-0.2.5 → grdwindinversion-0.2.7}/grdwindinversion.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: grdwindinversion
-Version: 0.2.5
+Version: 0.2.7
 Summary: Package to perform Wind inversion from GRD Level-1 SAR images
 License: MIT
 Classifier: Development Status :: 2 - Pre-Alpha
@@ -27,6 +27,9 @@ Requires-Dist: numpy
 Requires-Dist: scipy
 Requires-Dist: fsspec
 Requires-Dist: aiohttp
+Requires-Dist: xarray-safe-s1
+Requires-Dist: xradarsat2
+Requires-Dist: xarray-safe-rcm
 
 
 # grdwindinversion

{grdwindinversion-0.2.5 → grdwindinversion-0.2.7}/grdwindinversion.egg-info/SOURCES.txt

@@ -13,6 +13,7 @@ requirements_dev.txt
 requirements_doc.txt
 tox.ini
 .github/dependabot.yml
+.github/workflows/build.yml
 .github/workflows/ci.yml
 .github/workflows/publish.yml
 ci/requirements/docs.yaml

{grdwindinversion-0.2.5 → grdwindinversion-0.2.7}/grdwindinversion.egg-info/requires.txt

@@ -7,3 +7,6 @@ numpy
 scipy
 fsspec
 aiohttp
+xarray-safe-s1
+xradarsat2
+xarray-safe-rcm

{grdwindinversion-0.2.5 → grdwindinversion-0.2.7}/pyproject.toml

@@ -14,6 +14,9 @@ dependencies = [
     "scipy",
     "fsspec",
     "aiohttp",
+    "xarray-safe-s1",
+    "xradarsat2",
+    "xarray-safe-rcm"
 ]
 
 dynamic = ["version"]

{grdwindinversion-0.2.5 → grdwindinversion-0.2.7}/recipe/meta.yaml

@@ -20,10 +20,9 @@ requirements:
     - python >=3.9,<3.11
     - xsar
     - xsarsea
-    - "xarray==2024.2.0"
-    - xarray-datatree
-    - "rioxarray<=0.15.5"
-    - "numpy<=1.26"
+    - xarray
+    - rioxarray
+    - numpy
     - pyyaml
     - scipy
     - fsspec
@@ -34,4 +33,4 @@ requirements:
 
 about:
   home: https://github.com/umr-lops/grdwindinversion
-  summary: 'python library to compute wind speed from GRD SAR images'
+  summary: 'python library to compute wind speed from GRD SAR images'