Changeset 16197

Timestamp:

09/20/13 07:36:42 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: temporary fix, all penalty models use the same modules, which will be renamed later today

File:

• issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp

@@ -37 +37 @@
         #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: */