Commit 34ce6517 authored by Felipe Bordeu's avatar Felipe Bordeu
Browse files

Remove .output from readers

parent df86f0c4
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
@@ -36,8 +36,7 @@ def ReadAnsys(fileName=None, string=None, out=None, **kwargs):
    reader = AnsysReader()
    reader.SetFileName(fileName)
    reader.SetStringToRead(string)
    reader.Read(fileName=fileName, string=string, out=out, **kwargs)
    return reader.output
    return reader.Read(fileName=fileName, string=string, out=out, **kwargs)


class AnsysReader(ReaderBase):
@@ -77,7 +76,6 @@ class AnsysReader(ReaderBase):

        result = session.GetMesh()
        result.PrepareForOutput()
        self.output = result
        return result

    def GetIterator(self):
+1 −3
Original line number Diff line number Diff line
@@ -43,8 +43,7 @@ def ReadAsc(fileName=None,string=None,out=None,**kwargs):
    reader = AscReader()
    reader.SetFileName(fileName)
    reader.SetStringToRead(string)
    reader.Read(fileName=fileName, string=string,out=out,**kwargs)
    return reader.output
    return reader.Read(fileName=fileName, string=string,out=out,**kwargs)


class AscReader(ReaderBase):
@@ -208,7 +207,6 @@ class AscReader(ReaderBase):
            BaseOutputObject().PrintVerbose("Ignoring line : '" + str(l) + "'")
        self.EndReading()
        res.PrepareForOutput()
        self.output = res
        return res

from BasicTools.IO.IOFactory import RegisterReaderClass
+0 −1
Original line number Diff line number Diff line
@@ -636,7 +636,6 @@ class FemReader(ReaderBase):
        res.SetNodes(np.array([xs,ys,zs],dtype=float).T, ids )
        self.EndReading()
        res.PrepareForOutput()
        self.output = res
        self.data = resdic
        return res

+0 −1
Original line number Diff line number Diff line
@@ -198,7 +198,6 @@ class FemmReader(ReaderBase):
            print("Changing units of the file to meters")
            res.nodes *= factor
        res.PrepareForOutput()
        self.output = res
        return res


+1 −3
Original line number Diff line number Diff line
@@ -34,8 +34,7 @@ def ReadGCode(fileName=None,string=None ):
    reader = GReader()
    reader.SetFileName(fileName)
    reader.SetStringToRead(string)
    reader.Read()
    return reader.output
    return reader.Read()

class GReader(ReaderBase):
    """Gcode Reader class
@@ -127,7 +126,6 @@ class GReader(ReaderBase):

        G.shape =  (res.GetNumberOfNodes()-1,1)
        res.elemFields['OnOff'] = G
        self.output = res
        return res

from BasicTools.IO.IOFactory import RegisterReaderClass
Loading