From 01f2bea6fcc9b615d191c578a91c962df50dd050 Mon Sep 17 00:00:00 2001 From: Michael Kelleher Date: Wed, 1 Feb 2023 12:42:46 -0600 Subject: [PATCH] Add ocean variables file, light code formatting --- evv4esm/extensions/kso.py | 11 +++++------ evv4esm/extensions/ocean_vars.json | 9 +++++++++ 2 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 evv4esm/extensions/ocean_vars.json diff --git a/evv4esm/extensions/kso.py b/evv4esm/extensions/kso.py index c31845f..f4bdb05 100644 --- a/evv4esm/extensions/kso.py +++ b/evv4esm/extensions/kso.py @@ -52,17 +52,16 @@ import livvkit import numpy as np import pandas as pd +from evv4esm import EVVException, human_color_names +from evv4esm.ensembles import e3sm +from evv4esm.ensembles.tools import prob_plot +from evv4esm.utils import bib2html from livvkit import elements as el from livvkit.util import functions as fn from livvkit.util.LIVVDict import LIVVDict from scipy import stats from statsmodels.stats import multitest as smm -from evv4esm import EVVException, human_color_names -from evv4esm.ensembles import e3sm -from evv4esm.ensembles.tools import prob_plot -from evv4esm.utils import bib2html - def variable_set(name): var_sets = fn.read_json(os.path.join(os.path.dirname(__file__), "ocean_vars.json")) @@ -154,7 +153,7 @@ def parse_args(args=None): if args.config: default_args = parser.parse_args([]) - for key, val, in vars(args).items(): + for key, val in vars(args).items(): if val != vars(default_args)[key]: args.config["ks"][key] = val diff --git a/evv4esm/extensions/ocean_vars.json b/evv4esm/extensions/ocean_vars.json new file mode 100644 index 0000000..0277fc4 --- /dev/null +++ b/evv4esm/extensions/ocean_vars.json @@ -0,0 +1,9 @@ +{ + "default": [ + "activeTracers{}_salinity", + "activeTracers{}_temperature", + "ssh{}", + "velocityMeridional{}", + "velocityZonal{}" + ] +} \ No newline at end of file