Changeset 4217

Timestamp:

06/24/10 18:51:00 (15 years ago)

Author:

Eric.Larour

Message:

New class Constraintsa

Location:

issm/trunk/src

Files:

• c/DataSet/Constraints.cpp (added)
• c/DataSet/DataSet.h (modified) (1 diff)
• c/Makefile.am (modified) (2 diffs)
• c/modules/ModelProcessorx/Balancedthickness/CreateConstraintsBalancedthickness.cpp (modified) (3 diffs)
• c/modules/ModelProcessorx/Balancedthickness2/CreateConstraintsBalancedthickness2.cpp (modified) (2 diffs)
• c/modules/ModelProcessorx/Balancedvelocities/CreateConstraintsBalancedvelocities.cpp (modified) (3 diffs)
• c/modules/ModelProcessorx/CreateDataSets.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (modified) (3 diffs)
• c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp (modified) (3 diffs)
• c/modules/ModelProcessorx/DiagnosticStokes/CreateConstraintsDiagnosticStokes.cpp (modified) (3 diffs)
• c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp (modified) (3 diffs)
• c/modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp (modified) (3 diffs)
• c/modules/ModelProcessorx/ModelProcessorx.cpp (modified) (2 diffs)
• c/modules/ModelProcessorx/ModelProcessorx.h (modified) (13 diffs)
• c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp (modified) (3 diffs)
• c/modules/ModelProcessorx/Prognostic2/CreateConstraintsPrognostic2.cpp (modified) (2 diffs)
• c/modules/ModelProcessorx/SlopeCompute/CreateConstraintsSlopeCompute.cpp (modified) (2 diffs)
• c/modules/ModelProcessorx/SortDataSets.cpp (modified) (2 diffs)
• c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp (modified) (3 diffs)
• c/modules/ModelProcessorx/UpdateCounters.cpp (modified) (1 diff)
• c/modules/MpcNodesx/MpcNodesx.cpp (modified) (1 diff)
• c/modules/MpcNodesx/MpcNodesx.h (modified) (1 diff)
• c/modules/SpcNodesx/SpcNodesx.cpp (modified) (1 diff)
• c/modules/SpcNodesx/SpcNodesx.h (modified) (1 diff)
• c/objects/FemModel.h (modified) (1 diff)
• mex/ModelProcessor/ModelProcessor.cpp (modified) (1 diff)
• mex/MpcNodes/MpcNodes.cpp (modified) (2 diffs)
• mex/SpcNodes/SpcNodes.cpp (modified) (2 diffs)

issm/trunk/src/c/DataSet/DataSet.h ¶

@@ -202 +202 @@
 };
 
+/********************************************************CONSTRAINTS************************************************/
+
+class Constraints: public DataSet{
+
+        public:
+
+                /*constructors, destructors: {{{1*/
+                Constraints();
+                Constraints(int enum_type);
+                ~Constraints();
+                /*}}}*/
+                /*numerics: {{{1*/
+                /*}}}*/
+
+};
+
+
 
 

issm/trunk/src/c/Makefile.am ¶

@@ -208 +208 @@
                                         ./DataSet/Loads.cpp\
                                         ./DataSet/Elements.cpp\
+                                        ./DataSet/Constraints.cpp\
                                         ./shared/shared.h\
                                         ./shared/Alloc/alloc.h\
@@ -738 +739 @@
                                         ./DataSet/Loads.cpp\
                                         ./DataSet/Elements.cpp\
+                                        ./DataSet/Constraints.cpp\
                                         ./shared/shared.h\
                                         ./shared/Threads/issm_threads.h\

issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness/CreateConstraintsBalancedthickness.cpp ¶

@@ -11 +11 @@
 #include "../ModelProcessorx.h"
 
