Skip to content

Commit 6852c8a

Browse files
committed
Hotfix in make_benchmark_emis_tables (allow str or list)
gcpy/benchmark/modules/benchmark_funcs.py - Allow reflist and devlist to be of type str or list - If reflist or devlist is of type str, convert to list - Updated comments Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
1 parent 4371b0a commit 6852c8a

File tree

1 file changed

+13
-15
lines changed

1 file changed

+13
-15
lines changed

gcpy/benchmark/modules/benchmark_funcs.py

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2078,16 +2078,14 @@ def make_benchmark_emis_tables(
20782078
category for benchmarking purposes.
20792079
20802080
Args:
2081-
reflist: list of str
2082-
List with the path names of the emissions file or files
2083-
(multiple months) that will constitute the "Ref"
2084-
(aka "Reference") data set.
2081+
reflist: str | list of str
2082+
Path name(s) of the emissions file(s) that constitute
2083+
the "Ref" (aka "Reference") data set.
20852084
refstr: str
20862085
A string to describe ref (e.g. version number)
2087-
devlist: list of str
2088-
List with the path names of the emissions file or files
2089-
(multiple months) that will constitute the "Dev"
2090-
(aka "Development") data set
2086+
devlist: str | list of str
2087+
Path name(s) of the emissions file(s) that constitute
2088+
the "Dev" (aka "Development") data set.
20912089
devstr: str
20922090
A string to describe dev (e.g. version number)
20932091
spcdb_files : list
@@ -2128,9 +2126,9 @@ def make_benchmark_emis_tables(
21282126
# ==================================================================
21292127
# Initialization
21302128
# ==================================================================
2131-
verify_variable_type(reflist, list)
2129+
verify_variable_type(reflist, (str,list))
21322130
verify_variable_type(refstr, str)
2133-
verify_variable_type(devlist, list)
2131+
verify_variable_type(devlist, (str,list))
21342132
verify_variable_type(devstr, str)
21352133
verify_variable_type(spcdb_files, list)
21362134

@@ -2151,12 +2149,12 @@ def make_benchmark_emis_tables(
21512149
# ==================================================================
21522150

21532151
# Read the input datasets
2154-
# Also read the meteorology datasets if passed. These are optional since it
2155-
# the refds and devds have variable AREA already (always true) and
2156-
# unit conversions do not require any meteorology.
2157-
if len(reflist) == 1:
2152+
# Also read the meteorology datasets if passed. These are optional
2153+
# since the refds and devds have variable AREA already (always true)
2154+
# and unit conversions do not require any meteorology.
2155+
if isinstance(reflist, str):
21582156
reflist = [reflist]
2159-
if len(devlist) == 1:
2157+
if isinstance(devlist, str):
21602158
devlist = [devlist]
21612159
refmetds = None
21622160
devmetds = None

0 commit comments

Comments
 (0)