Index: /issm/trunk-jpl/src/m/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/m/Makefile.am	(revision 21138)
+++ /issm/trunk-jpl/src/m/Makefile.am	(revision 21139)
@@ -90,5 +90,4 @@
 				${ISSM_DIR}/src/m/classes/damage.js \
 				${ISSM_DIR}/src/m/classes/debug.js \
-				${ISSM_DIR}/src/m/classes/flaim.js \
 				${ISSM_DIR}/src/m/classes/flowequation.js \
 				${ISSM_DIR}/src/m/classes/friction.js \
Index: /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.js
===================================================================
--- /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.js	(revision 21138)
+++ /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.js	(revision 21139)
@@ -46,65 +46,64 @@
 		
 	if(solutiontype === 'StressbalanceSolution'){
-			analyses=['StressbalanceAnalysis','StressbalanceVerticalAnalysis','StressbalanceSIAAnalysis','L2ProjectionBaseAnalysis'];
-			break;
+		analyses=['StressbalanceAnalysis','StressbalanceVerticalAnalysis','StressbalanceSIAAnalysis','L2ProjectionBaseAnalysis'];
+		break;
 
-		}else if(solutiontype ==='SteadystateSolution'){
-			analyses=['StressbalanceAnalysis','StressbalanceVerticalAnalysis','StressbalanceSIAAnalysis','L2ProjectionBaseAnalysis','ThermalAnalysis','MeltingAnalysis'];
-			break;
+	}else if(solutiontype ==='SteadystateSolution'){
+		analyses=['StressbalanceAnalysis','StressbalanceVerticalAnalysis','StressbalanceSIAAnalysis','L2ProjectionBaseAnalysis','ThermalAnalysis','MeltingAnalysis'];
+		break;
 
-		}else if(solutiontype ==='ThermalSolution'){
-			analyses=['EnthalpyAnalysis','ThermalAnalysis','MeltingAnalysis'];
-			break;
+	}else if(solutiontype ==='ThermalSolution'){
+		analyses=['EnthalpyAnalysis','ThermalAnalysis','MeltingAnalysis'];
+		break;
 
-		}else if(solutiontype ==='MasstransportSolution'){
-			analyses=['MasstransportAnalysis'];
-			break;
+	}else if(solutiontype ==='MasstransportSolution'){
+		analyses=['MasstransportAnalysis'];
+		break;
 
-		}else if(solutiontype ==='BalancethicknessSolution'){
-			analyses=['BalancethicknessAnalysis'];
-			break;
+	}else if(solutiontype ==='BalancethicknessSolution'){
+		analyses=['BalancethicknessAnalysis'];
+		break;
 
-		}else if(solutiontype ==='Balancethickness2Solution'){
-			analyses=['Balancethickness2Analysis'];
-			break;
+	}else if(solutiontype ==='Balancethickness2Solution'){
+		analyses=['Balancethickness2Analysis'];
+		break;
 
-		}else if(solutiontype ==='BalancethicknessSoftSolution'){
-			analyses=['BalancethicknessAnalysis'];
-			break;
+	}else if(solutiontype ==='BalancethicknessSoftSolution'){
+		analyses=['BalancethicknessAnalysis'];
+		break;
 
-		}else if(solutiontype ==='BalancevelocitySolution'){
-			analyses=['BalancevelocityAnalysis'];
-			break;
+	}else if(solutiontype ==='BalancevelocitySolution'){
+		analyses=['BalancevelocityAnalysis'];
+		break;
 
-		}else if(solutiontype ==='SurfaceSlopeSolution'){
-			analyses=['L2ProjectionBaseAnalysis'];
-			break;
+	}else if(solutiontype ==='SurfaceSlopeSolution'){
+		analyses=['L2ProjectionBaseAnalysis'];
+		break;
 
-		}else if(solutiontype ==='BedSlopeSolution'){
-			analyses=['L2ProjectionBaseAnalysis'];
-			break;
+	}else if(solutiontype ==='BedSlopeSolution'){
+		analyses=['L2ProjectionBaseAnalysis'];
+		break;
 
-		}else if(solutiontype ==='GiaSolution'){
-			analyses=['GiaAnalysis'];
-			break;
+	}else if(solutiontype ==='GiaSolution'){
+		analyses=['GiaAnalysis'];
+		break;
 
-		}else if(solutiontype ==='TransientSolution'){
-			analyses=['StressbalanceAnalysis','StressbalanceVerticalAnalysis','StressbalanceSIAAnalysis','L2ProjectionBaseAnalysis','ThermalAnalysis','MeltingAnalysis','EnthalpyAnalysis','MasstransportAnalysis','HydrologySommersAnalysis'];
-			break;
+	}else if(solutiontype ==='TransientSolution'){
+		analyses=['StressbalanceAnalysis','StressbalanceVerticalAnalysis','StressbalanceSIAAnalysis','L2ProjectionBaseAnalysis','ThermalAnalysis','MeltingAnalysis','EnthalpyAnalysis','MasstransportAnalysis','HydrologySommersAnalysis'];
+		break;
 
-		}else if(solutiontype ==='SealevelriseSolution'){
-			analyses=['SealevelriseAnalysis'];
-			break;
+	}else if(solutiontype ==='SealevelriseSolution'){
+		analyses=['SealevelriseAnalysis'];
+		break;
 
-		}else if(solutiontype ==='HydrologySolution'){
-			analyses=['L2ProjectionBaseAnalysis','HydrologyShreveAnalysis','HydrologyDCInefficientAnalysis','HydrologyDCEfficientAnalysis'];
-			break;
+	}else if(solutiontype ==='HydrologySolution'){
+		analyses=['L2ProjectionBaseAnalysis','HydrologyShreveAnalysis','HydrologyDCInefficientAnalysis','HydrologyDCEfficientAnalysis'];
+		break;
 
-		}else if(solutiontype ==='DamageEvolutionSolution'){
-			analyses=['DamageEvolutionAnalysis'];
-			break;
-		}else{
-			throw Error(sprintf("%s%s%s\n",' solution type: ',solutiontype,' not supported yet!'));
-		}
+	}else if(solutiontype ==='DamageEvolutionSolution'){
+		analyses=['DamageEvolutionAnalysis'];
+		break;
+	}else{
+		throw Error(sprintf("%s%s%s\n",' solution type: ',solutiontype,' not supported yet!'));
 	}
 	return analyses;
Index: /issm/trunk-jpl/src/m/solve/solve.js
===================================================================
--- /issm/trunk-jpl/src/m/solve/solve.js	(revision 21138)
+++ /issm/trunk-jpl/src/m/solve/solve.js	(revision 21139)
@@ -33,5 +33,5 @@
 
 	if(typeof solutionstring !== 'string') {
-		throw Error(sprintf("%s\n", "ISSM's solve function only accepts strings for solution sequences. Type help solve to get a list of supported solutions.");
+		throw Error(sprintf("%s\n", "ISSM's solve function only accepts strings for solution sequences. Type help solve to get a list of supported solutions."));
 	}