Changeset 18388

Timestamp:

08/14/14 13:35:15 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: extended penlaty method to all Spc classes

Location:

issm/trunk-jpl/src/c/classes/Constraints

Files:

• Constraint.h (modified) (1 diff)
• Constraints.cpp (modified) (2 diffs)
• Constraints.h (modified) (1 diff)
• SpcDynamic.cpp (modified) (2 diffs)
• SpcDynamic.h (modified) (1 diff)
• SpcStatic.cpp (modified) (2 diffs)
• SpcStatic.h (modified) (2 diffs)
• SpcTransient.cpp (modified) (2 diffs)
• SpcTransient.h (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/Constraints/Constraint.h ¶

@@ -23 +23 @@
                 virtual void PenaltyDofAndValue(int* dof,IssmDouble* value,Nodes* nodes,Parameters* parameters)=0;
                 virtual bool InAnalysis(int analysis_type)=0;
+                virtual void ActivatePenaltyMethod(void)=0;
 
 };

issm/trunk-jpl/src/c/classes/Constraints/Constraints.cpp ¶

@@ -12 +12 @@
 
 #include "./Constraints.h"
+#include "./Constraint.h"
 #include "../../shared/shared.h"
 #include "../../toolkits/toolkits.h"
@@ -34 +35 @@
 }
 /*}}}*/
+void Constraints::ActivatePenaltyMethod(int in_analysis){/*{{{*/
+
+        for(int i=0;i<this->Size();i++){
+                Constraint* constraint=(Constraint*)this->GetObjectByOffset(i);
+                if(constraint->InAnalysis(in_analysis)){
+                        constraint->ActivatePenaltyMethod();
+                }
+        }
+
+}
+/*}}}*/

issm/trunk-jpl/src/c/classes/Constraints/Constraints.h ¶

@@ -27 +27 @@
 
                 /*numerics*/
-                int   NumberOfConstraints(void);
+                int  NumberOfConstraints(void);
+                void ActivatePenaltyMethod(int in_analysis);
 
 };

issm/trunk-jpl/src/c/classes/Constraints/SpcDynamic.cpp ¶

