X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDLoader%2FSwig%2FCaseReader.py;h=b36b7b700a8a7c05798622e9f793138da7e6af99;hb=6c477b125d64a815064c14523f70f5fa2150bb27;hp=7fc26718050037185cdd75e7c488e55b02453245;hpb=3c911ce36f5caa779ea60042e738fa57671a44b1;p=tools%2Fmedcoupling.git diff --git a/src/MEDLoader/Swig/CaseReader.py b/src/MEDLoader/Swig/CaseReader.py index 7fc267180..b36b7b700 100644 --- a/src/MEDLoader/Swig/CaseReader.py +++ b/src/MEDLoader/Swig/CaseReader.py @@ -1,5 +1,5 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2015 CEA/DEN, EDF R&D +# Copyright (C) 2007-2016 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -61,7 +61,7 @@ class CaseReader(CaseIO): pass c=DataArrayInt(len(cells),nbNodesPerCell+1) ; c[:,0]=ct ; c[:,1:]=c2-1 ; c.rearrange(1) m.setConnectivity(c,cI,True) - m.checkCoherency2() + m.checkConsistency() return m def __traduceMeshForPolyhed(self,name,coords,arr0,arr1,arr2): @@ -72,13 +72,13 @@ class CaseReader(CaseIO): m.setCoords(coo) # arr2=arr2[:]-1 - arr0mc0=DataArrayInt(arr0) ; arr0mc0.computeOffsets2() - arr0mc1=DataArrayInt(arr0).deepCpy() - arr0mc2=DataArrayInt(len(arr0),2) ; arr0mc2[:,0]=DataArrayInt(arr0)-1 ; arr0mc2[:,1]=1 ; arr0mc2.rearrange(1) ; arr0mc2.computeOffsets2() + arr0mc0=DataArrayInt(arr0) ; arr0mc0.computeOffsetsFull() + arr0mc1=DataArrayInt(arr0).deepCopy() + arr0mc2=DataArrayInt(len(arr0),2) ; arr0mc2[:,0]=DataArrayInt(arr0)-1 ; arr0mc2[:,1]=1 ; arr0mc2.rearrange(1) ; arr0mc2.computeOffsetsFull() arr0mc3=DataArrayInt.Range(0,2*len(arr0),2).buildExplicitArrByRanges(arr0mc2) - arr1mc0=DataArrayInt(arr1) ; arr1mc0.computeOffsets2() + arr1mc0=DataArrayInt(arr1) ; arr1mc0.computeOffsetsFull() arr1mc1=arr1mc0[arr0mc0] ; arr1mc1[1:]+=arr0mc0[1:] - arr1mc2=DataArrayInt(arr1).deepCpy() ; arr1mc2+=1 ; arr1mc2.computeOffsets2() + arr1mc2=DataArrayInt(arr1).deepCopy() ; arr1mc2+=1 ; arr1mc2.computeOffsetsFull() arr2mc0=(arr1mc2[1:])[arr0mc3] # c=DataArrayInt(arr1.size+arr2.size) @@ -88,7 +88,7 @@ class CaseReader(CaseIO): c[a]=DataArrayInt(arr2) # m.setConnectivity(c,arr1mc1,True) - m.checkCoherency2() + m.checkConsistency() return m def __traduceMeshForPolygon(self,name,coords,arr0,arr1): @@ -98,14 +98,14 @@ class CaseReader(CaseIO): m=MEDCouplingUMesh(name,2) m.setCoords(coo) # - arr0_0=DataArrayInt(arr0+1) ; arr0_0.computeOffsets2() - arr0_1=DataArrayInt(len(arr0),2) ; arr0_1[:,1]=DataArrayInt(arr0) ; arr0_1[:,0]=1 ; arr0_1.rearrange(1) ; arr0_1.computeOffsets2() + arr0_0=DataArrayInt(arr0+1) ; arr0_0.computeOffsetsFull() + arr0_1=DataArrayInt(len(arr0),2) ; arr0_1[:,1]=DataArrayInt(arr0) ; arr0_1[:,0]=1 ; arr0_1.rearrange(1) ; arr0_1.computeOffsetsFull() arr0_2=DataArrayInt.Range(1,2*len(arr0),2).buildExplicitArrByRanges(arr0_1) c=DataArrayInt(len(arr0)+len(arr1)) ; c[:]=0 ; c[arr0_0[:-1]]=NORM_POLYGON c[arr0_2]=DataArrayInt(arr1-1) # m.setConnectivity(c,arr0_0,True) - m.checkCoherency2() + m.checkConsistency() return m def __convertGeo2MED(self,geoFileName): @@ -166,7 +166,7 @@ class CaseReader(CaseIO): pos+=nbNodes*3*4 ; fd.seek(pos)#np.array(0,dtype='float%i'%(typeOfCoo)).nbytes typ=fd.read(80).strip() ; pos=fd.tell() zeK="" - for k in self.dictMCTyp2.keys(): + for k in self.dictMCTyp2: if k in typ: zeK=k break @@ -215,6 +215,7 @@ class CaseReader(CaseIO): typ=fd.read(80).strip() ; pos=fd.tell() mcmeshes2=[] while pos!=end and typ!="part": + if typ[0]=='\0': pos+=1; continue mctyp=self.dictMCTyp2[typ] nbCellsOfType=np.memmap(fd,dtype='int32',mode='r',offset=int(pos),shape=(1,)).tolist()[0] pos+=4 @@ -246,10 +247,11 @@ class CaseReader(CaseIO): elt=fd.read(80) ; elt=elt.strip() ; typ=elt[:] ; pos+=80 pass pass - coo=mcmeshes2[0].getCoords() ; name=mcmeshes2[0].getName() - for itmesh in mcmeshes2: itmesh.setCoords(coo) - m=MEDCouplingUMesh.MergeUMeshesOnSameCoords(mcmeshes2) ; m.setName(name) - mcmeshes.append(m) + if mcmeshes2: + coo=mcmeshes2[0].getCoords() ; name=mcmeshes2[0].getName() + for itmesh in mcmeshes2: itmesh.setCoords(coo) + m=MEDCouplingUMesh.MergeUMeshesOnSameCoords(mcmeshes2) ; m.setName(name) + mcmeshes.append(m) pass return mcmeshes @@ -270,6 +272,8 @@ class CaseReader(CaseIO): raise Exception("ConvertField : mismatch #2") fdisc=MEDCouplingFieldDiscretization.New(self.discSpatial2[discr]) meshId=np.memmap(fd,dtype='int32',mode='r',offset=int(pos),shape=(1)).tolist()[0]-1 + if meshId >= len( mcmeshes ): + return nbOfValues=fdisc.getNumberOfTuples(mcmeshes[meshId]) vals2=DataArrayDouble(nbOfValues,nbCompo) fd.seek(pos+4) @@ -289,7 +293,7 @@ class CaseReader(CaseIO): pass f=MEDCouplingFieldDouble(self.discSpatial2[discr],ONE_TIME) ; f.setName("%s_%s"%(fieldName,mcmeshes[meshId].getName())) f.setMesh(mcmeshes[meshId]) ; f.setArray(vals2) ; f.setTime(float(it),it,-1) - f.checkCoherency() + f.checkConsistencyLight() mlfields[locId+meshId].appendFieldNoProfileSBT(f) pass @@ -323,7 +327,7 @@ class CaseReader(CaseIO): nbOfValsOfTyp=np.memmap(fd,dtype='>i4',mode='r',offset=pos,shape=(1)).tolist()[0]/4 pos+=4 vals=np.zeros(dtype=">f4",shape=(nbOfValsOfTyp*nbCompo)) - for iii in xrange(nbCompo): + for iii in range(nbCompo): valsTmp=np.memmap(fd,dtype='>f4',mode='r',offset=int(pos),shape=(nbOfValsOfTyp)) vals[iii*nbOfValsOfTyp:(iii+1)*nbOfValsOfTyp]=valsTmp pos+=nbOfValsOfTyp*4 @@ -342,7 +346,7 @@ class CaseReader(CaseIO): pass f=MEDCouplingFieldDouble(self.discSpatial2[discr],ONE_TIME) ; f.setName("%s_%s"%(fieldName,mcmeshes[nbTurn].getName())) f.setMesh(mcmeshes[nbTurn]) ; f.setArray(vals2) ; f.setTime(float(it),it,-1) - f.checkCoherency() + f.checkConsistencyLight() mlfields[locId+nbTurn].appendFieldNoProfileSBT(f) nbTurn+=1 pass @@ -364,7 +368,7 @@ class CaseReader(CaseIO): if "TIME\n" in lines: end=lines.index("TIME\n") pass - for i in xrange(ind+1,end): + for i in range(ind + 1, end): m=re.match("^([\w]+)[\s]+\per[\s]+([\w]+)[\s]*\:[\s]*([\w]+)[\s]+([\S]+)$",lines[i]) if m: if m.groups()[0]=="constant": @@ -375,13 +379,13 @@ class CaseReader(CaseIO): pass expr=re.compile("number[\s]+of[\s]+steps[\s]*\:[\s]*([\d]+)") - tmp=filter(expr.search,lines) - if len(tmp)!=0: - nbOfTimeSteps=int(expr.search(filter(expr.search,lines)[0]).group(1)) + tmp = [line for line in lines if expr.search(line)] + if tmp: + nbOfTimeSteps = int(expr.search(tmp[0]).group(1)) expr=re.compile("filename[\s]+start[\s]+number[\s]*\:[\s]*([\d]+)") - startIt=int(expr.search(filter(expr.search,lines)[0]).group(1)) + startIt = int(expr.search([line for line in lines if expr.search(line)][0]).group(1)) expr=re.compile("filename[\s]+increment[\s]*\:[\s]*([\d]+)") - incrIt=int(expr.search(filter(expr.search,lines)[0]).group(1)) + incrIt = int(expr.search([line for line in lines if expr.search(line)][0]).group(1)) else: nbOfTimeSteps=1 startIt=0 @@ -398,7 +402,7 @@ class CaseReader(CaseIO): i+=1 pass pass - for ts in xrange(nbOfTimeSteps): + for ts in range(nbOfTimeSteps): i=0 for field in fieldsInfo: if typeOfFile: @@ -412,7 +416,7 @@ class CaseReader(CaseIO): pass ret=MEDFileData() ret.setMeshes(m2) - del mlfields[filter(lambda x: len(mlfields[x])==0,range(len(mlfields)))] + del mlfields[[x for x in range(len(mlfields)) if len(mlfields[x]) == 0]] ret.setFields(mlfields) return ret