Merge branch 'main' into introduce-minimum-tolerance-value

Author: AnnikaLau

engine/init.py

@@ -14,7 +14,7 @@
 import click
 from jinja2 import Environment, FileSystemLoader, StrictUndefined
 
-from util.click_util import CommaSeperatedInts, cli_help
+from util.click_util import CommaSeparatedInts, cli_help
 from util.log_handler import logger
 
 
@@ -44,7 +44,7 @@
 )
 @click.option(
     "--member-ids",
-    type=CommaSeperatedInts(),
+    type=CommaSeparatedInts(),
     default="1,2,3,4,5,6,7,8,9,10",
     help=cli_help["member_ids"],
 )

engine/perturb.py

@@ -14,7 +14,7 @@
 import click
 import numpy as np
 
-from util.click_util import CommaSeperatedInts, CommaSeperatedStrings, cli_help
+from util.click_util import CommaSeparatedInts, CommaSeparatedStrings, cli_help
 from util.log_handler import logger
 from util.netcdf_io import nc4_get_copy
 from util.utils import get_seed_from_member_id, prepend_type_to_member_id
@@ -41,12 +41,12 @@ def perturb_array(array, seed, perturb_amplitude):
 )
 @click.option(
     "--files",
-    type=CommaSeperatedStrings(),
+    type=CommaSeparatedStrings(),
     help=cli_help["files"],
 )
 @click.option(
     "--member-ids",
-    type=CommaSeperatedInts(),
+    type=CommaSeparatedInts(),
     default="1,2,3,4,5,6,7,8,9,10",
     help=cli_help["member_ids"],
 )
