ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13881 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2015-08-14 14:56:57 +00:00
parent 36315f3a96
commit 24bf97204b
3 changed files with 262 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/python/pizza/log.py
View File

@ -219,6 +219,8 @@ class log:
if self.style == 1:
s1 = txt.find(self.firststr)
s2 = txt.find("\n--",s1)
if (s2 == -1):
s2 = txt.find("\nLoop time of",s1)
pattern = "\s(\S*)\s*="
keywords = re.findall(pattern,txt[s1:s2])
keywords.insert(0,"Step")
@ -270,9 +272,7 @@ class log:
s1 = txt.find(self.firststr,start)
s2 = txt.find("Loop time of",start+1)
if s2 == -1:
s2 = txt.find("ERROR",start+1)
if s1 >= 0 and s2 >= 0 and s1 < s2: # found s1,s2 with s1 before s2
if self.style == 2:
s1 = txt.find("\n",s1) + 1
@ -296,9 +296,6 @@ class log:
if txt.find("Loop time of",start) == start: # end of file, so exit
eof -= len(txt) - start # reset eof to "Loop"
break
if txt.find("ERROR",start) == start: # end of file, so exit
eof -= len(txt) - start # reset eof to "ERROR"
break
last = 1 # entire read is a chunk
s1 = 0
@ -324,6 +321,7 @@ class log:
word2 = re.findall(pat2,section)
words = word1 + word2
self.data.append(map(float,words))
else:
lines = chunk.split("\n")
for line in lines: