Commit 00df063f authored by ext-neveu_n's avatar ext-neveu_n
Browse files

getting ready to merge

parents e1e1abff 74f4022d
...@@ -12,7 +12,6 @@ Script that launches OPAL simulations ...@@ -12,7 +12,6 @@ Script that launches OPAL simulations
import sys,re,os,string,fileinput,shutil,glob import sys,re,os,string,fileinput,shutil,glob
#import commands #import commands
import subprocess import subprocess
from simulation import Simulation from simulation import Simulation
from runoptpilot import Runoptpilot from runoptpilot import Runoptpilot
from opaldict import OpalDict from opaldict import OpalDict
......
...@@ -70,7 +70,7 @@ class Simulation: ...@@ -70,7 +70,7 @@ class Simulation:
if os.system('lndir ' + fieldmapPath) != 0: if os.system('lndir ' + fieldmapPath) != 0:
print("lndir failed (possibly doesn't exist on this system), using cp -rs..."), #print("lndir failed (possibly doesn't exist on this system), using cp -rs..."),
if os.listdir(fieldmapPath): if os.listdir(fieldmapPath):
os.system('cp -rs ' + fieldmapPath + '/* .') os.system('cp -rs ' + fieldmapPath + '/* .')
...@@ -79,7 +79,7 @@ class Simulation: ...@@ -79,7 +79,7 @@ class Simulation:
distributionPath = os.environ.get('DISTRIBUTIONS') distributionPath = os.environ.get('DISTRIBUTIONS')
if os.path.isdir(distributionPath): if os.path.isdir(distributionPath):
if os.system('lndir ' + distributionPath) != 0: if os.system('lndir ' + distributionPath) != 0:
print("lndir failed (possibly doesn't exist on this system), using cp -rs..."), #print("lndir failed (possibly doesn't exist on this system), using cp -rs..."),
if os.listdir(distributionPath): if os.listdir(distributionPath):
os.system('cp -rs ' + distributionPath + '/* .') os.system('cp -rs ' + distributionPath + '/* .')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment