Fix ESACCI-OC CMORizer (#4464)

Author: schlunma

esmvaltool/cmorizers/data/cmorizer.py

@@ -595,8 +595,8 @@ def _run_ncl_script(
 
     def _run_pyt_script(
         self,
-        in_dir: str,
-        out_dir: str,
+        in_dir: Path,
+        out_dir: Path,
         dataset: str,
         start: datetime.datetime | None,
         end: datetime.datetime | None,

esmvaltool/cmorizers/data/downloaders/datasets/esacci_oc.py

@@ -4,7 +4,7 @@
 
 from dateutil import relativedelta
 
-from esmvaltool.cmorizers.data.downloaders.ftp import CCIDownloader
+from esmvaltool.cmorizers.data.downloaders.ftp import FTPDownloader
 
 
 def download_dataset(
@@ -35,21 +35,24 @@ def download_dataset(
     if not start_date:
         start_date = datetime(1997, 9, 1)
     if not end_date:
-        end_date = datetime(2020, 12, 1)
+        end_date = datetime(2022, 12, 1)
 
     loop_date = start_date
 
-    downloader = CCIDownloader(
+    # See https://climate.esa.int/en/projects/ocean-colour/data/
+    downloader = FTPDownloader(
         original_data_dir=original_data_dir,
+        server="oceancolour.org",
         dataset=dataset,
         dataset_info=dataset_info,
         overwrite=overwrite,
+        user="oc-cci-data",
+        passwd="ELaiWai8ae",  # noqa: S106
     )
-    downloader.ftp_name = "ocean_colour"
     downloader.connect()
 
-    downloader.set_cwd("v5.0-release/geographic/netcdf/chlor_a/monthly/v5.0/")
+    downloader.set_cwd("occci-v5.0/geographic/netcdf/monthly/chlor_a")
     while loop_date <= end_date:
         year = loop_date.year
-        downloader.download_year(f"{year}")
+        downloader.download_folder(str(year))
         loop_date += relativedelta.relativedelta(years=1)

esmvaltool/cmorizers/data/formatters/datasets/esacci_oc.py

@@ -20,7 +20,6 @@
    20190227-lovato_tomas: written.
 """
 
-import glob
 import logging
 import os
 from datetime import datetime
@@ -148,7 +147,7 @@ def merge_data(in_dir, out_dir, raw_info, bins):
     """Merge all data into a single (regridded) file."""
     var = raw_info["name"]
     do_bin = (bins != 0) and (bins % 2 == 0)
-    datafile = sorted(glob.glob(in_dir + "/" + raw_info["file"] + "*.nc"))
+    datafile = sorted(in_dir.glob(f"{raw_info['file']}*.nc"))
     for dataset_id in datafile:
         dataset = xr.open_dataset(dataset_id)
         data_array = dataset[var].sel(lat=slice(None, None, -1))