Merge pull request #73 from nansencenter/issue71_integrate_oneocean_c…

…hanges Integrate one ocean changes in new structure
nansencenter · Feb 21, 2023 · de1f44d · de1f44d
2 parents b077245 + b5565a7
commit de1f44d
Show file tree

Hide file tree

Showing 36 changed files with 214 additions and 123 deletions.
diff --git a/.github/workflows/tests_and_build.yml b/.github/workflows/tests_and_build.yml
@@ -5,7 +5,7 @@ env:
   BASE_IMAGE_NAME: "${{ secrets.DOCKER_ORG }}/geospaas:2.5.1-slim"
   IMAGE_NAME_WORKER: "${{ secrets.DOCKER_ORG }}/geospaas_processing_worker"
   IMAGE_NAME_CLI: "${{ secrets.DOCKER_ORG }}/geospaas_processing_cli"
-  IDF_CONVERTER_VERSION: '0.0.203'
+  IDF_CONVERTER_VERSION: '0.1.324'
 jobs:
   tests:
     name: Run unit tests
@@ -33,7 +33,7 @@ jobs:
         uses: docker/setup-buildx-action@v1
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASS }}
@@ -48,7 +48,7 @@ jobs:
 
       - name: Build testing image
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
           file: Dockerfile_worker
@@ -123,7 +123,7 @@ jobs:
              "https://api.github.com/repos/nansencenter/idf-converter/contents/idf_converter-${IDF_CONVERTER_VERSION}.tar.gz"
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Cache Docker layers
         uses: actions/cache@v2
@@ -135,13 +135,13 @@ jobs:
             ${{ runner.os }}-buildx-testing-
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASS }}
 
       - name: Build docker image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
           file: Dockerfile_worker
@@ -182,7 +182,7 @@ jobs:
           echo "::set-output name=VERSION::${TAG}"
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Cache Docker layers
         uses: actions/cache@v2
@@ -192,13 +192,13 @@ jobs:
           restore-keys: ${{ runner.os }}-buildx-cli-
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASS }}
 
       - name: Build docker image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
           file: Dockerfile_cli

diff --git a/Dockerfile_worker b/Dockerfile_worker
@@ -1,24 +1,35 @@
 ARG BASE_IMAGE=nansencenter/geospaas:latest-slim
 FROM ${BASE_IMAGE} as base
 
-RUN pip3 install --upgrade --no-cache-dir \
+RUN apt update && \
+    apt install -y \
+    nco
+
+RUN pip install --upgrade --no-cache-dir \
     'celery==5.2.*' \
     'django-celery-results==2.2.*' \
     'graypy==2.1.*' \
+    'importlib-metadata==4.*' \
+    'netCDF4>=1.6.0' \
     'paramiko<2.9' \
     'redis==4.1.*' \
     'requests_oauthlib==1.3.*' \
     'scp==0.14.*' \
-    'freezegun==1.1.*'
+    'freezegun==1.1.*' \
+    'nco'
 
 FROM base as full
 
+COPY idf_converter.tar.gz /tmp/idf_converter.tar.gz
+RUN pip install /tmp/idf_converter.tar.gz
+
 WORKDIR /tmp/setup
 COPY setup.py README.md ./
 COPY geospaas_processing ./geospaas_processing
-RUN python3 setup.py bdist_wheel && \
-    pip3 install -v dist/geospaas_processing-*.whl && \
+RUN python setup.py bdist_wheel && \
+    pip install -v dist/geospaas_processing-*.whl && \
     cd /tmp && rm -rf /tmp/setup/
+
 WORKDIR /
 
 ENTRYPOINT ["celery"]

diff --git a/geospaas_processing/converters/idf/converter.py b/geospaas_processing/converters/idf/converter.py
@@ -185,6 +185,9 @@ class SingleResultIDFConverter(IDFConverter):
         ParameterSelector(
             matches=lambda d: d.entry_id.startswith('GL_TS_DB_'),
             parameter_files=('cmems_013_030_drifter_0m', 'cmems_013_030_drifter_15m')),
