Changeset 15750

Timestamp:

08/08/13 09:41:32 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: simplifying startup.m

File:

• issm/trunk-jpl/startup.m (modified) (4 diffs)

issm/trunk-jpl/startup.m

@@ -16 +16 @@
 else
         ISSM_DIR=getenv('ISSM_DIR_WIN');
-        %ISSM_DIR='';
 end
 if (isempty(ISSM_DIR)),
@@ -27 +26 @@
 
 %ISSM path
-addpath([ISSM_DIR '/src/m/os/']); %loads recursivepath
-addpath([ISSM_DIR '/bin']);
-addpath([ISSM_DIR '/lib']);
+addpath([ISSM_DIR '/src/m/os/']); %load recursivepath
+addpath([ISSM_DIR '/lib']);       %load mex
 addpath(recursivepath([ISSM_DIR '/src/m']));
 addpath(recursivepath([ISSM_DIR '/externalpackages/scotch']));
@@ -37 +35 @@
 addpath(recursivepath([ISSM_DIR '/externalpackages/googleearthtoolbox']));
 addpath(recursivepath([ISSM_DIR '/externalpackages/howatmask']));
-addpath(recursivepath([ISSM_DIR '/externalpackages/cm_and_cb_utilities']));
 addpath(recursivepath([ISSM_DIR '/externalpackages/dem']));
-
 clear ISSM_DIR;
 
@@ -50 +46 @@
 end
 
-%  deal with Matlab bug (on Linux, not WinXP) -- unless
-%  the class has been called, "empty" method can not be found
-if ~ispc,
-        normal_uncertain;
-        continuous_design;
-        continuous_state;
-        linear_inequality_constraint;
-        linear_equality_constraint;
-        response_function;
-        objective_function;
-        least_squares_term;
-        nonlinear_inequality_constraint;
-        nonlinear_equality_constraint;
-        clear ans;
-end
-
 %disable matlab bell!
 beep off;
-
-% no warning if we try to plot while in nojvm (will not be supported in future releases)
-warning off MATLAB:HandleGraphics:noJVM