@@ -20 +20 @@
 SpcDynamic::SpcDynamic(int spc_sid,int spc_nodeid, int spc_dof,int spc_analysis_type){/*{{{*/
 
-        sid=spc_sid;
-        nodeid=spc_nodeid;
-        dof=spc_dof;
-        value=0;
-        analysis_type=spc_analysis_type;
-        isset=false;
+        sid           = spc_sid;
+        nodeid        = spc_nodeid;
+        dof           = spc_dof;
+        value         = 0;
+        analysis_type = spc_analysis_type;
+        isset         = false;
+        penalty       = false;
 
         return;
@@ -78 +79 @@
 
 /*Constraint virtual functions definitions: */
+void SpcDynamic::ActivatePenaltyMethod(void){/*{{{*/
+        this->penalty = true;
+}
+/*}}}*/
 bool SpcDynamic::InAnalysis(int in_analysis_type){/*{{{*/
         if (in_analysis_type==this->analysis_type) return true;

issm/trunk-jpl/src/c/classes/Constraints/SpcDynamic.h ¶

@@ -14 +14 @@
 
         private: 
-                int     sid; /*! id, to track it*/
-                int     nodeid; /*!node id*/
-                int dof; /*!component*/
-                IssmDouble value; /*value*/
-                bool isset;
-                int analysis_type;
+                int        sid;             /*! id, to track it */
+                int        nodeid;          /*!node id          */
+                int        dof;             /*!component        */
+                IssmDouble value;           /*value             */
+                bool       isset;
+                int        analysis_type;
+                bool       penalty;         /*Is this a penalty constraint */
 
         public:
 
-                /*SpcDynamic constructors, destructors:{{{*/
+                /*SpcDynamic constructors, destructors*/
                 SpcDynamic();
                 SpcDynamic(int sid,int nodeid, int dof,int analysis_type);
                 ~SpcDynamic();
-                /*}}}*/
-                /*Object virtual functions definitions:{{{ */
-                void  Echo();
-                void  DeepEcho();
-                int   Id(); 
-                int   ObjectEnum();
-                Object* copy();
-                /*}}}*/
-                /*Constraint virtual functions definitions: {{{*/
-                void   ConstrainNode(Nodes* nodes,Parameters* parameters);
-                bool   InAnalysis(int analysis_type);
-                void   PenaltyDofAndValue(int* dof,IssmDouble* value,Nodes* nodes,Parameters* parameters){_error_("not implemented yet");};
-                /*}}}*/
-                /*SpcDynamic management:{{{ */
-                int    GetNodeId();
-                int    GetDof();
+
+                /*Object virtual functions definitions*/
+                void    Echo();
+                void    DeepEcho();
+                int     Id();
+                int     ObjectEnum();
+                Object *copy();
+
+                /*Constraint virtual functions definitions*/
+                void ConstrainNode(Nodes* nodes,Parameters* parameters);
+                bool InAnalysis(int analysis_type);
+                void ActivatePenaltyMethod(void);
+                void PenaltyDofAndValue(int* dof,IssmDouble* value,Nodes* nodes,Parameters* parameters){_error_("not implemented yet");};
+
+                /*SpcDynamic management*/
+                int        GetNodeId();
+                int        GetDof();
                 IssmDouble GetValue();
-                void   SetDynamicConstraint(Nodes* nodes,IssmDouble *yg_serial);
-                /*}}}*/
+                void       SetDynamicConstraint(Nodes  *nodes,IssmDouble *yg_serial);
 
 };

issm/trunk-jpl/src/c/classes/Constraints/SpcStatic.cpp ¶

@@ -25 +25 @@
         value         = spc_value;
         analysis_type = spc_analysis_type;
+        penalty       = false;
 
         return;
@@ -80 +81 @@
 
 /*Constraint virtual functions definitions: */
+void SpcStatic::ActivatePenaltyMethod(void){/*{{{*/
+           this->penalty = true;
+}
+/*}}}*/
 bool SpcStatic::InAnalysis(int in_analysis_type){/*{{{*/
         if (in_analysis_type==this->analysis_type) return true;

issm/trunk-jpl/src/c/classes/Constraints/SpcStatic.h ¶

@@ -14 +14 @@
 
         private: 
-                int     sid; /*! id, to track it*/
-                int     nodeid; /*!node id*/
-                int dof; /*!component*/
-                IssmDouble value; /*value*/
-                int analysis_type;
+                int        sid;             /*! id, to track it */
+                int        nodeid;          /*!node id          */
+                int        dof;             /*!component        */
+                IssmDouble value;           /*value             */
+                int        analysis_type;
+                bool       penalty;         /*Is this a penalty constraint */
 
         public:
@@ -35 +36 @@
                 /*}}}*/
                 /*Constraint virtual functions definitions: {{{*/
+                void ActivatePenaltyMethod(void);
                 void   ConstrainNode(Nodes* nodes,Parameters* parameters);
                 bool   InAnalysis(int analysis_type);

issm/trunk-jpl/src/c/classes/Constraints/SpcTransient.cpp ¶

@@ -28 +28 @@
 SpcTransient::SpcTransient(int spc_sid,int spc_nodeid, int spc_dof,int spc_nsteps, IssmDouble* spc_times, IssmDouble* spc_values,int spc_analysis_type){/*{{{*/
 
-        penalty= false;
-        sid    = spc_sid;
-        nodeid = spc_nodeid;
-        dof    = spc_dof;
-        nsteps = spc_nsteps;
+        penalty = false;
+        sid     = spc_sid;
+        nodeid  = spc_nodeid;
+        dof     = spc_dof;
+        nsteps  = spc_nsteps;
         if(spc_nsteps){
                 values = xNew<IssmDouble>(spc_nsteps);
@@ -87 +87 @@
 
 /*Constraint virtual functions definitions:*/
+void SpcTransient::ActivatePenaltyMethod(void){/*{{{*/
+           this->penalty = true;
+}
+/*}}}*/
 bool SpcTransient::InAnalysis(int in_analysis_type){/*{{{*/
 

issm/trunk-jpl/src/c/classes/Constraints/SpcTransient.h ¶

@@ -14 +14 @@
 
         private: 
-                bool        penalty;         /*Is this a penalty constraint */
                 int         sid;             /* id, to track it             */
                 int         nodeid;          /*node id                      */
@@ -22 +21 @@
                 int         nsteps;          /*number of time steps         */
                 int         analysis_type;
+                bool        penalty;         /*Is this a penalty constraint */
 
         public:
@@ -38 +38 @@
                 /*}}}*/
                 /*Constraint virtual functions definitions: {{{*/
+                void ActivatePenaltyMethod(void);
                 void   ConstrainNode(Nodes* nodes,Parameters* parameters);
                 bool   InAnalysis(int analysis_type);