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

[refactoring] change name of cons rule to coarse_step

Browse Source
This commit is contained in:
Noe Brucy
2021-01-28 11:56:28 +01:00
parent 6f69470440
commit 9f8da0a8db
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
comparator.py
+3 -3
View File
@@ -271,7 +271,7 @@ class Comparator(Aggregator, HDF5Container):
series["mempc2"][run].append(mempc2) series["mempc2"][run].append(mempc2)
return series return series
def _extract_cons_from_log(self, series, log_filename, run): def _extract_coarse_step_from_log(self, series, log_filename, run):
rism = self.pp_params.input.ramses_ism rism = self.pp_params.input.ramses_ism
nlines = 2 + int(rism) # Number of useful lines nlines = 2 + int(rism) # Number of useful lines
cmd_grep = "grep 'Main step' {} -A {}".format(log_filename, nlines - 1) cmd_grep = "grep 'Main step' {} -A {}".format(log_filename, nlines - 1)
@@ -576,12 +576,12 @@ class Comparator(Aggregator, HDF5Container):
"turb_energy": "Injected turbulent energy", "turb_energy": "Injected turbulent energy",
}, },
), ),
"cons_from_log": Rule( "coarse_step_from_log": Rule(
self, self,
partial( partial(
self._from_log, self._from_log,
["time", "step", "mcons", "econs", "epot", "ekin", "eint", "emag"], ["time", "step", "mcons", "econs", "epot", "ekin", "eint", "emag"],
self._extract_cons_from_log, self._extract_coarse_step_from_log,
), ),
group="/series", group="/series",
unit={ unit={
plotter.py
+1 -1
View File
@@ -1712,7 +1712,7 @@ class Plotter(Aggregator, BaseProcessor):
) )
for name in ["step", "mcons", "econs", "epot", "ekin", "eint", "emag"]: for name in ["step", "mcons", "econs", "epot", "ekin", "eint", "emag"]:
self._gen_from_log("cons_from_log", name) self._gen_from_log("coarse_step_from_log", name)
for name in ["fine_step", "dt", "a", "mempc1", "mempc2"]: for name in ["fine_step", "dt", "a", "mempc1", "mempc2"]:
self._gen_from_log("fine_step_from_log", name) self._gen_from_log("fine_step_from_log", name)