Changeset 16137 for issm/trunk/src/c/modules/ResetConstraintsx

Timestamp:

09/16/13 09:43:55 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16135

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/modules/ResetConstraintsx (modified) (1 prop)
• src/c/modules/ResetConstraintsx/CMakeLists.txt (deleted)
• src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp (modified) (2 diffs)
• src/c/modules/ResetConstraintsx/ResetConstraintsx.h (modified) (1 diff)

issm/trunk

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

issm/trunk/src/c

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp

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

@@ -14 +14 @@
 #include "../ConstraintsStatex/ConstraintsStatex.h"
 
-void ResetConstraintsx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads,Materials* materials,  Parameters* parameters){
+void ResetConstraintsx(FemModel* femmodel){
 
-        /*output: */
-        int analysis_type;
 
         /*Display message*/
@@ -23 +21 @@
 
         /*recover parameters: */
-        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+        int analysis_type;
+        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 : */
         #ifdef _HAVE_RIFTS_
-        if (RiftIsPresent(loads,analysis_type)){
+        if(RiftIsPresent(femmodel->loads,analysis_type)){
                 _error_("rift constraints reset not supported yet!");
         }
         #endif
         #ifdef _HAVE_THERMAL_
-        if(ThermalIsPresent(loads,analysis_type)){
-                ThermalConstraintsReset(loads,analysis_type);
+        if(ThermalIsPresent(femmodel->loads,analysis_type)){
+                ThermalConstraintsReset(femmodel->loads,analysis_type);
         }
         #endif
-
 }

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

@@ -9 +9 @@
 
 /* local prototypes: */
-void  ThermalConstraintsReset(Loads* loads, int configuration_type);
-void ResetConstraintsx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads,Materials* materials,  Parameters* parameters); 
+void ThermalConstraintsReset(Loads* loads, int configuration_type);
+void ResetConstraintsx(FemModel* femmodel);
 
 #endif  /* _RESETCONSTRAINTSX_H */

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp