Changeset 16206

Timestamp:

09/20/13 10:13:25 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: simplifying ConstraintState modules

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (3 diffs)
• classes/Loads/Pengrid.cpp (modified) (1 diff)
• modules/ConstraintsStatex/ConstraintsStateLocal.h (modified) (1 diff)
• modules/ConstraintsStatex/ConstraintsStatex.h (modified) (1 diff)
• modules/ConstraintsStatex/DamageConstraintsState.cpp (deleted)
• modules/ConstraintsStatex/PengridIsPresent.cpp (deleted)
• modules/ConstraintsStatex/ThermalConstraintsState.cpp (deleted)
• modules/ResetConstraintsx/DamageConstraintsReset.cpp (deleted)
• modules/ResetConstraintsx/ResetConstraintsx.cpp (modified) (2 diffs)
• modules/ResetConstraintsx/ResetConstraintsx.h (modified) (1 diff)
• modules/ResetConstraintsx/ThermalConstraintsReset.cpp (deleted)

issm/trunk-jpl/src/c/Makefile.am

@@ -259 +259 @@
                                         ./modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp\
                                         ./modules/ModelProcessorx/CreateNodes.cpp\
-                                        ./modules/ConstraintsStatex/PengridIsPresent.cpp\
                                         ./modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.h\
                                         ./modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.cpp\
@@ -409 +408 @@
                                            ./modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp\
                                            ./modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp\
-                                           ./modules/ConstraintsStatex/ThermalConstraintsState.cpp\
-                                           ./modules/ResetConstraintsx/ThermalConstraintsReset.cpp \
                                            ./analyses/thermal_core.cpp\
                                            ./analyses/enthalpy_core.cpp\
@@ -551 +548 @@
                                         ./modules/ModelProcessorx/Damage/CreateNodesDamage.cpp \
                                         ./modules/ModelProcessorx/Damage/CreateConstraintsDamage.cpp\
-                                        ./modules/ConstraintsStatex/DamageConstraintsState.cpp\
-                                        ./modules/ResetConstraintsx/DamageConstraintsReset.cpp \
                                         ./modules/ModelProcessorx/Damage/CreateParametersDamage.cpp\
                                         ./modules/ModelProcessorx/Damage/CreateLoadsDamage.cpp\

issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp

@@ -814 +814 @@
 /*FUNCTION Pengrid::ResetConstraint {{{*/
 void  Pengrid::ResetConstraint(void){
-        active=0;
-        zigzag_counter=0;
+        active         = 0;
+        zigzag_counter = 0;
 }
 /*}}}*/

issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStateLocal.h

@@ -15 +15 @@
 #include "../../classes/classes.h"
 
-/*melting: */
-void  ThermalConstraintsState(Loads* loads, int* pconverged, int* pnum_unstable_constraints,int analysis_type);
-
-/*damage: */
-#ifdef _HAVE_DAMAGE_
-void  DamageConstraintsState(Loads* loads, int* pconverged, int* pnum_unstable_constraints,int analysis_type);
-#endif
-
 /*rifts module: */
-void   RiftConstraintsState(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints,int analysis_type);
-void   RiftConstrain(int* pnum_unstable_constraints,Loads* loads,int analysis_type);
-int    RiftIsFrozen(Loads* loads,int analysis_type);
-void   RiftFreezeConstraints(Loads* loads,int analysis_type);
+void RiftConstraintsState(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints,int analysis_type);
+void RiftConstrain(int* pnum_unstable_constraints,Loads* loads,int analysis_type);
+int  RiftIsFrozen(Loads* loads,int analysis_type);
+void RiftFreezeConstraints(Loads* loads,int analysis_type);
 
 /*rifts, trial and errors: */
-int    RiftIsPreStable(Loads* loads);
-void   RiftSetPreStable(Loads* loads);
-void   RiftPreConstrain(int* pnum_unstable_constraints,Loads* loads);
-void   RiftMaxPenetrationInInputs(Loads* loads);
-int    RiftPotentialUnstableConstraints(Loads* loads);
-int    RiftIsMaterialStable(Loads* loads);
+int  RiftIsPreStable(Loads* loads);
+void RiftSetPreStable(Loads* loads);
+void RiftPreConstrain(int* pnum_unstable_constraints,Loads* loads);
+void RiftMaxPenetrationInInputs(Loads* loads);
+int  RiftPotentialUnstableConstraints(Loads* loads);
+int  RiftIsMaterialStable(Loads* loads);
 
 #endif  /* _CONSTRAINTSSTATEX_H */

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

@@ -9 +9 @@
 
 /* local prototypes: */
-int  PengridIsPresent(Loads* loads,int analysis_type);
 int  RiftIsPresent(Loads* loads,int analysis_type);
 void ConstraintsStatex(int* pconverged, int* pnum_unstable_constraints,FemModel* femmodel);

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

@@ -23 +23 @@
         femmodel->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
 
-        /*Do we have penalties linked to rifts? In this case, run our special rifts penalty 
-         * management routine, otherwise, skip : */
+        /*Deal with rift first*/
         #ifdef _HAVE_RIFTS_
         if(RiftIsPresent(femmodel->loads,analysis_type)){
@@ -30 +29 @@
         }
         #endif
-        #ifdef _HAVE_THERMAL_
-        if(PengridIsPresent(femmodel->loads,ThermalAnalysisEnum)){
-                ThermalConstraintsReset(femmodel->loads,analysis_type);
+
+        /*Reset pengrid to inactive mode*/
+        for(int i=0;i<femmodel->loads->Size();i++){
+                Load* load=(Load*)femmodel->loads->GetObjectByOffset(i);
+                if(load->InAnalysis(analysis_type)){
+                        if(load->ObjectEnum()==PengridEnum){
+                                Pengrid* pengrid=(Pengrid*)load;
+                                pengrid->ResetConstraint();
+                        }
+                }
         }
-        #endif
-        #ifdef _HAVE_DAMAGE_
-        if(PengridIsPresent(femmodel->loads,DamageEvolutionAnalysisEnum)){
-                DamageConstraintsReset(femmodel->loads,analysis_type);
-        }
-        #endif
-
 }

issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.h

@@ -9 +9 @@
 
 /* local prototypes: */
-void ThermalConstraintsReset(Loads* loads, int configuration_type);
-void DamageConstraintsReset(Loads* loads, int configuration_type);
 void ResetConstraintsx(FemModel* femmodel);