From a201d8379710d72bd6c6ea95ef585502b2ea4892 Mon Sep 17 00:00:00 2001 From: Test User Date: Tue, 16 Oct 2018 08:47:11 +0200 Subject: [PATCH 1/5] [skip ci] updated version information after successful test of v2.0.2-826-g50b03e03 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index b22f156cf..ff3be57f8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.2-824-ge5ec5ed5 +v2.0.2-826-g50b03e03 From 7480d1a8428d75e3a938230d5ad7f54b25602a2e Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 19 Oct 2018 07:26:27 +0200 Subject: [PATCH 2/5] fixes for Python3 --- processing/post/postResults.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/processing/post/postResults.py b/processing/post/postResults.py index 8b7e610e3..2343ca3de 100755 --- a/processing/post/postResults.py +++ b/processing/post/postResults.py @@ -79,7 +79,7 @@ class MPIEspectral_result: # mimic py_post result object self.dataOffset = 0 while self.dataOffset < self.filesize: self.file.seek(self.dataOffset) - if self.file.read(3) == 'eoh': break + if self.file.read(3) == b'eoh': break self.dataOffset += 1 self.dataOffset += 7 #search first for the new keywords with ':', if not found try to find the old ones @@ -179,7 +179,7 @@ class MPIEspectral_result: # mimic py_post result object self.file.seek(filepos) # read the starting tag in front of the keyword (Fortran indicates start and end of writing by a 4 byte tag indicating the length of the following data) dataLen=struct.unpack('i',self.file.read(4))[0] - name = self.file.read(len(identifier)) # anticipate identifier + name = self.file.read(len(identifier)).decode(errors="ignore") # anticipate identifier start=filepos+(4+len(identifier)) # position of the values for the found key filepos=filepos+(4+dataLen+4) # forward to next keyword @@ -202,7 +202,7 @@ class MPIEspectral_result: # mimic py_post result object def _keyedString(self,identifier,default=None): value = default self.file.seek(0) - m = re.search(r'(.{4})%s(.*?)\1'%identifier,self.file.read(self.dataOffset),re.DOTALL) + m = re.search(r'(.{4})%s(.*?)\1'%identifier,self.file.read(self.dataOffset).decode(errors="ignore"),re.DOTALL) if m: value = m.group(2) return value @@ -466,7 +466,7 @@ def ParseOutputFormat(filename,what,me): """Parse .output* files in order to get a list of outputs""" content = [] format = {'outputs':{},'specials':{'brothers':[]}} - for prefix in ['']+map(str,range(1,17)): + for prefix in ['']+list(map(str,range(1,17))): if os.path.exists(prefix+filename+'.output'+what): try: file = open(prefix+filename+'.output'+what) @@ -850,7 +850,7 @@ for opt in ['nodalScalar','elemScalar','elemTensor','homogenizationResult','crys if (opt in ['nodalScalar','elemScalar','elemTensor'] and label not in stat['IndexOfLabel'] and label not in ['elements',]) \ or (opt in ['homogenizationResult','crystalliteResult','constitutiveResult'] \ and (not outputFormat[opt[:-6].capitalize()]['outputs'] \ - or label not in zip(*outputFormat[opt[:-6].capitalize()]['outputs'])[0])): + or label not in list(zip(*outputFormat[opt[:-6].capitalize()]['outputs']))[0])): parser.error('%s "%s" unknown...'%(opt,label)) @@ -935,8 +935,8 @@ else: for e in range(stat['NumberOfElements']): if options.verbose and e%1000 == 0: bg.set_message('scan elem %i...'%e) myElemID = p.element_id(e) - myIpCoordinates = ipCoords(p.element(e).type, map(lambda node: [node.x, node.y, node.z], - map(p.node, map(p.node_sequence, p.element(e).items)))) + myIpCoordinates = ipCoords(p.element(e).type, list(map(lambda node: [node.x, node.y, node.z], + list(map(p.node, map(p.node_sequence, p.element(e).items)))))) myIpIDs = ipIDs(p.element(e).type) Nips = len(myIpIDs) myNodeIDs = p.element(e).items[:Nips] @@ -1023,7 +1023,7 @@ if options.verbose: bg.set_message('getting map between positions and increments incAtPosition = {} positionOfInc = {} -for position in range(stat['NumberOfIncrements']): +for position in range(int(stat['NumberOfIncrements'])): p.moveto(position+offset_pos) incAtPosition[position] = p.increment # remember "real" increment at this position positionOfInc[p.increment] = position # remember position of "real" increment @@ -1130,7 +1130,7 @@ for incCount,position in enumerate(locations): # walk through locations ['Crystallite']*len(options.crystalliteResult) + ['Constitutive']*len(options.constitutiveResult) ): - outputIndex = list(zip(*outputFormat[resultType]['outputs'])[0]).index(label) # find the position of this output in the outputFormat + outputIndex = (list(zip(*outputFormat[resultType]['outputs']))[0]).index(label) # find the position of this output in the outputFormat length = int(outputFormat[resultType]['outputs'][outputIndex][1]) thisHead = heading('_',[[component,''.join( label.split() )] for component in range(int(length>1),length+int(length>1))]) if assembleHeader: header += thisHead From 0409f2830819c18b07472f3bddd80d4c6cb0bc62 Mon Sep 17 00:00:00 2001 From: Test User Date: Sat, 20 Oct 2018 00:19:06 +0200 Subject: [PATCH 3/5] [skip ci] updated version information after successful test of v2.0.2-828-g7480d1a8 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index ff3be57f8..c0f8fafc2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.2-826-g50b03e03 +v2.0.2-828-g7480d1a8 From 0cbcb028aae106a6d656b8a8b66bf100252e5d8d Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Sun, 21 Oct 2018 15:33:13 -0400 Subject: [PATCH 4/5] fixed problem with "ValueError: Mixing iteration and read methods would lose data" for string-containing tables --- processing/post/filterTable.py | 1 + 1 file changed, 1 insertion(+) diff --git a/processing/post/filterTable.py b/processing/post/filterTable.py index aca94371c..ce09fc7b3 100755 --- a/processing/post/filterTable.py +++ b/processing/post/filterTable.py @@ -139,6 +139,7 @@ for name in filenames: table.data_readArray(positions+1) # read desired columns (indexed 1,...) table.data_writeArray() # directly write out except: + table.data_rewind() atOnce = False # data contains items that prevent array chunking if not atOnce: # read data line by line From 3eceb8a43c8172092f2c06e742ca0a6c1c599c62 Mon Sep 17 00:00:00 2001 From: Test User Date: Mon, 22 Oct 2018 09:52:53 +0200 Subject: [PATCH 5/5] [skip ci] updated version information after successful test of v2.0.2-830-g0cbcb028 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c0f8fafc2..098ab4a69 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.2-828-g7480d1a8 +v2.0.2-830-g0cbcb028