diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0c874d..2471a9a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,86 +12,85 @@ jobs: test: runs-on: ubuntu-latest timeout-minutes: 360 # 6 hours limit for the job - + steps: - # Checkout the code - - name: Checkout code - uses: actions/checkout@v4 + # Checkout the code + - 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 - init-shell: bash - post-cleanup: "all" + - uses: mamba-org/setup-micromamba@v1 + with: + micromamba-version: "1.5.9-1" # any version from https://github.com/mamba-org/micromamba-releases + init-shell: bash + post-cleanup: "all" - - name: Create environment and install tools - run: micromamba create -n grdwind_env pytest conda-build boa python=3.10 -y + - name: Create environment and install tools + 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 . + - name: Build package + run: | + cd recipe + eval "$(micromamba shell hook --shell bash)" + micromamba activate grdwind_env + 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 + # 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 - # 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 + # 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 - # Download test data if not already cached - - 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 + # Download test data if not already cached + - 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 - # Set up xsar configuration - - 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 xsar configuration + - 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: | - 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 - #echo "'sarwing_luts_path': './test_data/GMFS/v1.6/'" >> ~/.grdwindinversion/data_config.yaml - #echo "'nc_luts_path': ./test_data/GMFS/nc_luts" >> ~/.grdwindinversion/data_config.yaml - #echo "'lut_cmod7_path': './test_data/GMFS/v1.6/GMF_cmod7_official/cmod7_and_python_script'" >> ~/.grdwindinversion/data_config.yaml - #echo "'lut_ms1ahw_path': './test_data/GMFS/v1.6/GMF_cmodms1ahw'" >> ~/.grdwindinversion/data_config.yaml + # Set up grdwindinversion configuration + - 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 + #echo "'nc_luts_path': ./test_data/GMFS/nc_luts" >> ~/.grdwindinversion/data_config.yaml + #echo "'lut_cmod7_path': './test_data/GMFS/v1.6/GMF_cmod7_official/cmod7_and_python_script'" >> ~/.grdwindinversion/data_config.yaml + #echo "'lut_ms1ahw_path': './test_data/GMFS/v1.6/GMF_cmodms1ahw'" >> ~/.grdwindinversion/data_config.yaml - # Run the tests - - name: Run tests - run: | - eval "$(micromamba shell hook --shell bash)" - micromamba activate grdwind_env - pytest + # Run the tests + - name: Run tests + run: | + eval "$(micromamba shell hook --shell bash)" + micromamba activate grdwind_env + pytest - # Optionally, upload test artifacts (NetCDF files or logs) if needed - #- name: Upload test artifacts - # if: failure() # Only upload on failure - # uses: actions/upload-artifact@v2 - # with: - # name: test-output - # path: ./test_output/ + # Optionally, upload test artifacts (NetCDF files or logs) if needed + #- name: Upload test artifacts + # if: failure() # Only upload on failure + # uses: actions/upload-artifact@v2 + # with: + # name: test-output + # path: ./test_output/ diff --git a/grdwindinversion/.travis.yml b/grdwindinversion/.travis.yml index 371a871..b1b3744 100644 --- a/grdwindinversion/.travis.yml +++ b/grdwindinversion/.travis.yml @@ -25,4 +25,4 @@ deploy: on: tags: true repo: agrouaze/grdwindinversion - python: 3.8 + python: 3.8 \ No newline at end of file diff --git a/grdwindinversion/inversion.py b/grdwindinversion/inversion.py index d6feb74..8070879 100644 --- a/grdwindinversion/inversion.py +++ b/grdwindinversion/inversion.py @@ -98,10 +98,10 @@ def getOutputName2(input_file, outdir, sensor, meta, subdir=True): regex = re.compile( "([A-Z0-9]+)_OK([0-9]+)_PK([0-9]+)_(.*?)_(.*?)_(.*?)_(.*?)_(.*?)_(.*?)_(.*?)") template = string.Template( - "${MISSIONID}_OK${DATA1}_PK${DATA2}_${DATA3}_${BEAM_MODE}_${DATE}_${TIME}_${POLARIZATION1}_${POLARIZATION2}_${PRODUCT}") + "${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_MODE.lower()}-owi-xx-{meta_start_date.lower()}-{meta_stop_date.lower()}-_____-_____.nc" + new_format = f"{MISSIONID.lower()}-{BEAM.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) @@ -243,7 +243,7 @@ def inverse(dual_pol, inc, sigma0, sigma0_dual, ancillary_wind, dsig_cr, model_c See Also -------- xsarsea documentation - https://cyclobs.ifremer.fr/static/sarwing_datarmor/xsarsea/examples/windspeed_inversion.html + https://cerweb.ifremer.fr/datarmor/doc_sphinx/xsarsea/ """ logging.debug("inversion") @@ -635,15 +635,7 @@ def preprocess(filename, outdir, config_path, overwrite=False, add_streaks=False config["l2_params"]["model_cross"] = model_cross config["sensor_longname"] = sensor_longname - # need to load gmfs before inversion - gmfs_impl = [x for x in [model_co, model_cross] if "gmf_" in x] - windspeed.gmfs.GmfModel.activate_gmfs_impl(gmfs_impl) - sarwings_luts = [x for x in [model_co, model_cross] - if x.startswith("sarwing_lut_")] - - if len(sarwings_luts) > 0: - windspeed.register_sarwing_luts(getConf()["sarwing_luts_path"]) - + # need to load LUTs before inversion nc_luts = [x for x in [model_co, model_cross] if x.startswith("nc_lut")] if len(nc_luts) > 0: