Changeset 13789

Timestamp:

10/22/12 13:35:40 (12 years ago)

Author:

cborstad

Message:

CHG: modified startup.py to avoid appending redundant directories to search path. Deleted loop through src/py as it no longer exists.

Location:

issm/trunk-jpl

Files:

• src/m/inversions/misfit.m (modified) (2 diffs)
• src/m/plot/northarrow.m (modified) (1 diff)
• startup.py (modified) (2 diffs)

issm/trunk-jpl/src/m/inversions/misfit.m ¶

@@ -13 +13 @@
         x=md.mesh.x;
         y=md.mesh.y;
-        vx=md.initialization.vx;
-        vy=md.initialization.vy;
+        %vx=md.initialization.vx;
+        %vy=md.initialization.vy;
+        vx=md.results.DiagnosticSolution.Vx;
+        vy=md.results.DiagnosticSolution.Vy;
         vx_obs=md.inversion.vx_obs;
         vy_obs=md.inversion.vy_obs;
@@ -21 +23 @@
         x=md.mesh.x2d;
         y=md.mesh.y2d;
-        vx=project2d(md,md.initialization.vx,md.mesh.numberoflayers);
-        vy=project2d(md,md.initialization.vy,md.mesh.numberoflayers);
+        %vx=project2d(md,md.initialization.vx,md.mesh.numberoflayers);
+        %vy=project2d(md,md.initialization.vy,md.mesh.numberoflayers);
+        vx=project2d(md,md.results.DiagnosticSolution.Vx,md.mesh.numberoflayers);
+        vy=project2d(md,md.results.DiagnosticSolution.Vy,md.mesh.numberoflayers);
         vx_obs=project2d(md,md.inversion.vx_obs,md.mesh.numberoflayers);
         vy_obs=project2d(md,md.inversion.vy_obs,md.mesh.numberoflayers);

issm/trunk-jpl/src/m/plot/northarrow.m ¶

@@ -74 +74 @@
 xN=max([A(1) D(1) E(1) F(1) G(1)])+ratio/3*abs(lengtharrow);
 yN=mean([A(2) F(2) H(2)]);
-text(xN,yN,'North','FontSize',fontsize,'FontWeight','b');
+text(xN,yN,'N','FontSize',fontsize,'FontWeight','b');

issm/trunk-jpl/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')