Changeset 13975 for issm/trunk/startup.py

Timestamp:

11/16/12 08:10:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13974

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• startup.py (modified) (2 diffs)

issm/trunk/startup.py

@@ -16 +16 @@
         raise NameError('"ISSM_DIR" environment variable is empty! You should define ISSM_DIR in your .cshrc or .bashrc!')
 
-#Now add all issm code paths necessary to run issm smoothly. 
-#We capture the error output, so that we can warn the user to update 
-#the variable ISSM_DIR in this file, in case it is not correctly setup. 
-
-#ISSM path. Go through src/py and load everything we find  that looks like a python file
-for root,dirs,files in os.walk(ISSM_DIR+ '/src/py'):
-        if '.svn' in dirs:
-                dirs.remove('.svn')
-        for file in files:
-                if file.find(".py") != -1:
-                        if file.find(".pyc") == -1:
-                                #add to path 
-                                sys.path.append(root)
-                                file=os.path.splitext(file)[0]
-                                #__import__(file)
-
+#Go through src/m and append any directory that contains a *.py file to PATH 
 for root,dirs,files in os.walk(ISSM_DIR+ '/src/m'):
         if '.svn' in dirs:
@@ -38 +23 @@
                 if file.find(".py") != -1:
                         if file.find(".pyc") == -1:
-                                #add to path 
-                                sys.path.append(root)
-                                file=os.path.splitext(file)[0]
-                                #__import__(file)
+                                if root not in sys.path:
+                                        sys.path.append(root)
                                 
 sys.path.append(ISSM_DIR + '/lib')
 
-#Deal with scipy import: 
-import scipy 
-import numpy
-import nose
-
-#Import modules that are absolutely needed in ISSM {{{
-from model import *
-from mesh import *
-from mask import *
-from geometry import *
-from constants import *
-from surfaceforcings import *
-from basalforcings import *
-from matice import *
-from friction import *
-from flowequation import *
-from fielddisplay import *
-from timestepping import *
-from initialization import *
-from rifts import *
-from debug import *
-from settings import *
-from solver import *
-from ismumps  import * 
-from pairoptions  import * 
-from petscversion  import * 
-from asmoptions import *           
-from iluasmoptions import *        
-from jacobiasmoptions import *     
-from jacobicgoptions import *      
-from matlaboptions import *        
-from mumpsoptions import *         
-from soroptions import *           
-from stokesoptions import *
-from generic import *
-from hydrology import *
-from miscellaneous import *
-from private import *
-from triangle import *
-from setmask import *
-#}}}
-
 print("\n  To get started with ISSM, type issmdoc at the command prompt.\n\n")