Tune plotmap and its interface with a C-ESM-EP run. Fix hurs plot params

For hurs bias : avoid defining 24 levels when using a 12 colors colormap

Author: senesis

climaf/classes.py

@@ -642,7 +642,10 @@ def __init__(self, **kwargs):
         self.frequency = attval.get('frequency', "*")
         # Normalized name is annual_cycle, but allow also for 'seasonal' for the time being
         if self.frequency in ['seasonal', 'annual_cycle']:
-            self.period.fx = True
+           if type(self.period) is cperiod:
+               self.period.fx = True
+           else:
+               self.period = cperiod("fx")
         freqs_dic = frequencies.get(self.project, None)
         if freqs_dic:
             for k in freqs_dic:

climaf/find_files.py

@@ -246,7 +246,7 @@ def selectGenericFiles(urls, kwargs, return_combinations=None, use_frequency=Fal
 
 
 def fixed_frequency(kwargs):
-    return kwargs.get('frequency') in ["fx", "seasonnal", "annual_cycle"] or \
+    return kwargs.get('frequency') in ["fx", "seasonal", "annual_cycle"] or \
         kwargs.get('period') in [cperiod("fx"), ] or \
         kwargs.get('table') in ['fx', ]
 
@@ -278,7 +278,7 @@ def check_period_and_store(f, period, values, kwargs, wildcards, merge_periods_o
     if fixed_frequency(kwargs):
         return store_wildcard_facet_values(f, values, kwargs, wildcards, merge_periods_on, combinations)
     else:
-        fperiod = values['period']
+        fperiod = values.get('period', values.get('clim_period'))
         if fperiod and isinstance(fperiod, six.string_types):
             fperiod = init_period(fperiod)
         #

climaf/plot/atmos_plot_params.py

@@ -27,8 +27,8 @@
     'hurs': {
         'default': {'focus': 'ocean'},
         'full_field': {'colors': ranges_to_string(ranges=[72, 92, 2]), 'color': 'precip_11lev'},
-        'bias': {'colors': ranges_to_string(ranges=[0, 10, 1], sym=True), 'color': 'precip_diff_12lev'},
-        'model_model': {'colors': ranges_to_string(ranges=[0, 10, 1], sym=True), 'color': 'precip_diff_12lev'},
+        'bias': {'colors': ranges_to_string(ranges=[0, 10, 2], sym=True), 'color': 'precip_diff_12lev'},
+        'model_model': {'colors': ranges_to_string(ranges=[0, 10, 2], sym=True), 'color': 'precip_diff_12lev'},
     },
     'rstt': {
         'full_field': {'colors': ranges_to_string(ranges=[0, 320, 20]), 'color': 'WhiteBlueGreenYellowRed'},

climaf/plot_operators.py

@@ -7,6 +7,7 @@
 from climaf import __path__ as cpath
 from climaf import operators
 from climaf.operators import cscript, fixed_fields
+from climaf.cache import cdrop
 
 scriptpath = cpath[0] + '/../scripts/'
 binpath = cpath[0] + '/../bin/'
@@ -95,8 +96,10 @@ def load_plot_operators():
             "--contours_map_max='${cntx}' "
             "--contours_map_scale='${contours_map_scale}' "
             "--contours_map_scale='${cnts}' "
+            "--scale_aux=${scale_aux} "
             "--contours_map_offset='${contours_map_offset}' "
             "--contours_map_offset='${cnto}' "
+            "--offset_aux=${offset_aux} "
             #
             # Vector map
             #
@@ -180,15 +183,22 @@ def load_plot_operators():
 
 
 def plot(*largs, forbid_plotmap=False, **kwargs):
-    """ 
-    A replacement for old CliMAF plot operator, which uses plotmap, 
-    simplifies the plot if needed, and keep tracks of arguments not managed by plotmaps
+    """
+    A replacement for old CliMAF plot operator, which uses plotmap
+    if possible, simplifies the plot if needed, and keep tracks of
+    arguments not managed by plotmap
+
     """
     caller = sys._getframe().f_back.f_code.co_name
 
     if not env.environment.plot_use_plotmap or forbid_plotmap:
+        if not env.environment.plot_use_plotmap :
+            reason = "because of global setting"
+        else:
+            reason = "because of call argument"
         rep = operators.plot(*largs, **kwargs)
-        clogger.info("Plotmap warning: using old plot for %s. Caller is :%s" % (rep.crs, caller))
+        clogger.info("Plotmap warning: using old plot for %s %s. Caller is :%s" %
+                     (rep.crs, reason, caller))
         return (rep)
 
     # Should check that input data has two horizontal dimensions ...
@@ -226,7 +236,6 @@ def plot(*largs, forbid_plotmap=False, **kwargs):
                               "Gnomonic", "Mercator", "LambertConformal", "Robinson",
                               "Hammer", "Mollweide", "PlateCarree"]
     must_use_old_plot = False
-
     # shade_above et al. : a affiner
     outargs = dict()
     for arg in kwargs.keys():
@@ -245,9 +254,10 @@ def plot(*largs, forbid_plotmap=False, **kwargs):
                              ". Caller is :%s" % caller)
                 outargs.pop(arg)
 
-            # "proj" : change Ncl names in  Cartopy's , when applicable
+            # "proj" : check that projection is known by plotmap; adapt default options
             if arg == "proj":
                 proj = kwargs["proj"]
+                clogger.info("Processing proj %s"%proj)
                 if proj[0:2] in ["NH", "SH"]:
                     pass
                 elif proj in compatible_projections:
@@ -329,7 +339,14 @@ def plot(*largs, forbid_plotmap=False, **kwargs):
                 outargs[oarg] = 'streamplot'
 
         elif arg.lower() == "mpcenterlonf":
-            outargs["proj_options"] = {'central_longitude': kwargs[arg]}
+            if "proj" in kwargs and kwargs['proj'][0:2] not in ["NH", "SH"]:
+                if 'proj_options' not in outargs:
+                    outargs['proj_options'] = dict()
+                outargs['proj_options']['central_longitude'] = kwargs[arg]
+            else:
+                # Mimic NCl behaviour, which just neglect that option
+                # for polar stereo projections
+                pass
 
         elif arg == "gsnLeftString":
             if "title_options" not in outargs:
@@ -381,13 +398,20 @@ def plot(*largs, forbid_plotmap=False, **kwargs):
     # if 'proj' not in outargs:
     #     outargs["proj"] = "PlateCarree"
 
+    if 'proj' in outargs:
+        if outargs['proj'] == 'Robinson':
+            if 'proj_options' not in outargs:
+                outargs['proj_options'] = dict()
+            if 'central_longitude' not in outargs['proj_options']:
+                outargs['proj_options']['central_longitude'] = 180.
+
     if must_use_old_plot:
         rep = operators.plot(*largs, **kwargs)
         clogger.info("Plotmap warning: using old plot for %s" % rep.crs +
                      ". Caller is :%s" % caller)
-        return (rep)
-
-    rep = operators.plotmap(main, aux, u, v, shade2, **outargs)
-    if env.environment.teach_me_plotmap:
-        print("Plotmap call: %s" % rep.crs)
+    else: 
+        rep = operators.plotmap(main, aux, u, v, shade2, **outargs)
+        if env.environment.teach_me_plotmap:
+            print("Plotmap call: %s" % rep.crs)
+        #cdrop(rep)
     return (rep)

scripts/plotmap.py

@@ -103,13 +103,15 @@ def find_ccrs(crs_name, options=dict(), data_filename=None):
 
     # If there is a file, try yo get CRS from its metadata
     if fic is not None:
-        crs_name, options = ccrs_from_metadata(fic)
-
+        crs_name, file_options = ccrs_from_metadata(fic)
+        file_options.update(options)
+        options = file_options
+        
     # Default CRS is PlateCarree
     if crs_name is None:
         # raise ValueError(
         #     "crs_name is None (can't deduce it from file %s)" % fic)
-        return ccrs.PlateCarree()
+        return ccrs.PlateCarree(**options)
 
     if debug:
         print("In find_ccrs, crs_name=", crs_name)
@@ -127,6 +129,8 @@ def ccrs_from_metadata(filename):
     http://cfconventions.org/Data/cf-conventions/cf-conventions-1.8/cf-conventions.html#appendix-grid-mappings
 
     Yet limited to the case of Lambert Conformal projection, as coded in Aladin model outputs.
+
+    Could be easily improved to identify PlateCaree, based on even lat and lon cooordinates
     """
     ccrs_name = None
     ccrs_options = {}
@@ -226,7 +230,8 @@ def get_variable_and_coordinates_from_dataset(
         variable_dataset, dimensions, selection_options)
     for d in dimensions:
         if len(variable_dataset[d]) < 2:
-            raise ValueError("Dimension %s has too short a size for a map (%d)" % (d, len(variable_dataset[d])))
+            raise ValueError("Dimension %s has too short a size for a map (%d)" % \
+                             (d, len(variable_dataset[d])))
 
     # add cyclic point if one of the dimensions is a longitude and longitude range is ~ 360
     d0 = dimensions[0]  # Name of first dimension
@@ -240,8 +245,11 @@ def get_variable_and_coordinates_from_dataset(
         if lon_range > 359.9 or lon_range < 0.1:
             if debug:
                 print("Adding cyclic longitude")
-            variable_dataset = gv.xr_add_cyclic_longitudes(
-                variable_dataset, d0)
+            try:
+                variable_dataset = gv.xr_add_cyclic_longitudes(
+                    variable_dataset, d0)
+            except:
+                pass
 
     # Retrieve and possibly compute coordinates data
     variable_coordinates_data = list()
@@ -316,7 +324,7 @@ def create_norm(nlevels, cmap, z, zmin, zmax):
     levels = MaxNLocator(nbins=nlevels).tick_values(zmin, zmax)
     if type(cmap) is str:
         cmap = plt.colormaps[cmap]
-    norm = BoundaryNorm(levels, ncolors=cmap.N, clip=True)
+    norm = BoundaryNorm(levels, ncolors=cmap.N, extend='both', clip=True)
     return norm
 
 
@@ -401,7 +409,23 @@ def plot_colored_map(fig, ax, coordinates, colored_map_file, colored_map_variabl
     contourf_args = dict(zorder=0, cmap=colored_map_cmap)
     contourf_args.update(colored_map_engine_options)
     if colored_map_levels is not None and 'levels' not in contourf_args:
+        colored_map_levels = [ float(l) for l in colored_map_levels ]
         contourf_args['levels'] = colored_map_levels
+        
+        # Mimic Ncl, which copes with too short colormaps
+        # Method is quite direct : forgot some of the highest levels
+        if colored_map_cmap.N < len(colored_map_levels) + 1:
+            to_skip = len(colored_map_levels) + 1 - colored_map_cmap.N
+            colored_map_levels = colored_map_levels[0: -to_skip ]
+            if debug:
+                print("Reducing the number of levels to match the number of colors")
+                print("Levels list is now ", colored_map_levels)
+
+        contourf_args['norm'] = BoundaryNorm(colored_map_levels,
+                                             ncolors=colored_map_cmap.N,
+                                             extend='both')
+        
+    contourf_args['extend'] = 'both'
     contourf_args["transform"] = transform
     #
     if colored_map_engine == "contourf":

scripts/plotmap_parsing.py

@@ -438,7 +438,6 @@ def mimic_gplot(args, selection_options_list):
     For most cases, this consists in changing 'args'
     For the remaining cases, this translates in returned dict 'settings'
 
-    Currenty handles : trim, date, time, units, focus, vcb
     """
 
     settings = dict()
@@ -497,6 +496,8 @@ def mimic_gplot(args, selection_options_list):
             "https://scitools.org.uk/cartopy/docs/latest/gallery/lines_and_polygons/always_circular_stereo.html")
         if len(args.projection) > 2:
             latitude_limit = float(args.projection[2:])
+        else:
+            latitude_limit = 50.
         ranges_dict = dict(lon_range=[-180, 180])
         if args.projection[0:2] == 'NH':
             args.projection = "NorthPolarStereo"
@@ -512,7 +513,10 @@ def mimic_gplot(args, selection_options_list):
         if args.projection_options is None:
             args.projection_options = dict()
         if "central_longitude" not in args.projection_options:
-            args.projection_options["central_longitude"] = 0.0
+            if args.projection in [ "NorthPolarStereo",  "SouthPolarStereo" ]:
+                args.projection_options["central_longitude"] = 0.0
+            else:
+                args.projection_options["central_longitude"] = 0.0
         if 'gridlines' not in args.axis_methods:
             args.axis_methods['gridlines'] = [dict(draw_labels=True, linestyle="--",
                                                    color='black', alpha=0.5)]
@@ -579,7 +583,7 @@ def mimic_gplot(args, selection_options_list):
                         args.colored_map_min,
                         args.colored_map_max + args.colored_map_delta,
                         args.colored_map_delta))
-                    cdic['levels'] = args.colored_map_levels
+                    #cdic['levels'] = args.colored_map_levels
 
     if args.debug:
         print("Colors/levels options for colormap engine=", cdic)