Correct bugs, add extractor for turb_rms

This commit is contained in:
Noe Brucy
2019-12-05 10:52:18 +01:00
parent 7d5aa9d911
commit 10600f53df
3 changed files with 73 additions and 32 deletions
+6 -13
View File
@@ -14,7 +14,6 @@ class RunSelector:
in_runs=None,
in_nums="all",
pp_params=default_params(),
number_run="[0-9]*_",
name_run="*",
namelist_cond={},
sort_run_by=None,
@@ -25,9 +24,7 @@ class RunSelector:
self.pp_params = pp_params
self.namelist = {}
self.runs = self.get_runs(
in_runs, number_run, name_run, namelist_cond, sort_run_by
)
self.runs = self.get_runs(in_runs, name_run, namelist_cond, sort_run_by)
self.info = {}
for run in self.runs:
@@ -54,14 +51,7 @@ class RunSelector:
res = res[key]
return res
def get_runs(
self,
in_runs=None,
number_run="[0-9]*_",
name_run="*",
namelist_cond={},
sort_run_by=None,
):
def get_runs(self, in_runs=None, name_run="*", namelist_cond={}, sort_run_by=None):
def try_load_nml(run):
try:
self.namelist[run] = self.load_namelist(run)
@@ -71,7 +61,8 @@ class RunSelector:
return success
runs = map(
os.path.basename, glob.glob(self.path_in + "/" + number_run + name_run)
os.path.basename,
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)
@@ -140,6 +131,8 @@ class RunSelector:
)
nums = 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)