remove outliers from obs

Author: Ana Ordonez

pcmdi_metrics/extremes/extremes_driver.py

@@ -582,6 +582,7 @@
 
         # Get reference data if present
         refds = None
+        bm_ref = None
         if "Reference" in model_loop_list:
             ref_file = nc_dir + "/Reference_{0}_{1}_{2}_*_return_value.nc".format(
                 reference_data_set, region, stat
@@ -594,14 +595,17 @@
             refds.lon["bounds"] = ""
             refds = refds.bounds.add_missing_bounds()
 
+            bm_ref_file = ref_file.replace("_return_value", "")
+            bm_ref = xcdat.open_dataset(bm_ref_file)
+
         rv = xcdat.open_dataset(file)
         rv = rv.drop_vars("lat_bnds")
         rv = rv.drop_vars("lon_bnds")
         rv.lat["bounds"] = ""
         rv.lon["bounds"] = ""
         rv = rv.bounds.add_missing_bounds()
         tmp = compute_metrics.metrics_json_return_value(
-            rv, bm, refds, stat, region=region, regrid=regrid
+            rv, bm, refds, bm_ref, stat, region=region, regrid=regrid
         )
         # store the stats correctly in the metrics dictionary
         if model != "Reference":

pcmdi_metrics/extremes/lib/compute_metrics.py

@@ -590,7 +590,9 @@ def metrics_json(data_dict, obs_dict={}, region="land", regrid=True):
     return met_dict
 
 
-def metrics_json_return_value(rv, blockex, obs, stat, region="land", regrid=True):
+def metrics_json_return_value(
+    rv, blockex, obs, blockex_obs, stat, region="land", regrid=True
+):
     # Generate metrics for stationary return value comparing model and obs
     # Arguments:
     #   rv: dataset
@@ -632,6 +634,7 @@ def metrics_json_return_value(rv, blockex, obs, stat, region="land", regrid=True
         met_dict[stat][region]["std_xy"][season] = std_xy
 
         if obs is not None and not obs[season].equals(rv_tmp):
+            obs[season] = remove_outliers(obs[season], blockex_obs[season])
             # Regrid obs to model grid
             if regrid:
                 target = xc.create_grid(rv_tmp.lat, rv_tmp.lon)