renamed MSC_TOOLS.library_paths to libraryPath, since only single string is returned

lib/msc_tools.py

@@ -9,13 +9,14 @@ class MSC_TOOLS():
               '2005r3':[''],
              }
 
-    def library_paths(self,callerPath='',libRelation=''):
+#--------------------------
+  def version(self,callerPath='',rootRelation=''):
+#--------------------------
     import os
 
     if os.getenv('DAMASK_ROOT'): DamaskRoot = os.getenv('DAMASK_ROOT')
-      else:                        DamaskRoot = os.path.normpath(os.path.join(os.path.dirname(os.path.realpath(callerPath)),libRelation))
+    else:                        DamaskRoot = os.path.normpath(os.path.join(os.path.dirname(os.path.realpath(callerPath)),rootRelation))
 
-      thePath = ''
     try:                                        # check for MSC.Mentat installation location
       file = open(os.path.join(DamaskRoot,'lib/pathinfo'))
       for line in file.readlines():
@@ -27,14 +28,56 @@ class MSC_TOOLS():
     for release,subdirs in sorted(self.releases.items(),reverse=True):
       for subdir in subdirs:
         libPath = '%s/mentat%s/shlib/%s'%(MSCpath,release,subdir)
-          if os.path.exists(libPath):
-            thePath = libPath
-            return thePath
-          else:
-            continue
+        if os.path.exists(libPath): return release
+        else: continue
+    
+    return ''
       
     
+#--------------------------
+  def libraryPath(self,callerPath='',rootRelation=''):
+#--------------------------
+    import os
+
+    if os.getenv('DAMASK_ROOT'): DamaskRoot = os.getenv('DAMASK_ROOT')
+    else:                        DamaskRoot = os.path.normpath(os.path.join(os.path.dirname(os.path.realpath(callerPath)),rootRelation))
+
+    try:                                        # check for MSC.Mentat installation location
+      file = open(os.path.join(DamaskRoot,'lib/pathinfo'))
+      for line in file.readlines():
+        if line.split()[0].lower() == 'msc': MSCpath = os.path.normpath(line.split()[1])
+      file.close()
+    except:
+      MSCpath = '/msc'
+    
+    for release,subdirs in sorted(self.releases.items(),reverse=True):
+      for subdir in subdirs:
+        libPath = '%s/mentat%s/shlib/%s'%(MSCpath,release,subdir)
+        if os.path.exists(libPath): return libPath
+        else: continue
+    
+    return ''
+  
+
+#--------------------------
+  def geometry_create (self,inputFile):
+#--------------------------
+    '''
+    Build nodal coordinates and element connectivity from MSC.Marc input file.
+    '''
+
+
+#--------------------------
+  def geometry_deform (self,vtkFile,ASCIItable,displacementHeader):
+#--------------------------
+    '''
+    Alter nodal coordinates in existing VTK file by displacements given in ASCIItable.
+    '''
+
+
+#--------------------------
   def submit_job(self,
+#--------------------------
                  run_marc_path='/msc/marc2010/tools/',
                  subroutine_dir=None,
                  subroutine_name='DAMASK_marc2010',
@@ -74,7 +117,9 @@ class MSC_TOOLS():
     self.p.wait()
     out.close()
       
+#--------------------------
   def exit_number_from_outFile(self,outFile=None):
+#--------------------------
     import string
     fid_out=open(outFile,'r')
     for ln in fid_out:

processing/post/mentat_colorMap.py

@@ -4,7 +4,7 @@ import sys, os, msc_tools, string
 from colorsys import *
 from optparse import OptionParser
 
-sys.path.append(msc_tools.MSC_TOOLS().library_paths(sys.argv[0],'../../'))
+sys.path.append(msc_tools.MSC_TOOLS().libraryPath(sys.argv[0],'../../'))
 
 try:
   from py_mentat import *

processing/pre/mentat_pbcOnBoxMesh.py

@@ -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.argv[0],'../../'))
+sys.path.append(msc_tools.MSC_TOOLS().libraryPath(sys.argv[0],'../../'))
 
 try:
   from py_mentat import *

processing/pre/mentat_spectralBox.py

@@ -251,7 +251,7 @@ parser.set_defaults(homogenization = 1)
 (options, args) = parser.parse_args()
 
 
-sys.path.append(msc_tools.MSC_TOOLS().library_paths(sys.argv[0],'../../'))
+sys.path.append(msc_tools.MSC_TOOLS().libraryPath(sys.argv[0],'../../'))
 
 try:
   from py_mentat import *

processing/pre/patchFromReconstructedBoundaries.py

@@ -10,7 +10,7 @@ try:                                        # check for Python Image Lib
 except:
   ImageCapability = False
 
-sys.path.append(msc_tools.MSC_TOOLS().library_paths(sys.argv[0],'../../'))
+sys.path.append(msc_tools.MSC_TOOLS().libraryPath(sys.argv[0],'../../'))
 
 try:                                        # check for MSC.Mentat Python interface
   from py_mentat import *