Changeset 611

Timestamp:

05/27/09 13:54:58 (16 years ago)

Author:

Mathieu Morlighem

Message:

no more sparse2 adn m2html in the startup

File:

• issm/trunk/startup.m (modified) (2 diffs)

issm/trunk/startup.m

@@ -17 +17 @@
         error('issmdir error message: problem when running ''echo $ISSM_DIR'' shell command');
 end
-clear status;
-if (isempty(ISSM_DIR)) | (length(ISSM_DIR)==1),
+if (length(ISSM_DIR)<=1),
         error('issmdir error message: ''ISSM_DIR'' environment variable is empty! You should define ISSM_DIR in your .cshrc or .bashrc!');
 end
 %get rid of return carriage
-ISSM_DIR=ISSM_DIR(1:end-1);
+ISSM_DIR=ISSM_DIR(1:end-1); clear status;
 
-%Now add all ice code paths necessary to run ice smoothly. 
+%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. 
@@ -32 +31 @@
 addpath([ISSM_DIR '/etc']);
 addpath([ISSM_DIR '/doc']);
+addpath([ISSM_DIR '/bin']);
 addpath(genpath_ice([ISSM_DIR '/src/m']));
-
-%Suite sparse and m2html
-addpath(genpath_ice([ISSM_DIR '/packages/suitesparse/install/CHOLMOD/MATLAB/']));
-addpath(genpath_ice([ISSM_DIR '/packages/m2html/install']));
-
-%last one, to pick up binaries first!
-addpath([ISSM_DIR '/bin']);
 
 %Check on any warning messages that might indicate that the paths were not correct. 
 if ~isempty(lastwarn),
-        disp(' ');
-        disp('  Error trying to setup ''ISSM'' code paths. Try and update the ISSM_DIR variable in the startup.m file');
-        disp('  ''ISSM'' will not  work at all until this is resolved');
+        fprintf('\n  Error trying to setup ''ISSM'' code paths. Try and update the ISSM_DIR variable in your .cshrc or .bashrc!\n');
+        fprintf('  ''ISSM'' will not  work at all until this is resolved\n\n');
 else
-        disp(' ');
-        disp('  To get started with ISSM, type issmdoc at the command prompt.');
-        disp(' ');
+        fprintf('\n  To get started with ISSM, type issmdoc at the command prompt.\n\n');
 end