+        ParameterSelector(
+            lambda d: re.match(r'^mercatorbiomer4v2r1_global_mean_[0-9]{8}$', d.entry_id),
+            parameter_files=('cmems_001_028_daily_mean_0.5m',)),
         ParameterSelector(
             matches=lambda d: re.match(
                 '^D[0-9]{3}-ESACCI-L4_GHRSST-SSTdepth-OSTIA-GLOB_CDR2\.1-v02\.0-fv01\.0$',
@@ -203,7 +206,8 @@ class SingleResultIDFConverter(IDFConverter):
             matches=lambda d: '-NAVO-L2P_GHRSST-SST1m-VIIRS' in d.entry_id,
             parameter_files=('ghrsst_l2p_viirs_navo_sst',)),
         ParameterSelector(
-            matches=lambda d: 'OSPO-L2P_GHRSST-SSTsubskin-VIIRS' in d.entry_id,
+            matches=lambda d: ('OSPO-L2P_GHRSST-SSTsubskin-VIIRS' in d.entry_id or
+                               '-STAR-L2P_GHRSST-SSTsubskin-VIIRS' in d.entry_id),
             parameter_files=('ghrsst_l2p_viirs_ospo_sst',)),
         ParameterSelector(
             matches=lambda d: '-OSISAF-L3C_GHRSST-SSTsubskin-AVHRR_SST_METOP_B_GLB-' in d.entry_id,
@@ -278,4 +282,7 @@ class MultiResultFoldersIDFConverter(IDFConverter):
         ParameterSelector(
             matches=lambda d: '_hts-CMCC--TEMP-MFSeas6-MEDATL-' in d.entry_id,
             parameter_files=('mfs_med-cmcc-temp',)),
+        ParameterSelector(
+            matches=lambda d: 'mfwamglocep_' in d.entry_id,
+            parameter_files=('meteofrance_model_mfwam',)),
     )
diff --git a/geospaas_processing/converters/idf/parameters/cmems_001_024_hourly_mean_surface b/geospaas_processing/converters/idf/parameters/cmems_001_024_hourly_mean_surface
@@ -8,7 +8,7 @@
    time_coverage_relative_end = +1800
    geoloc_at_pixel_center = false
    global_overrides = processing_level:L4,product_version:1.0,file_version:1.0
-   variable_overrides_thetao = valid_min:0.0,valid_max:36.0
-   variable_overrides_zos = valid_min:-2.5,valid_max:2.5
-   variable_overrides_uo = valid_min:-2.5,valid_max:2.5
-   variable_overrides_vo = valid_min:-2.5,valid_max:2.5
+   override(thetao) = valid_min:0.0,valid_max:36.0
+   override(zos) = valid_min:-2.5,valid_max:2.5
+   override(uo) = valid_min:-2.5,valid_max:2.5
+   override(vo) = valid_min:-2.5,valid_max:2.5
diff --git a/geospaas_processing/converters/idf/parameters/cmems_001_024_hourly_smoc b/geospaas_processing/converters/idf/parameters/cmems_001_024_hourly_smoc
@@ -1,23 +1,18 @@
 -t netcdf/grid/latlon
--o path = seascope/data
-   collection = cmems_001_024_hourly_smoc
+-o collection = cmems_001_024_hourly_smoc
 -i time_variable = time
    lon_variable = longitude
    lat_variable = latitude
    depth_variable = depth
    depth_dimension = depth
    depth_value = 0.5
    depth_tolerance = 0.5
-   variables = uo,vo,vsdx,vsdy,utide,vtide,utotal,vtotal
+   variables = uo,vo,utotal,vtotal
    time_coverage_relative_start = -1800
    time_coverage_relative_end = +1800
    geoloc_at_pixel_center = false
    global_overrides = processing_level:L4,product_version:1.0,file_version:1.0
-   variable_overrides_uo = valid_min:-2.5,valid_max:2.5
-   variable_overrides_vo = valid_min:-2.5,valid_max:2.5
-   variable_overrides_vsdx = valid_min:-1.5,valid_max:1.5
-   variable_overrides_vsdy = valid_min:-1.5,valid_max:1.5
-   variable_overrides_utide = valid_min:-2.5,valid_max:2.5
-   variable_overrides_vtide = valid_min:-2.5,valid_max:2.5
-   variable_overrides_utotal = valid_min:-2.5,valid_max:2.5
-   variable_overrides_vtotal = valid_min:-2.5,valid_max:2.5
+   override(uo) = valid_min:-2.5,valid_max:2.5
+   override(vo) = valid_min:-2.5,valid_max:2.5
+   override(utotal) = valid_min:-2.5,valid_max:2.5
+   override(vtotal) = valid_min:-2.5,valid_max:2.5
diff --git a/geospaas_processing/converters/idf/parameters/cmems_001_028_daily_mean_0.5m b/geospaas_processing/converters/idf/parameters/cmems_001_028_daily_mean_0.5m
@@ -0,0 +1,14 @@
+-t netcdf/grid/latlon
+-o collection = cmems_001_028_daily_mean_0.5m
+-i time_variable = time
+   lon_variable = longitude
+   lat_variable = latitude
+   depth_variable = depth
+   depth_dimension = depth
+   depth_value = 0.5
+   depth_tolerance = 0.5
+   variables = chl
+   time_coverage_relative_start = -43200
+   time_coverage_relative_end = +43200
+   geoloc_at_pixel_center = false
+   global_overrides = processing_level:model,product_version:1.,file_version:1.0
diff --git a/geospaas_processing/converters/idf/parameters/cmems_008_046 b/geospaas_processing/converters/idf/parameters/cmems_008_046
@@ -1,8 +1,7 @@
 -t netcdf/grid/latlon
--o path = seascope/data
-   collection = cmems_008_046
+-o collection = cmems_008_046
    gcp_spacing = 4
--i variables = adt,ugos,vgos,sla,ugosa,vgosa
+-i variables = adt,ugos,vgos
    time_variable = time
    time_coverage_relative_start = -43200
    time_coverage_relative_end = 43200

diff --git a/geospaas_processing/converters/idf/parameters/cmems_013_048_radar_total b/geospaas_processing/converters/idf/parameters/cmems_013_048_radar_total
@@ -6,8 +6,8 @@
    lat_variable = LATITUDE
    depth_variable = DEPH
    variables = EWCT,NSCT
-   variable_overrides_EWCT = flag_variable:QCflag,flag_max:2
-   variable_overrides_NSCT = flag_variable:QCflag,flag_max:2
+   override(EWCT) = flag_variable:QCflag,flag_max:2
+   override(NSCT) = flag_variable:QCflag,flag_max:2
    time_coverage_relative_start = -1800
    time_coverage_relative_end = +1800
    global_overrides = product_version:1.0,file_version:1.0
diff --git a/geospaas_processing/converters/idf/parameters/cmems_015_003_0m b/geospaas_processing/converters/idf/parameters/cmems_015_003_0m
@@ -1,6 +1,5 @@
 -t netcdf/grid/latlon
--o path = seascope/data
-   collection = cmems_015_003_0m
+-o collection = cmems_015_003_0m
    gcp_spacing = 4
 -i variables = uo,vo
    time_variable = time

diff --git a/geospaas_processing/converters/idf/parameters/cmems_015_003_15m b/geospaas_processing/converters/idf/parameters/cmems_015_003_15m
@@ -1,6 +1,5 @@
 -t netcdf/grid/latlon
--o path = seascope/data
-   collection = cmems_015_003_15m
+-o collection = cmems_015_003_15m
    gcp_spacing = 4
 -i variables = uo,vo
    time_variable = time

diff --git a/geospaas_processing/converters/idf/parameters/esa_cci_sst b/geospaas_processing/converters/idf/parameters/esa_cci_sst
@@ -1,10 +1,9 @@
 -t netcdf/grid/latlon
--o path = seascope/data
-   collection = esa_cci_sst
+-o collection = esa_cci_sst
 -i variables = analysed_sst,sea_ice_fraction
    time_variable = time
    lon_variable = lon
    lat_variable = lat
    global_overrides = time_coverage_end:21000101T000000Z
-   variable_overrides_analysed_sst = valid_min:270.15,valid_max:315.15
-   variable_overrides_sea_ice_fraction = valid_min:0.0,valid_max:1.0
+   override(analysed_sst) = valid_min:270.15,valid_max:315.15
+   override(sea_ice_fraction) = valid_min:0.0,valid_max:1.0
diff --git a/geospaas_processing/converters/idf/parameters/ghrsst_l2p_modis_a_day b/geospaas_processing/converters/idf/parameters/ghrsst_l2p_modis_a_day
@@ -1,9 +1,9 @@
 -t ghrsst/l2p
 -o collection = ghrsst_l2p_modis_a_day
    gcp_spacing = 32
-   add_variable_anomaly_sea_surface_temperature = using:anomaly_from_clim,climatology_path:auxiliary/sst_cci_clim_extrapolated/extra_D*-ESACCI-L4_GHRSST-SSTdepth-OSTIA-GLOB_CDR2.1-v02.0-fv01.0.nc,climatology_variable:analysed_sst,targets:sea_surface_temperature;,outputs:anomaly_sea_surface_temperature;,default_min:-10,default_max:10,extrapolate:no
+   add_variables(anomaly_sea_surface_temperature) = using:anomaly_from_clim,climatology_path:auxiliary/sst_cci_clim_extrapolated/extra_D*-ESACCI-L4_GHRSST-SSTdepth-OSTIA-GLOB_CDR2.1-v02.0-fv01.0.nc,climatology_variable:analysed_sst,targets:sea_surface_temperature;,outputs:anomaly_sea_surface_temperature;,default_min:-10,default_max:10,extrapolate:no,interpolate:yes
 -i geoloc_spacing = 64
    variables = sea_surface_temperature,chlorophyll_a,K_490
-   variable_overrides_sea_surface_temperature = flag_variable:quality_level,flag_min:4,valid_min:auto,valid_max:auto
-   variable_overrides_chlorophyll_a = flag_variable:quality_level,flag_min:4,valid_min:auto,valid_max:auto
-   variable_overrides_K_490 = flag_variable:quality_level,flag_min:4,valid_min:auto,valid_max:auto
+   override(sea_surface_temperature) = flag_variable:quality_level,flag_min:4,valid_min:auto,valid_max:auto
+   override(chlorophyll_a) = flag_variable:quality_level,flag_min:4,valid_min:auto,valid_max:auto
+   override(K_490) = flag_variable:quality_level,flag_min:4,valid_min:auto,valid_max:auto
diff --git a/geospaas_processing/converters/idf/parameters/ghrsst_l2p_modis_a_night b/geospaas_processing/converters/idf/parameters/ghrsst_l2p_modis_a_night
@@ -1,7 +1,7 @@
 -t ghrsst/l2p
 -o collection = ghrsst_l2p_modis_a_night
    gcp_spacing = 32
-   add_variable_anomaly_sea_surface_temperature = using:anomaly_from_clim,climatology_path:auxiliary/sst_cci_clim_extrapolated/extra_D*-ESACCI-L4_GHRSST-SSTdepth-OSTIA-GLOB_CDR2.1-v02.0-fv01.0.nc,climatology_variable:analysed_sst,targets:sea_surface_temperature;,outputs:anomaly_sea_surface_temperature;,default_min:-10,default_max:10,extrapolate:no
+   add_variables(anomaly_sea_surface_temperature) = using:anomaly_from_clim,climatology_path:auxiliary/sst_cci_clim_extrapolated/extra_D*-ESACCI-L4_GHRSST-SSTdepth-OSTIA-GLOB_CDR2.1-v02.0-fv01.0.nc,climatology_variable:analysed_sst,targets:sea_surface_temperature;,outputs:anomaly_sea_surface_temperature;,default_min:-10,default_max:10,extrapolate:no,interpolate:yes
 -i geoloc_spacing = 64
    variables = sea_surface_temperature
-   variable_overrides_sea_surface_temperature = flag_variable:quality_level,flag_min:4,valid_min:auto,valid_max:auto
+   override(sea_surface_temperature) = flag_variable:quality_level,flag_min:4,valid_min:auto,valid_max:auto
diff --git a/geospaas_processing/converters/idf/parameters/ghrsst_l2p_viirs_jpl_sst b/geospaas_processing/converters/idf/parameters/ghrsst_l2p_viirs_jpl_sst
@@ -1,7 +1,7 @@
 -t ghrsst/l2p
 -o collection=ghrsst_l2p_viirs_jpl_sst
    gcp_spacing = 32
-   add_variable_anomaly_sea_surface_temperature = using:anomaly_from_clim,climatology_path:auxiliary/sst_cci_clim_extrapolated/extra_D*-ESACCI-L4_GHRSST-SSTdepth-OSTIA-GLOB_CDR2.1-v02.0-fv01.0.nc,climatology_variable:analysed_sst,targets:sea_surface_temperature;,outputs:anomaly_sea_surface_temperature;,default_min:-10,default_max:10,extrapolate:n
+   add_variables(anomaly_sea_surface_temperature) = using:anomaly_from_clim,climatology_path:auxiliary/sst_cci_clim_extrapolated/extra_D*-ESACCI-L4_GHRSST-SSTdepth-OSTIA-GLOB_CDR2.1-v02.0-fv01.0.nc,climatology_variable:analysed_sst,targets:sea_surface_temperature;,outputs:anomaly_sea_surface_temperature;,default_min:-10,default_max:10,extrapolate:no,interpolate:yes
 -i geoloc_spacing = 64
-   variables = sea_surface_temperature,quality_level
-   variable_overrides_sea_surface_temperature = flag_variable:quality_level,flag_min:3,valid_min:auto,valid_max:auto
+   variables = sea_surface_temperature
+   override(sea_surface_temperature) = flag_variable:quality_level,flag_min:4,valid_min:auto,valid_max:auto
diff --git a/geospaas_processing/converters/idf/parameters/ghrsst_l2p_viirs_navo_sst b/geospaas_processing/converters/idf/parameters/ghrsst_l2p_viirs_navo_sst
@@ -1,7 +1,7 @@
 -t ghrsst/l2p
 -o collection=ghrsst_l2p_viirs_navo_sst
    gcp_spacing = 32
-   add_variable_anomaly_sea_surface_temperature = using:anomaly_from_clim,climatology_path:auxiliary/sst_cci_clim_extrapolated/extra_D*-ESACCI-L4_GHRSST-SSTdepth-OSTIA-GLOB_CDR2.1-v02.0-fv01.0.nc,climatology_variable:analysed_sst,targets:sea_surface_temperature;,outputs:anomaly_sea_surface_temperature;,default_min:-10,default_max:10,extrapolate:no
+   add_variables(anomaly_sea_surface_temperature) = using:anomaly_from_clim,climatology_path:auxiliary/sst_cci_clim_extrapolated/extra_D*-ESACCI-L4_GHRSST-SSTdepth-OSTIA-GLOB_CDR2.1-v02.0-fv01.0.nc,climatology_variable:analysed_sst,targets:sea_surface_temperature;,outputs:anomaly_sea_surface_temperature;,default_min:-10,default_max:10,extrapolate:no,interpolate:yes
 -i geoloc_spacing = 64
-   variables = sea_surface_temperature,quality_level
-   variable_overrides_sea_surface_temperature = flag_variable:quality_level,flag_min:3,valid_min:auto,valid_max:auto
+   variables = sea_surface_temperature
+   override(sea_surface_temperature) = flag_variable:quality_level,flag_min:4,valid_min:auto,valid_max:auto
diff --git a/geospaas_processing/converters/idf/parameters/ghrsst_l2p_viirs_ospo_sst b/geospaas_processing/converters/idf/parameters/ghrsst_l2p_viirs_ospo_sst
@@ -1,7 +1,7 @@
 -t ghrsst/l2p
 -o collection = ghrsst_l2p_viirs_ospo_sst
    gcp_spacing = 32
-   add_variable_anomaly_sea_surface_temperature = using:anomaly_from_clim,climatology_path:auxiliary/sst_cci_clim_extrapolated/extra_D*-ESACCI-L4_GHRSST-SSTdepth-OSTIA-GLOB_CDR2.1-v02.0-fv01.0.nc,climatology_variable:analysed_sst,targets:sea_surface_temperature;,outputs:anomaly_sea_surface_temperature;,default_min:-10,default_max:10,extrapolate:no
+   add_variables(anomaly_sea_surface_temperature) = using:anomaly_from_clim,climatology_path:auxiliary/sst_cci_clim_extrapolated/extra_D*-ESACCI-L4_GHRSST-SSTdepth-OSTIA-GLOB_CDR2.1-v02.0-fv01.0.nc,climatology_variable:analysed_sst,targets:sea_surface_temperature;,outputs:anomaly_sea_surface_temperature;,default_min:-10,default_max:10,extrapolate:no,interpolate:yes
 -i geoloc_spacing = 128
-   variables = sea_surface_temperature,quality_level
-   variable_overrides_sea_surface_temperature = flag_variable:quality_level,flag_min:3,valid_min:auto,valid_max:auto
+   variables = sea_surface_temperature
+   override(sea_surface_temperature) = flag_variable:quality_level,flag_min:4,valid_min:auto,valid_max:auto
diff --git a/geospaas_processing/converters/idf/parameters/ghrsst_l3c_avhrr_metop_b_sst b/geospaas_processing/converters/idf/parameters/ghrsst_l3c_avhrr_metop_b_sst
@@ -1,8 +1,8 @@
 -t netcdf/grid/latlon
 -o collection = ghrsst_l3c_avhrr_metop_b_sst
-   add_variable_anomaly_sea_surface_temperature = using:anomaly_from_clim,climatology_path:auxiliary/sst_cci_clim_extrapolated/extra_D*-ESACCI-L4_GHRSST-SSTdepth-OSTIA-GLOB_CDR2.1-v02.0-fv01.0.nc,climatology_variable:analysed_sst,targets:sea_surface_temperature;,outputs:anomaly_sea_surface_temperature;,default_min:-10,default_max:10,extrapolate:no
+   add_variables(anomaly_sea_surface_temperature) = using:anomaly_from_clim,climatology_path:auxiliary/sst_cci_clim_extrapolated/extra_D*-ESACCI-L4_GHRSST-SSTdepth-OSTIA-GLOB_CDR2.1-v02.0-fv01.0.nc,climatology_variable:analysed_sst,targets:sea_surface_temperature;,outputs:anomaly_sea_surface_temperature;,default_min:-10,default_max:10,extrapolate:no,interpolate:yes
 -i time_variable = time
    lon_variable = lon
    lat_variable = lat
    variables = sea_surface_temperature,l2p_flags,quality_level
-   variable_overrides_sea_surface_temperature = flag_variable:quality_level,flag_min:4,valid_min:auto,valid_max:auto
+   override(sea_surface_temperature) = flag_variable:quality_level,flag_min:4,valid_min:auto,valid_max:auto
diff --git a/geospaas_processing/converters/idf/parameters/ghrsst_l3c_goes16_sst b/geospaas_processing/converters/idf/parameters/ghrsst_l3c_goes16_sst
@@ -1,9 +1,9 @@
 -t netcdf/grid/latlon
 -o collection = ghrsst_l3c_goes16_sst
-   add_variable_anomaly_sea_surface_temperature = using:anomaly_from_clim,climatology_path:auxiliary/sst_cci_clim_extrapolated/extra_D*-ESACCI-L4_GHRSST-SSTdepth-OSTIA-GLOB_CDR2.1-v02.0-fv01.0.nc,climatology_variable:analysed_sst,targets:sea_surface_temperature;,outputs:anomaly_sea_surface_temperature;,default_min:-10,default_max:10,extrapolate:no
+   add_variables(anomaly_sea_surface_temperature) = using:anomaly_from_clim,climatology_path:auxiliary/sst_cci_clim_extrapolated/extra_D*-ESACCI-L4_GHRSST-SSTdepth-OSTIA-GLOB_CDR2.1-v02.0-fv01.0.nc,climatology_variable:analysed_sst,targets:sea_surface_temperature;,outputs:anomaly_sea_surface_temperature;,default_min:-10,default_max:10,extrapolate:no,interpolate:yes
    downscale = yes
 -i time_variable = time
    lon_variable = lon
    lat_variable = lat
    variables = sea_surface_temperature,l2p_flags,quality_level
-   variable_overrides_sea_surface_temperature = flag_variable:quality_level,flag_min:3,valid_min:auto,valid_max:auto
+   override(sea_surface_temperature) = flag_variable:quality_level,flag_min:3,valid_min:auto,valid_max:auto
diff --git a/geospaas_processing/converters/idf/parameters/ghrsst_l3c_goes17_sst b/geospaas_processing/converters/idf/parameters/ghrsst_l3c_goes17_sst
@@ -1,9 +1,9 @@
 -t netcdf/grid/latlon
 -o collection = ghrsst_l3c_goes17_sst
-   add_variable_anomaly_sea_surface_temperature = using:anomaly_from_clim,climatology_path:auxiliary/sst_cci_clim_extrapolated/extra_D*-ESACCI-L4_GHRSST-SSTdepth-OSTIA-GLOB_CDR2.1-v02.0-fv01.0.nc,climatology_variable:analysed_sst,targets:sea_surface_temperature;,outputs:anomaly_sea_surface_temperature;,default_min:-10,default_max:10,extrapolate:no
+   add_variables(anomaly_sea_surface_temperature) = using:anomaly_from_clim,climatology_path:auxiliary/sst_cci_clim_extrapolated/extra_D*-ESACCI-L4_GHRSST-SSTdepth-OSTIA-GLOB_CDR2.1-v02.0-fv01.0.nc,climatology_variable:analysed_sst,targets:sea_surface_temperature;,outputs:anomaly_sea_surface_temperature;,default_min:-10,default_max:10,extrapolate:no,interpolate:yes
    downscale = yes
 -i time_variable = time
    lon_variable = lon
    lat_variable = lat
    variables = sea_surface_temperature,l2p_flags,quality_level
-   variable_overrides_sea_surface_temperature = flag_variable:quality_level,flag_min:3,valid_min:auto,valid_max:auto
+   override(sea_surface_temperature) = flag_variable:quality_level,flag_min:3,valid_min:auto,valid_max:auto
diff --git a/geospaas_processing/converters/idf/parameters/ghrsst_l3c_seviri_atlantic_sst b/geospaas_processing/converters/idf/parameters/ghrsst_l3c_seviri_atlantic_sst
@@ -1,8 +1,8 @@
 -t netcdf/grid/latlon
 -o collection = ghrsst_l3c_seviri_atlantic_sst
-   add_variable_anomaly_sea_surface_temperature = using:anomaly_from_clim,climatology_path:auxiliary/sst_cci_clim_extrapolated/extra_D*-ESACCI-L4_GHRSST-SSTdepth-OSTIA-GLOB_CDR2.1-v02.0-fv01.0.nc,climatology_variable:analysed_sst,targets:sea_surface_temperature;,outputs:anomaly_sea_surface_temperature;,default_min:-10,default_max:10,extrapolate:no
+   add_variables(anomaly_sea_surface_temperature) = using:anomaly_from_clim,climatology_path:auxiliary/sst_cci_clim_extrapolated/extra_D*-ESACCI-L4_GHRSST-SSTdepth-OSTIA-GLOB_CDR2.1-v02.0-fv01.0.nc,climatology_variable:analysed_sst,targets:sea_surface_temperature;,outputs:anomaly_sea_surface_temperature;,default_min:-10,default_max:10,extrapolate:no,interpolate:yes
 -i time_variable = time
    lon_variable = lon
    lat_variable = lat
-   variables = sea_surface_temperature,l2p_flags,quality_level
-   variable_overrides_sea_surface_temperature = flag_variable:quality_level,flag_min:4,valid_min:auto,valid_max:auto
+   variables = sea_surface_temperature
+   override(sea_surface_temperature) = flag_variable:quality_level,flag_min:4,valid_min:auto,valid_max:auto