Index: /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp	(revision 16196)
+++ /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp	(revision 16197)
@@ -37,20 +37,10 @@
 	#endif
 
+	/*FIXME: this function is actually called by Hydrology and damage evolution. Should be renamed*/
 	#ifdef _HAVE_THERMAL_
-
-	if(PengridIsPresent(femmodel->loads,ThermalAnalysisEnum)){
-
+	if(PengridIsPresent(femmodel->loads,analysis_type)){
 		ThermalConstraintsState(femmodel->loads,&converged,&num_unstable_constraints,analysis_type);
 	}
 	#endif
-
-	#ifdef _HAVE_DAMAGE_
-
-	if(PengridIsPresent(femmodel->loads,DamageEvolutionAnalysisEnum)){
-
-		DamageConstraintsState(femmodel->loads,&converged,&num_unstable_constraints,analysis_type);
-	}
-	#endif
-
 
 	/*Assign output pointers: */