Index: /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.py
===================================================================
--- /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.py	(revision 16531)
+++ /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.py	(revision 16532)
@@ -7,59 +7,47 @@
 
 		Usage:
-			[analyses, numanalyses]=AnalysisConfiguration(solutiontype);
+			[analyses]=AnalysisConfiguration(solutiontype);
 	"""
 
 	if   solutiontype == StressbalanceSolutionEnum():
-		numanalyses=5
-		analyses=[StressbalanceAnalysisEnum(),StressbalanceVerticalAnalysisEnum(),StressbalanceSIAAnalysisEnum(),SurfaceSlopeAnalysisEnum(),BedSlopeAnalysisEnum()]
+		analyses=[StressbalanceAnalysisEnum(),StressbalanceVerticalAnalysisEnum(),StressbalanceSIAAnalysisEnum(),L2ProjectionBaseAnalysisEnum()]
 
 	elif solutiontype == SteadystateSolutionEnum():
-		numanalyses=7 
-		analyses=[StressbalanceAnalysisEnum(),StressbalanceVerticalAnalysisEnum(),StressbalanceSIAAnalysisEnum(),SurfaceSlopeAnalysisEnum(),BedSlopeAnalysisEnum(),ThermalAnalysisEnum(),MeltingAnalysisEnum()]
+		analyses=[StressbalanceAnalysisEnum(),StressbalanceVerticalAnalysisEnum(),StressbalanceSIAAnalysisEnum(),L2ProjectionBaseAnalysisEnum(),ThermalAnalysisEnum(),MeltingAnalysisEnum()]
 
 	elif solutiontype == ThermalSolutionEnum():
-		numanalyses=2 
 		analyses=[EnthalpyAnalysisEnum(),ThermalAnalysisEnum(),MeltingAnalysisEnum()]
 
 	elif solutiontype == MasstransportSolutionEnum():
-		numanalyses=1 
 		analyses=[MasstransportAnalysisEnum()]
 
 	elif solutiontype == BalancethicknessSolutionEnum():
-		numanalyses=1 
 		analyses=[BalancethicknessAnalysisEnum()]
 
 	elif solutiontype == SurfaceSlopeSolutionEnum():
-		numanalyses=1 
-		analyses=[SurfaceSlopeAnalysisEnum()]
+		analyses=[L2ProjectionBaseAnalysisEnum()]
 
 	elif solutiontype == BalancevelocitySolutionEnum():
-		numanalyses=1 
 		analyses=[BalancevelocityAnalysisEnum()]
 
 	elif solutiontype == BedSlopeSolutionEnum():
-		numanalyses=1 
-		analyses=[BedSlopeAnalysisEnum()]
+		analyses=[L2ProjectionBaseAnalysisEnum()]
 
 	elif solutiontype == GiaSolutionEnum():
-		numanalyses=1
 		analyses=[GiaAnalysisEnum()]
 
 	elif solutiontype == TransientSolutionEnum():
-		numanalyses=9 
-		analyses=[StressbalanceAnalysisEnum(),StressbalanceVerticalAnalysisEnum(),StressbalanceSIAAnalysisEnum(),SurfaceSlopeAnalysisEnum(),BedSlopeAnalysisEnum(),ThermalAnalysisEnum(),MeltingAnalysisEnum(),EnthalpyAnalysisEnum(),MasstransportAnalysisEnum()]
+		analyses=[StressbalanceAnalysisEnum(),StressbalanceVerticalAnalysisEnum(),StressbalanceSIAAnalysisEnum(),L2ProjectionBaseAnalysisEnum(),ThermalAnalysisEnum(),MeltingAnalysisEnum(),EnthalpyAnalysisEnum(),MasstransportAnalysisEnum()]
 
 	elif solutiontype == FlaimSolutionEnum():
-		numanalyses=1 
 		analyses=[FlaimAnalysisEnum()]
 
 	elif solutiontype == HydrologySolutionEnum():
-		numanalyses=3 
-		analyses=[BedSlopeAnalysisEnum(),SurfaceSlopeAnalysisEnum(),HydrologyShreveAnalysisEnum(),HydrologyDCInefficientAnalysisEnum(),HydrologyDCEfficientAnalysisEnum()]
+		analyses=[L2ProjectionBaseAnalysisEnum(),HydrologyShreveAnalysisEnum(),HydrologyDCInefficientAnalysisEnum(),HydrologyDCEfficientAnalysisEnum()]
 
 	else:
 		raise TypeError("solution type: '%s' not supported yet!" % EnumToString(solutiontype)[0])
 
-	return analyses,numanalyses
+	return analyses
 #}}}
 
@@ -77,5 +65,5 @@
 	#Get solution and associated analyses
 	solution=md.private.solution
-	analyses,numanalyses=AnalysisConfiguration(solution)
+	analyses=AnalysisConfiguration(solution)
 
 	#Go through a model fields, check that it is a class, and call checkconsistency