Python wrapper for running instances of trisurf-ng
Samo Penic
2017-11-28 8b8845e452b45b765c0c74a388296d10e91787fc
Changed the executabe to tssystem ;)
2 files modified
10 ■■■■ changed files
trisurf/trisurf.py 8 ●●●● patch | view | raw | blame | history
trisurf/tsmgr.py 2 ●●● patch | view | raw | blame | history
trisurf/trisurf.py
@@ -392,7 +392,7 @@
            else:
                procname=proc.name
                procstat=proc.status
            if procname=="trisurf":
            if procname=="tssystem":
                if procstat=="stopped":
                    return TS_STOPPED
                else:
@@ -405,7 +405,7 @@
    def start(self):
        if(self.getStatus()==0 or self.getStatus()==TS_COMPLETED):
            #check if executable exists
            if(shutil.which('trisurf')==None):
            if(shutil.which('tssystem')==None):
                print("Error. Trisurf executable not found in PATH. Please install trisurf prior to running trisurf manager.")
                exit(1)
#Symlinks tape file to the directory or create tape file from snapshot in the direcory...
@@ -445,13 +445,13 @@
                else:
                    initSnap=lastVTU
                    print("WARNING: Not using initial snapshot as starting point, but selecting "+initSnap+" as a starting vesicle")
                params=["trisurf", "--restore-from-vtk",initSnap]+self.runArgs
                params=["tssystem", "--restore-from-vtk",initSnap]+self.runArgs
                print("InitSnap is: "+initSnap)
            else:
                #veify if dump exists. If not it is a first run and shoud be run with --force-from-tape
                if(os.path.isfile("dump.bin")==False):
                    self.runArgs.append("--force-from-tape")
                params=["trisurf"]+self.runArgs
                params=["tssystem"]+self.runArgs
            subprocess.Popen (params, stdout=subprocess.DEVNULL)
            cwd.goto()
        else:
trisurf/tsmgr.py
@@ -62,7 +62,7 @@
#gets version of trisurf currently running
def getTrisurfVersion():
    p = subprocess.Popen('trisurf --version', shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
    p = subprocess.Popen('tssystem --version', shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
    lines=p.stdout.readlines()
    version=re.findall(r'[0-9a-f]{7}(?:-dirty)?', lines[0].decode('ascii'))
    p.wait()