From bcfed5710d328fa901ab27aca1fcc2175805aad4 Mon Sep 17 00:00:00 2001
From: Nikolay Koldunov <koldunovn@gmail.com>
Date: Mon, 20 Jul 2020 18:08:04 +0200
Subject: [PATCH] Fix small errors in the arctic_ocean diagnostic (#1722)

* fix 2 errors in the arctic_ocean diagnostic

* fix cm import

* fix provenance error for the latest esmvalcore master
---
 .../diag_scripts/arctic_ocean/plotting.py     | 10 +++++-----
 esmvaltool/diag_scripts/arctic_ocean/utils.py | 20 ++++++++++++-------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/esmvaltool/diag_scripts/arctic_ocean/plotting.py b/esmvaltool/diag_scripts/arctic_ocean/plotting.py
index 078f09bf0f..c65f62e08d 100644
--- a/esmvaltool/diag_scripts/arctic_ocean/plotting.py
+++ b/esmvaltool/diag_scripts/arctic_ocean/plotting.py
@@ -223,7 +223,7 @@ def hofm_plot(cfg, plot_params):
     plt.tight_layout()
     # generate the path to the output file
     plot_params['basedir'] = cfg['plot_dir']
-    plot_params['ori_file'] = [ifilename]
+    plot_params['ori_file'] = ifilename
     plot_params['areacello'] = None
     plot_params['mmodel'] = None
 
@@ -336,7 +336,7 @@ def tsplot_plot(cfg, plot_params):
                              data_type='tsplot')
     plt.savefig(pltoutname, dpi=100)
     plot_params['basedir'] = cfg['plot_dir']
-    plot_params['ori_file'] = [ifilename_t]
+    plot_params['ori_file'] = ifilename_t
     plot_params['areacello'] = None
     plot_params['mmodel'] = None
 
@@ -451,7 +451,7 @@ def plot_profile(cfg, plot_params):
     plt.gca().invert_yaxis()
 
     plot_params['basedir'] = cfg['plot_dir']
-    plot_params['ori_file'] = [ifilename]
+    plot_params['ori_file'] = ifilename
     plot_params['areacello'] = None
     plot_params['mmodel'] = None
 
@@ -590,7 +590,7 @@ def plot2d_original_grid(cfg, plot_params):
                              data_type=plot_type)
 
     plot_params['basedir'] = cfg['plot_dir']
-    plot_params['ori_file'] = [ifilename]
+    plot_params['ori_file'] = ifilename
     plot_params['areacello'] = None
     plot_params['mmodel'] = None
     plot_params['region'] = "Global"
@@ -753,7 +753,7 @@ def plot2d_bias(cfg, plot_params):
                                  str(int(target_depth))))
 
     plot_params['basedir'] = cfg['plot_dir']
-    plot_params['ori_file'] = [ifilename]
+    plot_params['ori_file'] = ifilename
     plot_params['areacello'] = None
     plot_params['mmodel'] = None
     plot_params['region'] = "Global"
diff --git a/esmvaltool/diag_scripts/arctic_ocean/utils.py b/esmvaltool/diag_scripts/arctic_ocean/utils.py
index 97ef451f92..0292bc1217 100644
--- a/esmvaltool/diag_scripts/arctic_ocean/utils.py
+++ b/esmvaltool/diag_scripts/arctic_ocean/utils.py
@@ -7,13 +7,14 @@
 import os
 import shutil
 
-import cmocean.cm as cmo
 import matplotlib as mpl
-import matplotlib.cm as cm
 import numpy as np
 import pyproj
 import seawater as sw
 from cdo import Cdo
+from cmocean import cm as cmo
+from matplotlib import cm
+from matplotlib import pylab as plt
 
 from esmvaltool.diag_scripts.shared import ProvenanceLogger
 
@@ -202,8 +203,8 @@ def dens_back(smin, smax, tmin, tmax):
     xdim = round((smax - smin) / 0.1 + 1, 0)
     ydim = round((tmax - tmin) + 1, 0)
 
-    ti_size = np.linspace(tmin, tmax, ydim * 10)
-    si_size = np.linspace(smin, smax, xdim * 10)
+    ti_size = np.linspace(tmin, tmax, int(ydim * 10))
+    si_size = np.linspace(smin, smax, int(xdim * 10))
 
     si2d, ti2d = np.meshgrid(si_size, ti_size)
 
@@ -223,8 +224,8 @@ def get_cmap(cmap_name):
 
     if cmap_name in cmo.cmapnames:
         colormap = cmo.cmap_d[cmap_name]
-    elif cmap_name in cm.datad:
-        colormap = cm.get_cmap(cmap_name)
+    elif cmap_name in plt.colormaps():
+        colormap = plt.get_cmap(cmap_name)
     elif cmap_name == "custom_salinity1":
         colormap = shiftedcolormap(cm.get_cmap("cubehelix3"),
                                    start=0,
@@ -311,6 +312,11 @@ def get_provenance_record(attributes, data_type, file_type):
     else:
         caption = "None"
 
+    if isinstance(attributes['ori_file'], str):
+        ancestor_files = [attributes['ori_file'], attributes['areacello']]
+    else:
+        ancestor_files = ["No_ancestor_file"]
+
     record = {
         'caption': caption,
         'region': attributes['region'],
@@ -318,6 +324,6 @@ def get_provenance_record(attributes, data_type, file_type):
         'references': [
             'contact_authors',
         ],
-        'ancestors': [attributes['ori_file'], attributes['areacello']]
+        'ancestors': ancestor_files
     }
     return record