From 9e3d7d7d6c3f5b376ec43a7e482ff2277aee7cc4 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Thu, 3 Nov 2011 13:51:54 +0000 Subject: [PATCH] made $DAMASK_ROOT definition optional --- lib/msc_tools.py | 7 +++++-- processing/post/mentat_colorMap | 2 +- processing/pre/mentat_pbcOnBoxMesh | 2 +- processing/pre/mentat_spectralBox | 2 +- processing/pre/patchFromReconstructedBoundaries | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/msc_tools.py b/lib/msc_tools.py index 0a99d571e..bddc02d34 100644 --- a/lib/msc_tools.py +++ b/lib/msc_tools.py @@ -9,12 +9,15 @@ class MSC_TOOLS(): '2005r3':[''], } - def library_paths(self): + def library_paths(self,callerPath=None,libRelation=''): import os + if callerPath: DamaskRoot = os.path.normpath(os.path.join(os.path.dirname(os.path.realpath(callerPath)),libRelation)) + else: DamaskRoot = os.getenv('DAMASK_ROOT') + thePath = '' try: # check for MSC.Mentat installation location - file = open(os.path.join(os.getenv('DAMASK_ROOT'),'lib/pathinfo')) + file = open(os.path.join(DamaskRoot,'lib/pathinfo')) for line in file.readlines(): if line.split()[0] == 'MSC': MSCpath = os.path.normpath(line.split()[1]) file.close() diff --git a/processing/post/mentat_colorMap b/processing/post/mentat_colorMap index f5efc20b9..fb8cf58db 100755 --- a/processing/post/mentat_colorMap +++ b/processing/post/mentat_colorMap @@ -4,7 +4,7 @@ import sys, os, msc_tools from colorsys import * from optparse import OptionParser -sys.path.append(msc_tools.MSC_TOOLS().library_paths()) +sys.path.append(msc_tools.MSC_TOOLS().library_paths(sys.argv[0],'../../')) try: from py_mentat import * diff --git a/processing/pre/mentat_pbcOnBoxMesh b/processing/pre/mentat_pbcOnBoxMesh index 35ac29f7f..b0cb81221 100755 --- a/processing/pre/mentat_pbcOnBoxMesh +++ b/processing/pre/mentat_pbcOnBoxMesh @@ -3,7 +3,7 @@ import sys,os,pwd,math,re,string,msc_tools from optparse import OptionParser -sys.path.append(msc_tools.MSC_TOOLS().library_paths()) +sys.path.append(msc_tools.MSC_TOOLS().library_paths(sys.argv[0],'../../')) try: from py_mentat import * diff --git a/processing/pre/mentat_spectralBox b/processing/pre/mentat_spectralBox index 81ef094ca..6e087aaa6 100755 --- a/processing/pre/mentat_spectralBox +++ b/processing/pre/mentat_spectralBox @@ -251,7 +251,7 @@ parser.set_defaults(homogenization = 1) (options, args) = parser.parse_args() -sys.path.append(msc_tools.MSC_TOOLS().library_paths()) +sys.path.append(msc_tools.MSC_TOOLS().library_paths(sys.argv[0],'../../')) try: from py_mentat import * diff --git a/processing/pre/patchFromReconstructedBoundaries b/processing/pre/patchFromReconstructedBoundaries index 88924f98f..be8ad09f1 100755 --- a/processing/pre/patchFromReconstructedBoundaries +++ b/processing/pre/patchFromReconstructedBoundaries @@ -10,7 +10,7 @@ try: # check for Python Image Lib except: ImageCapability = False -sys.path.append(msc_tools.MSC_TOOLS().library_paths()) +sys.path.append(msc_tools.MSC_TOOLS().library_paths(sys.argv[0],'../../')) try: # check for MSC.Mentat Python interface from py_mentat import *