Merge branch 'development' of magit1.mpie.de:damask/DAMASK into miscImprovements
This commit is contained in:
commit
e3f83b6d66
|
@ -126,7 +126,7 @@ elif options.palette:
|
|||
for theColor in theMap.export(format='list',steps=options.colorcount):
|
||||
print '\t'.join(map(lambda x: str(int(255*x)),theColor))
|
||||
else: # connect to Mentat and change colorMap
|
||||
sys.path.append(damask.solver.Marc().libraryPath('../../'))
|
||||
sys.path.append(damask.solver.Marc().libraryPath())
|
||||
try:
|
||||
import py_mentat
|
||||
print 'waiting to connect...'
|
||||
|
|
|
@ -765,7 +765,7 @@ if options.filetype not in ['marc','spectral']:
|
|||
parser.error('file type "%s" not supported...'%options.filetype)
|
||||
|
||||
if options.filetype == 'marc':
|
||||
sys.path.append(damask.solver.Marc().libraryPath('../../'))
|
||||
sys.path.append(damask.solver.Marc().libraryPath())
|
||||
|
||||
try:
|
||||
from py_post import post_open
|
||||
|
|
|
@ -9,7 +9,7 @@ import damask
|
|||
scriptName = os.path.splitext(os.path.basename(__file__))[0]
|
||||
scriptID = ' '.join([scriptName,damask.version])
|
||||
|
||||
sys.path.append(damask.solver.Marc().libraryPath('../../'))
|
||||
sys.path.append(damask.solver.Marc().libraryPath())
|
||||
|
||||
active=[True,True,True] # directions on which to add PBC
|
||||
def outMentat(cmd,locals):
|
||||
|
|
|
@ -8,7 +8,7 @@ import damask
|
|||
|
||||
scriptName = os.path.splitext(os.path.basename(__file__))[0]
|
||||
scriptID = ' '.join([scriptName,damask.version])
|
||||
sys.path.append(damask.solver.Marc().libraryPath('../../'))
|
||||
sys.path.append(damask.solver.Marc().libraryPath())
|
||||
|
||||
#-------------------------------------------------------------------------------------------------
|
||||
def outMentat(cmd,locals):
|
||||
|
|
|
@ -15,7 +15,7 @@ try: # check for Python Image Lib
|
|||
except:
|
||||
ImageCapability = False
|
||||
|
||||
sys.path.append(damask.solver.Marc().libraryPath('../../'))
|
||||
sys.path.append(damask.solver.Marc().libraryPath())
|
||||
|
||||
try: # check for MSC.Mentat Python interface
|
||||
import py_mentat
|
||||
|
|
Loading…
Reference in New Issue