-void    CreateConstraintsBalancedthickness(DataSet** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
+void    CreateConstraintsBalancedthickness(Constraints** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
 
         /*Intermediary*/
@@ -18 +18 @@
 
         /*Output*/
-        DataSet* constraints = NULL;
+        Constraints* constraints = NULL;
 
         /*Recover pointer: */
@@ -24 +24 @@
 
         /*Create constraints if they do not exist yet*/
-        if(!constraints) constraints = new DataSet(ConstraintsEnum);
+        if(!constraints) constraints = new Constraints(ConstraintsEnum);
 
         /*Fetch data: */

issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness2/CreateConstraintsBalancedthickness2.cpp ¶

@@ -11 +11 @@
 #include "../ModelProcessorx.h"
 
-void    CreateConstraintsBalancedthickness2(DataSet** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
+void    CreateConstraintsBalancedthickness2(Constraints** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
         
         /*Output*/
-        DataSet* constraints = NULL;
+        Constraints* constraints = NULL;
         
         /*Recover pointer: */
@@ -20 +20 @@
 
         /*Create constraints if they do not exist yet*/
-        if(!constraints) constraints = new DataSet(ConstraintsEnum);
+        if(!constraints) constraints = new Constraints(ConstraintsEnum);
         
         /*Assign output pointer: */

issm/trunk/src/c/modules/ModelProcessorx/Balancedvelocities/CreateConstraintsBalancedvelocities.cpp ¶

@@ -11 +11 @@
 #include "../ModelProcessorx.h"
 
-void    CreateConstraintsBalancedvelocities(DataSet** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
+void    CreateConstraintsBalancedvelocities(Constraints** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
 
         /*Intermediary*/
@@ -18 +18 @@
         
         /*Output*/
-        DataSet* constraints = NULL;
+        Constraints* constraints = NULL;
         Spc*    spc  = NULL;
 
@@ -25 +25 @@
 
         /*Create constraints if they do not exist yet*/
-        if(!constraints) constraints = new DataSet(ConstraintsEnum);
+        if(!constraints) constraints = new Constraints(ConstraintsEnum);
 
         /*Fetch data: */

issm/trunk/src/c/modules/ModelProcessorx/CreateDataSets.cpp ¶

@@ -16 +16 @@
 
 
-void CreateDataSets(Elements** pelements,Nodes** pnodes, Vertices** pvertices, DataSet** pmaterials, DataSet** pconstraints, Loads** ploads,Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int solution_type,int analysis_type,int nummodels,int analysis_counter){
+void CreateDataSets(Elements** pelements,Nodes** pnodes, Vertices** pvertices, DataSet** pmaterials, Constraints** pconstraints, Loads** ploads,Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int solution_type,int analysis_type,int nummodels,int analysis_counter){
 
         bool continuous=true;

issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp ¶

@@ -11 +11 @@
 #include "../ModelProcessorx.h"
 
-void    CreateConstraintsDiagnosticHoriz(DataSet** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
+void    CreateConstraintsDiagnosticHoriz(Constraints** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
 
         /*Intermediary*/
@@ -18 +18 @@
         
         /*Output*/
-        DataSet* constraints = NULL;
+        Constraints* constraints = NULL;
         Spc*    spc  = NULL;
         Rgb*    rgb  = NULL;
@@ -27 +27 @@
 
         /*Create constraints if they do not exist yet*/
-        if(!constraints) constraints = new DataSet(ConstraintsEnum);
+        if(!constraints) constraints = new Constraints(ConstraintsEnum);
         
         /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */

issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp ¶

@@ -11 +11 @@
 #include "../ModelProcessorx.h"
 
-void    CreateConstraintsDiagnosticHutter(DataSet** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
+void    CreateConstraintsDiagnosticHutter(Constraints** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
 
         /*Intermediary*/
@@ -18 +18 @@
 
         /*Output*/
-        DataSet* constraints = NULL;
+        Constraints* constraints = NULL;
         Spc*    spc  = NULL;
 
@@ -25 +25 @@
 
         /*Create constraints if they do not exist yet*/
-        if(!constraints) constraints = new DataSet(ConstraintsEnum);
+        if(!constraints) constraints = new Constraints(ConstraintsEnum);
 
         /*Now, is the flag ishutter on? otherwise, do nothing: */

issm/trunk/src/c/modules/ModelProcessorx/DiagnosticStokes/CreateConstraintsDiagnosticStokes.cpp ¶

@@ -11 +11 @@
 #include "../ModelProcessorx.h"
 
-void    CreateConstraintsDiagnosticStokes(DataSet** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
+void    CreateConstraintsDiagnosticStokes(Constraints** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
 
         /*Intermediary*/
@@ -19 +19 @@
 
         /*Intermediary*/
-        DataSet* constraints = NULL;
+        Constraints* constraints = NULL;
 
         /*Recover pointer: */
@@ -25 +25 @@
 
         /*Create constraints if they do not exist yet*/
-        if(!constraints) constraints = new DataSet(ConstraintsEnum);
+        if(!constraints) constraints = new Constraints(ConstraintsEnum);
 
         /*Now, is the flag ishutter on? otherwise, do nothing: */

issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp ¶

@@ -11 +11 @@
 #include "../ModelProcessorx.h"
 
-void    CreateConstraintsDiagnosticVert(DataSet** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
+void    CreateConstraintsDiagnosticVert(Constraints** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
 
         /*Intermediary*/
@@ -18 +18 @@
 
         /*Output*/
-        DataSet* constraints = NULL;
+        Constraints* constraints = NULL;
 
         /*Recover pointer: */
@@ -24 +24 @@
 
         /*Create constraints if they do not exist yet*/
-        if(!constraints) constraints = new DataSet(ConstraintsEnum);
+        if(!constraints) constraints = new Constraints(ConstraintsEnum);
 
         /*return if 2d mesh*/

issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp ¶

@@ -11 +11 @@
 #include "../ModelProcessorx.h"
 
-void    CreateConstraintsMelting(DataSet** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
+void    CreateConstraintsMelting(Constraints** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
 
         /*Intermediary*/
@@ -18 +18 @@
         
         /*Intermediary*/
-        DataSet* constraints = NULL;
+        Constraints* constraints = NULL;
 
         /*Recover pointer: */
@@ -24 +24 @@
 
         /*Create constraints if they do not exist yet*/
-        if(!constraints) constraints = new DataSet(ConstraintsEnum);
+        if(!constraints) constraints = new Constraints(ConstraintsEnum);
 
         /*Assign output pointer: */

issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.cpp ¶

@@ -16 +16 @@
 #include "../../modules/modules.h"
 
-void ModelProcessorx(Elements** pelements, Nodes** pnodes, Vertices** pvertices, DataSet** pmaterials, DataSet** pconstraints, Loads** ploads, Parameters** pparameters, ConstDataHandle IOMODEL,int solution_type,int nummodels, int* analysis_type_list){
+void ModelProcessorx(Elements** pelements, Nodes** pnodes, Vertices** pvertices, DataSet** pmaterials, Constraints** pconstraints, Loads** ploads, Parameters** pparameters, ConstDataHandle IOMODEL,int solution_type,int nummodels, int* analysis_type_list){
 
         int i;
@@ -26 +26 @@
         Vertices* vertices=NULL;
         DataSet* materials=NULL;
-        DataSet* constraints=NULL;
+        Constraints* constraints=NULL;
         Loads* loads=NULL;
         Parameters* parameters=NULL;

issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.h ¶

@@ -13 +13 @@
 #include "../../io/io.h"
 
-void ModelProcessorx(Elements** pelements, Nodes** pnodes, Vertices** pvertices, DataSet** pmaterials, DataSet** pconstraints, Loads** ploads, Parameters** pparameters, ConstDataHandle iomodel_handle,int solution_type,int nummodels, int* analysis_type_list);
+void ModelProcessorx(Elements** pelements, Nodes** pnodes, Vertices** pvertices, DataSet** pmaterials, Constraints** pconstraints, Loads** ploads, Parameters** pparameters, ConstDataHandle iomodel_handle,int solution_type,int nummodels, int* analysis_type_list);
 
 /*Creation of fem datasets: general drivers*/
-void  CreateDataSets(Elements** pelements,Nodes** pnodes,Vertices** pvertices, DataSet** pmaterials, DataSet** pconstraints, Loads** ploads,Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int solution_type,int analysis_type,int nummodels,int analysis_counter);
+void  CreateDataSets(Elements** pelements,Nodes** pnodes,Vertices** pvertices, DataSet** pmaterials, Constraints** pconstraints, Loads** ploads,Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int solution_type,int analysis_type,int nummodels,int analysis_counter);
 void  CreateElementsVerticesAndMaterials(Elements** pelements,Vertices** pvertices,DataSet** pmaterials, IoModel* iomodel,ConstDataHandle iomodel_handle,int nummodels);
 void  CreateParameters(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle,int solution_type,int analysis_type,int analysis_counter);
@@ -26 +26 @@
 /*diagnostic horizontal*/
 void    CreateNodesDiagnosticHoriz(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
-void    CreateConstraintsDiagnosticHoriz(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
+void    CreateConstraintsDiagnosticHoriz(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
 void  CreateLoadsDiagnosticHoriz(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
 void    UpdateElementsDiagnosticHoriz(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
@@ -32 +32 @@
 /*diagnostic vertical*/
 void    CreateNodesDiagnosticVert(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
-void    CreateConstraintsDiagnosticVert(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
+void    CreateConstraintsDiagnosticVert(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
 void    CreateLoadsDiagnosticVert(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
 void    UpdateElementsDiagnosticVert(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
@@ -38 +38 @@
 /*diagnostic hutter*/
 void    CreateNodesDiagnosticHutter(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
-void    CreateConstraintsDiagnosticHutter(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
+void    CreateConstraintsDiagnosticHutter(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
 void    CreateLoadsDiagnosticHutter(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
 void    UpdateElementsDiagnosticHutter(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
@@ -44 +44 @@
 /*diagnostic stokes*/
 void    CreateNodesDiagnosticStokes(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
-void    CreateConstraintsDiagnosticStokes(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
+void    CreateConstraintsDiagnosticStokes(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
 void    CreateLoadsDiagnosticStokes(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
 void    UpdateElementsDiagnosticStokes(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
@@ -50 +50 @@
 /*slope compute*/
 void    CreateNodesSlopeCompute(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
-void    CreateConstraintsSlopeCompute(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
+void    CreateConstraintsSlopeCompute(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
 void    CreateLoadsSlopeCompute(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
 void    UpdateElementsSlopeCompute(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
@@ -56 +56 @@
 /*thermal:*/
 void    CreateNodesThermal(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
-void    CreateConstraintsThermal(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
+void    CreateConstraintsThermal(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
 void    CreateLoadsThermal(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
 void    UpdateElementsThermal(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
@@ -62 +62 @@
 /*melting:*/
 void    CreateNodesMelting(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
-void    CreateConstraintsMelting(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
+void    CreateConstraintsMelting(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
 void    CreateLoadsMelting(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
 void    UpdateElementsMelting(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
@@ -68 +68 @@
 /*prognostic:*/
 void    CreateNodesPrognostic(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
-void    CreateConstraintsPrognostic(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
+void    CreateConstraintsPrognostic(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
 void    CreateLoadsPrognostic(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
 void    UpdateElementsPrognostic(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
@@ -74 +74 @@
 /*prognostic2:*/
 void    CreateNodesPrognostic2(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
-void    CreateConstraintsPrognostic2(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
+void    CreateConstraintsPrognostic2(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
 void    CreateLoadsPrognostic2(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
 void    UpdateElementsPrognostic2(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
@@ -80 +80 @@
 /*balancedthickness:*/
 void    CreateNodesBalancedthickness(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
-void    CreateConstraintsBalancedthickness(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
+void    CreateConstraintsBalancedthickness(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
 void    CreateLoadsBalancedthickness(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
 void    UpdateElementsBalancedthickness(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
 
 void    CreateNodesBalancedthickness2(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
-void    CreateConstraintsBalancedthickness2(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
+void    CreateConstraintsBalancedthickness2(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
 void    CreateLoadsBalancedthickness2(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
 void    UpdateElementsBalancedthickness2(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
@@ -91 +91 @@
 /*balancedvelocities:*/
 void    CreateNodesBalancedvelocities(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);
-void    CreateConstraintsBalancedvelocities(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
+void    CreateConstraintsBalancedvelocities(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);
 void    CreateLoadsBalancedvelocities(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);
 void    UpdateElementsBalancedvelocities(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);
@@ -104 +104 @@
 
 /*Diverse: */
-void  SortDataSets(Elements** pelements,Nodes** pnodes,Vertices** pvertices, Loads** ploads, DataSet** pmaterials, DataSet** pconstraints, Parameters** pparameters);
-void  UpdateCounters(IoModel* iomodel,Nodes** pnodes,Loads** ploads, DataSet** pconstraints);
+void  SortDataSets(Elements** pelements,Nodes** pnodes,Vertices** pvertices, Loads** ploads, DataSet** pmaterials, Constraints** pconstraints, Parameters** pparameters);
+void  UpdateCounters(IoModel* iomodel,Nodes** pnodes,Loads** ploads, Constraints** pconstraints);
 
 #endif

issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp ¶

@@ -11 +11 @@
 #include "../ModelProcessorx.h"
 
-void    CreateConstraintsPrognostic(DataSet** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
+void    CreateConstraintsPrognostic(Constraints** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
 
         /*Intermediary*/
@@ -18 +18 @@
         
         /*Output*/
-        DataSet* constraints = NULL;
+        Constraints* constraints = NULL;
         Spc*    spc  = NULL;
 
@@ -25 +25 @@
 
         /*Create constraints if they do not exist yet*/
-        if(!constraints) constraints = new DataSet(ConstraintsEnum);
+        if(!constraints) constraints = new Constraints(ConstraintsEnum);
 
         /*Fetch data: */

issm/trunk/src/c/modules/ModelProcessorx/Prognostic2/CreateConstraintsPrognostic2.cpp ¶

@@ -11 +11 @@
 #include "../ModelProcessorx.h"
 
-void    CreateConstraintsPrognostic2(DataSet** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
+void    CreateConstraintsPrognostic2(Constraints** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
         
         /*Output*/
-        DataSet* constraints = NULL;
+        Constraints* constraints = NULL;
         
         /*Recover pointer: */
@@ -20 +20 @@
 
         /*Create constraints if they do not exist yet*/
-        if(!constraints) constraints = new DataSet(ConstraintsEnum);
+        if(!constraints) constraints = new Constraints(ConstraintsEnum);
         
         /*Assign output pointer: */

issm/trunk/src/c/modules/ModelProcessorx/SlopeCompute/CreateConstraintsSlopeCompute.cpp ¶

@@ -11 +11 @@
 #include "../ModelProcessorx.h"
 
-void    CreateConstraintsSlopeCompute(DataSet** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
+void    CreateConstraintsSlopeCompute(Constraints** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
 
         /*Output*/
-        DataSet* constraints = NULL;
+        Constraints* constraints = NULL;
         
         /*Recover pointer: */
@@ -20 +20 @@
 
         /*Create constraints if they do not exist yet*/
-        if(!constraints) constraints = new DataSet(ConstraintsEnum);
+        if(!constraints) constraints = new Constraints(ConstraintsEnum);
 
         /*Assign output pointer: */

issm/trunk/src/c/modules/ModelProcessorx/SortDataSets.cpp ¶

@@ -16 +16 @@
 
 
-void SortDataSets(Elements** pelements,Nodes** pnodes,Vertices** pvertices, Loads** ploads, DataSet** pmaterials, DataSet** pconstraints, Parameters** pparameters){
+void SortDataSets(Elements** pelements,Nodes** pnodes,Vertices** pvertices, Loads** ploads, DataSet** pmaterials, Constraints** pconstraints, Parameters** pparameters){
 
         Elements* elements=NULL;
@@ -23 +23 @@
         Loads* loads=NULL;
         DataSet* materials=NULL;
-        DataSet* constraints=NULL;
+        Constraints* constraints=NULL;
         Parameters* parameters=NULL;
 

issm/trunk/src/c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp ¶

@@ -11 +11 @@
 #include "../ModelProcessorx.h"
 
-void    CreateConstraintsThermal(DataSet** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
+void    CreateConstraintsThermal(Constraints** pconstraints, IoModel* iomodel,ConstDataHandle iomodel_handle){
 
         /*Intermediary*/
@@ -18 +18 @@
         
         /*Output*/
-        DataSet* constraints = NULL;
+        Constraints* constraints = NULL;
         Spc*    spc  = NULL;
 
@@ -25 +25 @@
 
         /*Create constraints if they do not exist yet*/
-        if(!constraints) constraints = new DataSet(ConstraintsEnum);
+        if(!constraints) constraints = new Constraints(ConstraintsEnum);
 
         /*return if 2d mesh*/

issm/trunk/src/c/modules/ModelProcessorx/UpdateCounters.cpp ¶

@@ -15 +15 @@
 #include "./ModelProcessorx.h"
 
-void    UpdateCounters(IoModel* iomodel,Nodes** pnodes,Loads** ploads, DataSet** pconstraints){
+void    UpdateCounters(IoModel* iomodel,Nodes** pnodes,Loads** ploads, Constraints** pconstraints){
 
         Nodes* nodes=NULL;
         Loads* loads=NULL;
-        DataSet* constraints=NULL;
+        Constraints* constraints=NULL;
 
         /*recover pointers: */

issm/trunk/src/c/modules/MpcNodesx/MpcNodesx.cpp ¶

@@ -10 +10 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-int MpcNodesx( Mat* pRmg, Nodes* nodes,DataSet* constraints,int analysis_type){
+int MpcNodesx( Mat* pRmg, Nodes* nodes,Constraints* constraints,int analysis_type){
 
         int i;

issm/trunk/src/c/modules/MpcNodesx/MpcNodesx.h ¶

@@ -10 +10 @@
 
 /* local prototypes: */
-int             MpcNodesx( Mat* pRmg, Nodes* nodes,DataSet* constraints,int analysis_type);
+int             MpcNodesx( Mat* pRmg, Nodes* nodes,Constraints* constraints,int analysis_type);
 
 #endif  /* _MPCNODESX_H */

issm/trunk/src/c/modules/SpcNodesx/SpcNodesx.cpp ¶

@@ -10 +10 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-void SpcNodesx(Vec* pyg, Nodes* nodes,DataSet* constraints,int analysis_type){
+void SpcNodesx(Vec* pyg, Nodes* nodes,Constraints* constraints,int analysis_type){
 
         int i;

issm/trunk/src/c/modules/SpcNodesx/SpcNodesx.h ¶

@@ -11 +11 @@
 
 /* local prototypes: */
-void SpcNodesx(Vec* pyg, Nodes* nodesin,DataSet* constraints,int analysis_type);
+void SpcNodesx(Vec* pyg, Nodes* nodesin,Constraints* constraints,int analysis_type);
 
 #endif  /* _SPCNODESX_H */

issm/trunk/src/c/objects/FemModel.h ¶

@@ -27 +27 @@
                 int                 analysis_counter; //counter into analysis_type_list
                 
-                Elements*            elements; //elements (one set for all analyses)
+                Elements*           elements; //elements (one set for all analyses)
                 Nodes*              nodes; //one set of nodes
                 Vertices*           vertices; //one set of vertices
-                DataSet*            constraints; //one set of constraints. each constraint knows which analysis_type it handles
+                Constraints*        constraints; //one set of constraints. each constraint knows which analysis_type it handles
                 Loads*              loads;  //one set of constraints. each constraint knows which analysis_type it handles
                 DataSet*            materials;  //one set of materials, for each element

issm/trunk/src/mex/ModelProcessor/ModelProcessor.cpp ¶

@@ -20 +20 @@
         Nodes* nodes=NULL;
         Vertices* vertices=NULL;
-        DataSet* constraints=NULL;
+        Constraints* constraints=NULL;
         Loads* loads=NULL;
         DataSet* materials=NULL;

issm/trunk/src/mex/MpcNodes/MpcNodes.cpp ¶

@@ -13 +13 @@
         /*input datasets: */
         Nodes* nodes=NULL;
-        DataSet* constraints=NULL;
+        Constraints* constraints=NULL;
         int      analysis_type;
 
@@ -27 +27 @@
         /*Input datasets: */
         FetchData((DataSet**)&nodes,NODESIN);
-        FetchData(&constraints,CONSTRAINTS);
+        FetchData((DataSet**)&constraints,CONSTRAINTS);
         FetchData(&analysis_type,ANALYSISTYPE);
 

issm/trunk/src/mex/SpcNodes/SpcNodes.cpp ¶

@@ -13 +13 @@
         /*input datasets: */
         Nodes* nodes=NULL;
-        DataSet* constraints=NULL;
+        Constraints* constraints=NULL;
         int      analysis_type;
 
@@ -27 +27 @@
         /*Input datasets: */
         FetchData((DataSet**)&nodes,NODESIN);
-        FetchData(&constraints,CONSTRAINTS);
+        FetchData((DataSet**)&constraints,CONSTRAINTS);
         FetchData(&analysis_type,ANALYSISTYPE);