From 487466dd8853fb347a2ee9df6dbd66fc6fdd8a5d Mon Sep 17 00:00:00 2001
From: Philip	Eisenlohr <eisenlohr@egr.msu.edu>
Date: Tue, 26 Oct 2010 16:26:55 +0000
Subject: [PATCH] scripts are now aware of symbolic links to themselves...

---
 processing/post/mentat_colorMap                  | 16 ++++++++++++----
 processing/post/postResults                      | 16 ++++++++++++----
 .../pre/mentat_patchFromReconstructedBoundaries  | 16 ++++++++++++----
 processing/pre/mentat_pbcOnBoxMesh               | 16 ++++++++++++----
 processing/pre/mentat_spectralBox                | 11 ++++++++++-
 5 files changed, 58 insertions(+), 17 deletions(-)

diff --git a/processing/post/mentat_colorMap b/processing/post/mentat_colorMap
index d65cb58f4..1f5d31853 100755
--- a/processing/post/mentat_colorMap
+++ b/processing/post/mentat_colorMap
@@ -10,9 +10,12 @@ releases = {'2010':['linux64',''],
             '2005r3':[''],
            }
 
-file = open('%s/../MSCpath'%os.path.dirname(sys.argv[0]))
-MSCpath = os.path.normpath(file.readline().strip())
-file.close()
+try:
+  file = open('%s/../MSCpath'%os.path.dirname(os.path.realpath(sys.argv[0])))
+  MSCpath = os.path.normpath(file.readline().strip())
+  file.close()
+except:
+  MSCpath = '/msc'
 
 for release,subdirs in sorted(releases.items(),reverse=True):
   for subdir in subdirs:
@@ -24,7 +27,12 @@ for release,subdirs in sorted(releases.items(),reverse=True):
       continue
   break
 
-from py_mentat import *
+try:
+  from py_mentat import *
+except:
+  print('error: no valid Mentat release found in %s'%MSCpath)
+  sys.exit(-1)
+
 
 
 
diff --git a/processing/post/postResults b/processing/post/postResults
index 47fa0574f..1a2e17d54 100755
--- a/processing/post/postResults
+++ b/processing/post/postResults
@@ -9,9 +9,12 @@ releases = {'2010':['linux64',''],
             '2005r3':[''],
            }
 
-file = open('%s/../MSCpath'%os.path.dirname(sys.argv[0]))
-MSCpath = os.path.normpath(file.readline().strip())
-file.close()
+try:
+  file = open('%s/../MSCpath'%os.path.dirname(os.path.realpath(sys.argv[0])))
+  MSCpath = os.path.normpath(file.readline().strip())
+  file.close()
+except:
+  MSCpath = '/msc'
 
 for release,subdirs in sorted(releases.items(),reverse=True):
   for subdir in subdirs:
@@ -23,7 +26,12 @@ for release,subdirs in sorted(releases.items(),reverse=True):
       continue
   break
 
-from py_post import *
+try:
+  from py_post import *
+except:
+  print('error: no valid Mentat release found in %s'%MSCpath)
+  sys.exit(-1)
+
 
 
 # -----------------------------
diff --git a/processing/pre/mentat_patchFromReconstructedBoundaries b/processing/pre/mentat_patchFromReconstructedBoundaries
index 3a8fbbe2c..d9858e477 100755
--- a/processing/pre/mentat_patchFromReconstructedBoundaries
+++ b/processing/pre/mentat_patchFromReconstructedBoundaries
@@ -15,9 +15,12 @@ releases = {'2010':['linux64',''],
             '2005r3':[''],
            }
 
-file = open('%s/../MSCpath'%os.path.dirname(sys.argv[0]))
-MSCpath = os.path.normpath(file.readline().strip())
-file.close()
+try:
+  file = open('%s/../MSCpath'%os.path.dirname(os.path.realpath(sys.argv[0])))
+  MSCpath = os.path.normpath(file.readline().strip())
+  file.close()
+except:
+  MSCpath = '/msc'
 
 for release,subdirs in sorted(releases.items(),reverse=True):
   for subdir in subdirs:
@@ -29,7 +32,12 @@ for release,subdirs in sorted(releases.items(),reverse=True):
       continue
   break
 
-from py_mentat import *
+try:
+  from py_mentat import *
+except:
+  print('error: no valid Mentat release found in %s'%MSCpath)
+  sys.exit(-1)
+
 
 
 def outMentat(cmd,locals):
diff --git a/processing/pre/mentat_pbcOnBoxMesh b/processing/pre/mentat_pbcOnBoxMesh
index 48e7fda9f..fbefbbed3 100755
--- a/processing/pre/mentat_pbcOnBoxMesh
+++ b/processing/pre/mentat_pbcOnBoxMesh
@@ -10,9 +10,12 @@ releases = {'2010':['linux64',''],
             '2005r3':[''],
            }
 
-file = open('%s/../MSCpath'%os.path.dirname(sys.argv[0]))
-MSCpath = os.path.normpath(file.readline().strip())
-file.close()
+try:
+  file = open('%s/../MSCpath'%os.path.dirname(os.path.realpath(sys.argv[0])))
+  MSCpath = os.path.normpath(file.readline().strip())
+  file.close()
+except:
+  MSCpath = '/msc'
 
 for release,subdirs in sorted(releases.items(),reverse=True):
   for subdir in subdirs:
@@ -24,7 +27,12 @@ for release,subdirs in sorted(releases.items(),reverse=True):
       continue
   break
 
-from py_mentat import *
+try:
+  from py_mentat import *
+except:
+  print('error: no valid Mentat release found in %s'%MSCpath)
+  sys.exit(-1)
+
 
 def outMentat(cmd,locals):
   if cmd[0:3] == '(!)':
diff --git a/processing/pre/mentat_spectralBox b/processing/pre/mentat_spectralBox
index 43bc11fc6..7a4cf5ee3 100755
--- a/processing/pre/mentat_spectralBox
+++ b/processing/pre/mentat_spectralBox
@@ -113,6 +113,8 @@ def geometry():
   "*geometry_option red_integ_capacity:on",
   "*add_geometry_elements",
   "all_existing",
+  "*element_type 117",
+  "all_existing",
   ]
   
   return cmds
@@ -131,6 +133,13 @@ def initial_conditions(N,data):
     elements[id-1].append(element)
 
   cmds = [\
+    "*new_icond",
+    "*icond_name temperature",
+    "*icond_type state_variable",
+    "*icond_param_value state_var_id 1",
+    "*icond_dof_value var 300",
+    "*add_icond_elements",
+    "all_existing",
     "*new_icond",
     "*icond_name homogenization",
     "*icond_type state_variable",
@@ -171,7 +180,7 @@ parser.set_defaults(d = (16,16,16))
 parser.set_defaults(N = (16,16,16))
 
 try:
-  file = open('%s/../MSCpath'%os.path.dirname(sys.argv[0]))
+  file = open('%s/../MSCpath'%os.path.dirname(os.path.realpath(sys.argv[0])))
   MSCpath = os.path.normpath(file.readline().strip())
   file.close()
 except: