Changeset 12707 for issm/trunk/startup.py

Timestamp:

07/24/12 10:36:46 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 12703

Location:

issm/trunk

Files:

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

issm/trunk/startup.py

@@ -22 +22 @@
 #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:
@@ -31 +33 @@
 
 for root,dirs,files in os.walk(ISSM_DIR+ '/src/m'):
+        if '.svn' in dirs:
+                dirs.remove('.svn')
         for file in files:
                 if file.find(".py") != -1:
@@ -77 +81 @@
 from stokesoptions import *
 from generic import *
-from none import *
-from none import *
 from hydrology import *
 from miscellaneous import *