reapply nan fix

PCMDI · May 16, 2024 · 3fd3ecf · 3fd3ecf
1 parent cec4a43
commit 3fd3ecf
Showing 1 changed file with 13 additions and 22 deletions.
diff --git a/pcmdi_metrics/sea_ice/sea_ice_driver.py b/pcmdi_metrics/sea_ice/sea_ice_driver.py
@@ -228,14 +228,14 @@
  end_year = meyear
 
  real_clim = {
- "arctic": {"model_mean": None},
- "ca": {"model_mean": None},
- "na": {"model_mean": None},
- "np": {"model_mean": None},
- "antarctic": {"model_mean": None},
- "sp": {"model_mean": None},
- "sa": {"model_mean": None},
- "io": {"model_mean": None},
+ "arctic": {"model_mean": {}},
+ "ca": {"model_mean": {}},
+ "na": {"model_mean": {}},
+ "np": {"model_mean": {}},
+ "antarctic": {"model_mean": {}},
+ "sp": {"model_mean": {}},
+ "sa": {"model_mean": {}},
+ "io": {"model_mean": {}},
  }
  real_mean = {
  "arctic": {"model_mean": 0},
@@ -373,29 +373,20 @@
  # Running sum of all realizations
  for rgn in clims:
  real_clim[rgn][run] = clims[rgn]
- if real_clim[rgn]["model_mean"] is None:
- real_clim[rgn]["model_mean"] = clims[rgn]
- else:
- real_clim[rgn]["model_mean"][var] = (
- real_clim[rgn]["model_mean"][var] + clims[rgn][var]
- )
  real_mean[rgn][run] = means[rgn]
- real_mean[rgn]["model_mean"] = (
- real_mean[rgn]["model_mean"] + means[rgn]
- )
 
  print("\n-------------------------------------------")
  print("Calculating model regional average metrics \nfor ", model)
  print("--------------------------------------------")
  for rgn in real_clim:
  print(rgn)
  # Get model mean
- real_clim[rgn]["model_mean"][var] = real_clim[rgn]["model_mean"][
- var
- ] / len(list_of_runs)
- real_mean[rgn]["model_mean"] = real_mean[rgn]["model_mean"] / len(
- list_of_runs
+ datalist = [real_clim[rgn][r][var].data for r in list_of_runs]
+ real_clim[rgn]["model_mean"][var] = np.nanmean(
+ np.array(datalist), axis=0
  )
+ datalist = [real_mean[rgn][r] for r in list_of_runs]
+ real_mean[rgn]["model_mean"] = np.nanmean(np.array(datalist))
 
  for run in real_clim[rgn]:
  # Set up metrics dictionary