Index: /issm/trunk/src/m/solutions/ResetBoundaryConditions.m
===================================================================
--- /issm/trunk/src/m/solutions/ResetBoundaryConditions.m	(revision 4445)
+++ /issm/trunk/src/m/solutions/ResetBoundaryConditions.m	(revision 4446)
@@ -1,3 +1,3 @@
-function femmodel=ResetBoundaryConditions(femmodel,analysis_type,sub_analysis_type);
+function femmodel=ResetBoundaryConditions(femmodel,analysis_type);
 %RESETBOUNDARYCONDITIONS - change boundary conditions of a model
 %
@@ -5,5 +5,5 @@
 %
 %   Usage:
-%      femmodel=ResetBoundaryConditions(femmodel,analysis_type,sub_analysis_type)
+%      femmodel=ResetBoundaryConditions(femmodel,analysis_type)
 
 
@@ -13,8 +13,8 @@
 	displaystring(verbose,'\n%s',['updating boundary condition ...']);
 
-	ug=GetSolutionFromInputs(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
-
 	%set current analysis: 
 	femmodel=SetCurrentConfiguration(femmodel,analysis_type);
+
+	ug=GetSolutionFromInputs(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters);
 
 	%For this analysis_type, free existing boundary condition vectors:
Index: /issm/trunk/src/m/solutions/diagnostic_core.m
===================================================================
--- /issm/trunk/src/m/solutions/diagnostic_core.m	(revision 4445)
+++ /issm/trunk/src/m/solutions/diagnostic_core.m	(revision 4446)
@@ -38,5 +38,5 @@
 		femmodel=solver_linear(femmodel);
 
-		if(ismacayealpattyn)femmodel=ResetBoundaryConditions(femmodel,DiagnosticAnalysisEnum,HorizAnalysisEnum); end
+		if(ismacayealpattyn)femmodel=ResetBoundaryConditions(femmodel,DiagnosticHorizAnalysisEnum); end
 
 	end
@@ -63,5 +63,5 @@
 
 			displaystring(verbose,'\n%s',['update boundary conditions for stokes using velocities previously computed...']);
-			femmodel=ResetBoundaryConditions(femmodel,DiagnosticAnalysisEnum,StokesAnalysisEnum);
+			femmodel=ResetBoundaryConditions(femmodel,DiagnosticStokesAnalysisEnum);
 
 			displaystring(verbose,'\n%s',['computing stokes velocities and pressure...']);