Index: /issm/trunk-jpl/startup.m
===================================================================
--- /issm/trunk-jpl/startup.m	(revision 11491)
+++ /issm/trunk-jpl/startup.m	(revision 11492)
@@ -26,13 +26,33 @@
 
 %ISSM path
-addpath([ISSM_TIER '/src/m/utils/']); %loads recursivepath
-addpath([ISSM_TIER '/doc']);
-addpath([ISSM_TIER '/bin']);
-addpath(recursivepath([ISSM_TIER '/src/m']));
-addpath(recursivepath([ISSM_TIER '/externalpackages/scotch']));
-addpath(recursivepath([ISSM_TIER '/externalpackages/canos']));
-addpath(recursivepath([ISSM_TIER '/externalpackages/kml']));
-addpath(recursivepath([ISSM_TIER '/externalpackages/googleearthtoolbox/']));
-addpath(recursivepath([ISSM_TIER '/externalpackages/export_fig']));
+addpath(pwd); %add current path first
+
+if exist([ISSM_TIER '/src/m/utils/'],'dir'),
+	addpath([ISSM_TIER '/src/m/utils/']); %loads recursivepath
+end
+if exist([ISSM_TIER '/doc'],'dir'),
+	addpath([ISSM_TIER '/doc']);
+end
+if exist([ISSM_TIER '/bin'],'dir'),
+	addpath([ISSM_TIER '/bin']);
+end
+if exist([ISSM_TIER '/src/m'],'dir'),
+	addpath(recursivepath([ISSM_TIER '/src/m']));
+end
+if exist([ISSM_TIER '/externalpackages/scotch'],'dir'),
+	addpath(recursivepath([ISSM_TIER '/externalpackages/scotch']));
+end
+if exist([ISSM_TIER '/externalpackages/canos'],'dir'),
+	addpath(recursivepath([ISSM_TIER '/externalpackages/canos']));
+end
+if exist([ISSM_TIER '/externalpackages/kml'],'dir'),
+	addpath(recursivepath([ISSM_TIER '/externalpackages/kml']));
+end
+if exist([ISSM_TIER '/externalpackages/googleearthtoolbox/'],'dir'),
+	addpath(recursivepath([ISSM_TIER '/externalpackages/googleearthtoolbox/']));
+end
+if exist([ISSM_TIER '/externalpackages/export_fig'],'dir'),
+	addpath(recursivepath([ISSM_TIER '/externalpackages/export_fig']));
+end
 clear ISSM_TIER;
 
@@ -47,15 +67,17 @@
 %  deal with Matlab bug (on Linux, not WinXP) -- unless
 %  the class has been called, "empty" method can not be found
-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;
+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!
@@ -64,2 +86,11 @@
 % no warning if we try to plot while in nojvm (will not be supported in future releases)
 warning off MATLAB:HandleGraphics:noJVM
+
+%at the end, get to tests directory if ISSM_TESTS exists: 
+if ispc, 
+	addpath([pwd '\bin']);
+	ISSM_TESTS=getenv('ISSM_TESTS');
+	if ~isempty(ISSM_TESTS),
+		cd(ISSM_TESTS);
+	end
+end