noe/pipeline
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add support for python 3

Browse Source
This commit is contained in:
Noe Brucy
2020-06-24 00:37:28 +02:00
committed by Noe Brucy
parent ffa5c90168
commit 6bddd1e477
7 changed files with 46 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
run_selector.py
+17 -15
View File
@@ -86,15 +86,15 @@ class RunSelector:
for run in runs:
value[run] = self.get_nml_value(nml_key, run)
if operator == "=":
runs = filter(lambda r: value[r] == operand, runs)
runs = list(filter(lambda r: value[r] == operand, runs))
if operator == "!=":
runs = filter(lambda r: not value[r] == operand, runs)
runs = list(filter(lambda r: not value[r] == operand, runs))
elif operator == ">":
runs = filter(lambda r: value[r] > operand, runs)
runs = list(filter(lambda r: value[r] > operand, runs))
elif operator == "<":
runs = filter(lambda r: value[r] < operand, runs)
runs = list(filter(lambda r: value[r] < operand, runs))
elif operator == "in":
runs = filter(lambda r: value[r] in operand, runs)
runs = list(filter(lambda r: value[r] in operand, runs))
return runs
def get_runs(self, in_runs=None, name_run="*", namelist_cond={}, sort_run_by=None):
@@ -106,13 +106,15 @@ class RunSelector:
success = False
return success
runs = map(
os.path.basename,
filter(os.path.isdir, glob.glob(self.path_in + "/" + name_run)),
runs = list(
map(
os.path.basename,
list(filter(os.path.isdir, glob.glob(self.path_in + "/" + name_run))),
)
)
if not in_runs is None:
runs = filter(lambda n: n in runs, in_runs)
runs = filter(try_load_nml, runs)
runs = list(filter(lambda n: n in runs, in_runs))
runs = list(filter(try_load_nml, runs))
# Select runs that match namelist conditions
runs = self.nml_select(runs, namelist_cond)
@@ -160,12 +162,12 @@ class RunSelector:
names = glob.glob(
self.path_in + "/" + run + "/output_[0-9][0-9][0-9][0-9][0-9]"
)
nums = map(lambda n: int(n.split("/")[-1].split("_")[1]), names)
nums = list(map(lambda n: int(n.split("/")[-1].split("_")[1]), names))
if type(in_nums) == int:
in_nums = [in_nums]
if type(in_nums) == list:
nums = filter(lambda n: n in nums, in_nums)
nums = list(filter(lambda n: n in nums, in_nums))
nums = np.sort(nums)
@@ -186,12 +188,12 @@ class RunSelector:
else:
nums = []
else:
nums = filter(try_load_info, nums)
nums = list(filter(try_load_info, nums))
if not time_min is None:
nums = filter(lambda n: self.info[run][n]["time"] >= time_min, nums)
nums = list(filter(lambda n: self.info[run][n]["time"] >= time_min, nums))
if not time_max is None:
nums = filter(lambda n: self.info[run][n]["time"] <= time_max, nums)
nums = list(filter(lambda n: self.info[run][n]["time"] <= time_max, nums))
if not time is None:
times = np.asarray([[self.info[run][n]["time"], n] for n in nums])