Skip to content
Snippets Groups Projects
Commit e768b9bf authored by Kurt A. O'Hearn's avatar Kurt A. O'Hearn
Browse files

Tools: fix issue with merge for parse_results command (total line count error).

parent effb806a
No related branches found
No related tags found
No related merge requests found
...@@ -537,9 +537,9 @@ restart_freq 0 ! 0: do not output any restart f ...@@ -537,9 +537,9 @@ restart_freq 0 ! 0: do not output any restart f
except Exception: except Exception:
pass pass
# subtract for header, footer (total time), and extra step # subtract for header and extra step
# (e.g., 100 steps means steps 0 through 100, inclusive) # (e.g., 100 steps means steps 0 through 100, inclusive)
if (line_cnt - 3) == (int(param['nsteps']) / freq_step): if (line_cnt - 2) == (int(param['nsteps']) / freq_step):
fout.write(self.__result_body_fmt.format(path.basename(self.__geo_file).split('.')[0], fout.write(self.__result_body_fmt.format(path.basename(self.__geo_file).split('.')[0],
str(reduce(mul, map(int, param['proc_by_dim'].split(':')), 1)), str(reduce(mul, map(int, param['proc_by_dim'].split(':')), 1)),
param['nsteps'], param['cm_solver_pre_comp_type'], param['nsteps'], param['cm_solver_pre_comp_type'],
...@@ -630,9 +630,9 @@ restart_freq 0 ! 0: do not output any restart f ...@@ -630,9 +630,9 @@ restart_freq 0 ! 0: do not output any restart f
except Exception: except Exception:
pass pass
# subtract for header, footer (total time), and extra step # subtract for header and extra step
# (e.g., 100 steps means steps 0 through 100, inclusive) # (e.g., 100 steps means steps 0 through 100, inclusive)
if (line_cnt - 3) == (int(param['nsteps']) / freq_step): if (line_cnt - 2) == (int(param['nsteps']) / freq_step):
fout.write(self.__result_body_fmt.format(path.basename(self.__geo_file).split('.')[0], fout.write(self.__result_body_fmt.format(path.basename(self.__geo_file).split('.')[0],
str(reduce(mul, map(int, param['proc_by_dim'].split(':')), 1)), str(reduce(mul, map(int, param['proc_by_dim'].split(':')), 1)),
param['nsteps'], param['cm_solver_pre_comp_type'], param['nsteps'], param['cm_solver_pre_comp_type'],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment