Index: sm/trunk/src/m/solutions/SetCurrentAnalysisAlias.m
===================================================================
--- /issm/trunk/src/m/solutions/SetCurrentAnalysisAlias.m	(revision 4369)
+++ 	(revision )
@@ -1,35 +1,0 @@
-function femmodel=SetCurrentAnalysisAlias(femmodel,base_analysis_enum,real_analysis_type)
-%SETCURRENTANALYSISALIAS- set current analysis used to configure elements and nodes in our solutions, 
-%   and use  another analysis_type instead.
-%
-%   Usage:
-%      femmodel=SetCurrentAnalysisAlias(femmodel,base_analysis_type,real_analysis_type)
-%
-%   Ex:
-%      femmodel=SetCurrentAnalysis(femmodel,DiagnosticHorizAnalysisEnum,AdjointAnalysisEnum)
-%
-
-	%first, look for analysis: 
-	found=-1;
-	for i=1:length(femmodel.analysis_type_list),
-		if femmodel.analysis_type_list(i)==base_analysis_enum,
-			found=i;
-			break;
-		end
-	end
-
-	if found==-1,
-		error('SetCurrentAnalysisAlias error message: could not find analysis_type in list of FemModel analyses');
-	end
-	
-	%activate matrices and vectors: 
-	femmodel.Rmg=femmodel.m_Rmg{found};
-	femmodel.Gmn=femmodel.m_Gmn{found};
-	femmodel.nodesets=femmodel.m_nodesets{found};
-	femmodel.yg=femmodel.m_yg{found};
-	femmodel.ys=femmodel.m_ys{found};
-
-	%Now, plug analysis_counter and analysis_type inside the parameters: 
-	%set counter and analyse_type
-	femmodel.parameters.AnalysisCounter=found-1; %for c indices
-	femmodel.parameters.AnalysisType=real_analysis_type;
Index: /issm/trunk/src/m/solutions/SetCurrentConfiguration.m
===================================================================
--- /issm/trunk/src/m/solutions/SetCurrentConfiguration.m	(revision 4369)
+++ /issm/trunk/src/m/solutions/SetCurrentConfiguration.m	(revision 4370)
@@ -1,17 +1,31 @@
-function femmodel=SetCurrentConfiguration(femmodel,analysis_enum)
+function femmodel=SetCurrentConfiguration(femmodel,configuration_enum,varargin)
 %SETCURRENTCONFIGURATION- set current analysis used to configure elements and nodes in our solutions
 %
+%   Use configuration_type to setup the analysis counter, the configurations of objects etc ... 
+%   but use  analysis_type to drive the element numerics. 
+%   This allows for use of 1 configuration_type for several  analyses
+%
 %   Usage:
-%      femmodel=SetCurrentConfiguration(femmodel,analysis_type)
+%      femmodel=SetCurrentConfiguration(femmodel,configuration_type)
+%      femmodel=SetCurrentConfiguration(femmodel,configuration_type,analysis_type)
 %
 %   Ex:
 %      femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum)
+%      femmodel=SetCurrentConfiguration(femmodel,SurfaceSlopeAnalysisEnum,SurfaceSlopeXAnalysisEnum)
 %
 
+if nargin==3,
+	analysis_enum=varargin{1};
+elseif nargin==2
+	femmodel=SetCurrentConfiguration(femmodel,configuration_enum,configuration_enum);
+else
+	help SetCurrentConfiguration
+	error('bad usage');
+end
 
 	%first, look for analysis: 
 	found=-1;
 	for i=1:length(femmodel.analysis_type_list),
-		if femmodel.analysis_type_list(i)==analysis_enum,
+		if femmodel.analysis_type_list(i)==configuration_enum,
 			found=i;
 			break;
@@ -34,2 +48,3 @@
 	femmodel.parameters.AnalysisCounter=found-1; %for c indices
 	femmodel.parameters.AnalysisType=analysis_enum;
+	femmodel.parameters.ConfigurationType=configuration_enum;