@@ -58,7 +58,7 @@ def perturb_array(array, seed, perturb_amplitude):
 )
 @click.option(
     "--variable-names",
-    type=CommaSeperatedStrings(),
+    type=CommaSeparatedStrings(),
     help=cli_help["variable_names"],
 )
 @click.option(

engine/run_ensemble.py

@@ -15,7 +15,7 @@
 
 import click
 
-from util.click_util import CommaSeperatedInts, CommaSeperatedStrings, cli_help
+from util.click_util import CommaSeparatedInts, CommaSeparatedStrings, cli_help
 from util.log_handler import logger
 from util.utils import get_seed_from_member_id, prepend_type_to_member_id
 
@@ -165,7 +165,7 @@ def check_job_returncode(job):
 @click.option(
     "--member-ids",
     default="1,2,3,4,5,6,7,8,9,10",
-    type=CommaSeperatedInts(),
+    type=CommaSeparatedInts(),
     help=cli_help["member_ids"],
 )
 @click.option(
@@ -186,17 +186,17 @@ def check_job_returncode(job):
 )
 @click.option(
     "--lhs",
-    type=CommaSeperatedStrings(),
+    type=CommaSeparatedStrings(),
     help=cli_help["lhs"],
 )
 @click.option(
     "--rhs-new",
-    type=CommaSeperatedStrings(),
+    type=CommaSeparatedStrings(),
     help=cli_help["rhs_new"],
 )
 @click.option(
     "--rhs-old",
-    type=CommaSeperatedStrings(),
+    type=CommaSeparatedStrings(),
     help=cli_help["rhs_old"],
 )
 def run_ensemble(

engine/stats.py

@@ -12,7 +12,7 @@
 
 import click
 
-from util.click_util import CommaSeperatedInts, cli_help
+from util.click_util import CommaSeparatedInts, cli_help
 from util.dataframe_ops import df_from_file_ids
 from util.log_handler import logger
 from util.utils import prepend_type_to_member_id
@@ -53,7 +53,7 @@ def create_stats_dataframe(input_dir, file_id, stats_file_name, file_specificati
 )
 @click.option(
     "--member-ids",
-    type=CommaSeperatedInts(),
+    type=CommaSeparatedInts(),
     default="1,2,3,4,5,6,7,8,9,10",
     help=cli_help["member_ids"],
 )

engine/tolerance.py

@@ -11,7 +11,7 @@
 import click
 import pandas as pd
 
-from util.click_util import CommaSeperatedInts, cli_help
+from util.click_util import CommaSeparatedInts, cli_help
 from util.dataframe_ops import (
     compute_rel_diff_dataframe,
     force_monotonic,
@@ -31,7 +31,7 @@
 )
 @click.option(
     "--member-ids",
-    type=CommaSeperatedInts(),
+    type=CommaSeparatedInts(),
     default="1,2,3,4,5,6,7,8,9,10",
     help=cli_help["member_ids"],
 )

util/click_util.py

@@ -52,7 +52,7 @@ def load_defaults(sections):
     return tmp
 
 
-class CommaSeperatedInts(click.ParamType):
+class CommaSeparatedInts(click.ParamType):
     """
     A custom Click parameter type for handling comma-separated integers.
 
@@ -62,7 +62,7 @@ class CommaSeperatedInts(click.ParamType):
     provided as a single comma-separated string.
     """
 
-    name = "CommaSeperatedInts"
+    name = "CommaSeparatedInts"
 
     def convert(self, value, param, ctx):
         if isinstance(value, list):
@@ -72,7 +72,7 @@ def convert(self, value, param, ctx):
         return [int(e) for e in filter(lambda x: x != "", value.split(","))]
 
 
-class CommaSeperatedStrings(click.ParamType):
+class CommaSeparatedStrings(click.ParamType):
     """
     A custom Click parameter type for handling comma-separated strings.
 
@@ -82,7 +82,7 @@ class CommaSeperatedStrings(click.ParamType):
     provided as a single comma-separated string.
     """
 
-    name = "CommaSeperatedStrings"
+    name = "CommaSeparatedStrings"
 
     def convert(self, value, param, ctx):
         if isinstance(value, list):

visualize/cdo_table_reader.py

@@ -6,7 +6,7 @@
 import click
 import pandas as pd
 
-from util.click_util import CommaSeperatedInts, CommaSeperatedStrings, cli_help
+from util.click_util import CommaSeparatedInts, CommaSeparatedStrings, cli_help
 from util.dataframe_ops import parse_probtest_csv
 
 pd.set_option("expand_frame_repr", False)
@@ -15,17 +15,17 @@
 @click.command()
 @click.option(
     "--variables",
-    type=CommaSeperatedStrings(),
+    type=CommaSeparatedStrings(),
     help=cli_help["variables"],
 )
 @click.option(
     "--file-id",
-    type=CommaSeperatedStrings(),
+    type=CommaSeparatedStrings(),
     help=cli_help["file_id"],
 )
 @click.option(
     "--times",
-    type=CommaSeperatedInts(),
+    type=CommaSeparatedInts(),
     help=cli_help["times"],
 )
 @click.option(

visualize/performance_meta_data.py

@@ -15,7 +15,7 @@
 import pandas as pd
 from matplotlib import pyplot as plt
 
-from util.click_util import CommaSeperatedStrings, cli_help
+from util.click_util import CommaSeparatedStrings, cli_help
 from util.constants import DATETIME_FORMAT
 from util.log_handler import logger
 from util.tree import TimingTree
@@ -67,7 +67,7 @@ def plot_meta_data_timer(
 )
 @click.option(
     "--timing-names",
-    type=CommaSeperatedStrings(),
+    type=CommaSeparatedStrings(),
     help=cli_help["timing_names"],
 )
 @click.option(

visualize/performance_plot.py

@@ -19,7 +19,7 @@
 import numpy as np
 from matplotlib import pyplot as plt
 
-from util.click_util import CommaSeperatedStrings, cli_help
+from util.click_util import CommaSeparatedStrings, cli_help
 from util.constants import DATETIME_FORMAT
 from util.log_handler import logger
 from util.tree import TimingTree
@@ -63,7 +63,7 @@ def colour_revs(times, revs, ax):
 )
 @click.option(
     "--timing-names",
-    type=CommaSeperatedStrings(),
+    type=CommaSeparatedStrings(),
     help=cli_help["timing_names"],
 )
 @click.option(