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

[comparator] [log extractor] distintiguish ramses_ism and old ramses

Browse Source
This commit is contained in:
Noe Brucy
2021-01-05 16:35:48 +01:00
parent 8aec5532e8
commit ff5f1eb6ed
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
comparator.py
+8 -6
View File
@@ -253,8 +253,8 @@ class Comparator(Aggregator, HDF5Container):
return series return series
def _extract_cons_from_log(self, series, log_filename, run): def _extract_cons_from_log(self, series, log_filename, run):
mhd = self.pp_params.input.mhd rism = self.pp_params.input.ramses_ism
nlines = 2 + int(mhd) # 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)
content = os.popen(cmd_grep).readlines() content = os.popen(cmd_grep).readlines()
for i in range(0, len(content), nlines + 1): for i in range(0, len(content), nlines + 1):
@@ -266,12 +266,14 @@ class Comparator(Aggregator, HDF5Container):
series["econs"][run].append(np.float(content[i].split("=")[3].split()[0])) series["econs"][run].append(np.float(content[i].split("=")[3].split()[0]))
series["epot"][run].append(np.float(content[i].split("=")[4].split()[0])) series["epot"][run].append(np.float(content[i].split("=")[4].split()[0]))
series["ekin"][run].append(np.float(content[i].split("=")[5].split()[0])) series["ekin"][run].append(np.float(content[i].split("=")[5].split()[0]))
series["eint"][run].append(np.float(content[i].split("=")[6].split()[0])) if rism:
if mhd: eint = np.float(content[i].split("=")[6].split()[0])
emag = np.float(content[i + 1].split("=")[1].split()[0]) emag = np.float(content[i + 1].split("=")[1].split()[0])
series["emag"][run].append(emag)
else: else:
series["emag"][run].append(0.0) eint = 0.0
emag = 0.0
series["eint"][run].append(eint)
series["emag"][run].append(emag)
return series return series
def _extract_rms_from_log(self, series, log_filename, run): def _extract_rms_from_log(self, series, log_filename, run):
pp_params.yml
+1 -1
View File
@@ -67,7 +67,7 @@ input: # Parameters on how to look for input files (= output from Ramses)
log_prefix : "run.log" # Prefix of the log file log_prefix : "run.log" # Prefix of the log file
label_filename : "label.txt" # Name of the label file label_filename : "label.txt" # Name of the label file
nml_filename : "run.nml" # name of the namelist file nml_filename : "run.nml" # name of the namelist file
mhd : True # Is MHD activated ramses_ism : True # If ramses-ism is used
out: # Parameters for post processing out: # Parameters for post processing
tag : "" # Tag for the image tag : "" # Tag for the image