223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'development' of magit1.mpie.de:damask/DAMASK into miscImprovements

This commit is contained in:
Martin Diehl 2016-07-18 11:22:12 +02:00
parent 95182dac79 1b30b186f4
commit e3f83b6d66
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
processing/post/mentat_colorMap.py
View File

@ -126,7 +126,7 @@ elif options.palette:
for theColor in theMap.export(format='list',steps=options.colorcount): for theColor in theMap.export(format='list',steps=options.colorcount):
print '\t'.join(map(lambda x: str(int(255*x)),theColor)) print '\t'.join(map(lambda x: str(int(255*x)),theColor))
else: # connect to Mentat and change colorMap else: # connect to Mentat and change colorMap
sys.path.append(damask.solver.Marc().libraryPath('../../')) sys.path.append(damask.solver.Marc().libraryPath())
try: try:
import py_mentat import py_mentat
print 'waiting to connect...' print 'waiting to connect...'

2
processing/post/postResults.py
View File

@ -765,7 +765,7 @@ if options.filetype not in ['marc','spectral']:
parser.error('file type "%s" not supported...'%options.filetype) parser.error('file type "%s" not supported...'%options.filetype)
if options.filetype == 'marc': if options.filetype == 'marc':
sys.path.append(damask.solver.Marc().libraryPath('../../')) sys.path.append(damask.solver.Marc().libraryPath())
try: try:
from py_post import post_open from py_post import post_open

2
processing/pre/mentat_pbcOnBoxMesh.py
View File

@ -9,7 +9,7 @@ import damask
scriptName = os.path.splitext(os.path.basename(__file__))[0] scriptName = os.path.splitext(os.path.basename(__file__))[0]
scriptID = ' '.join([scriptName,damask.version]) 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 active=[True,True,True] # directions on which to add PBC
def outMentat(cmd,locals): def outMentat(cmd,locals):

2
processing/pre/mentat_spectralBox.py
View File

@ -8,7 +8,7 @@ import damask
scriptName = os.path.splitext(os.path.basename(__file__))[0] scriptName = os.path.splitext(os.path.basename(__file__))[0]
scriptID = ' '.join([scriptName,damask.version]) scriptID = ' '.join([scriptName,damask.version])
sys.path.append(damask.solver.Marc().libraryPath('../../')) sys.path.append(damask.solver.Marc().libraryPath())
#------------------------------------------------------------------------------------------------- #-------------------------------------------------------------------------------------------------
def outMentat(cmd,locals): def outMentat(cmd,locals):

2
processing/pre/patchFromReconstructedBoundaries.py
View File

@ -15,7 +15,7 @@ try: # check for Python Image Lib
except: except:
ImageCapability = False ImageCapability = False
sys.path.append(damask.solver.Marc().libraryPath('../../')) sys.path.append(damask.solver.Marc().libraryPath())
try: # check for MSC.Mentat Python interface try: # check for MSC.Mentat Python interface
import py_mentat import py_mentat