Changeset 5557

Timestamp:

08/24/10 16:29:57 (15 years ago)

Author:

seroussi

Message:

some changes in Penpair

Location:

issm/trunk/src/c/objects

Files:

• Loads/Penpair.cpp (modified) (1 diff)
• Node.cpp (modified) (2 diffs)
• Node.h (modified) (1 diff)

issm/trunk/src/c/objects/Loads/Penpair.cpp

@@ -207 +207 @@
 
         if (analysis_type==DiagnosticHorizAnalysisEnum){
-                PenaltyCreateKMatrixDiagnosticHoriz(Kgg,kmax);
+                Node** nodes=NULL;
+                int approximation0,approximation1;
+                nodes=(Node**)hnodes->deliverp();
+                approximation0=nodes[0]->GetApproximation();
+                approximation1=nodes[1]->GetApproximation();
+
+                switch(approximation0){
+                        case MacAyealApproximationEnum:
+                                switch(approximation1){
+                                        case MacAyealApproximationEnum: PenaltyCreateKMatrixDiagnosticHoriz(Kgg,kmax); break;
+                                        case PattynApproximationEnum:   PenaltyCreateKMatrixDiagnosticHoriz(Kgg,kmax); break;
+                                        default: ISSMERROR("not supported yet");
+                                }
+                                break;
+                        case PattynApproximationEnum:
+                                switch(approximation1){
+                                        case MacAyealApproximationEnum: PenaltyCreateKMatrixDiagnosticHoriz(Kgg,kmax); break;
+                                        case PattynApproximationEnum:   PenaltyCreateKMatrixDiagnosticHoriz(Kgg,kmax); break;
+                                        default: ISSMERROR("not supported yet");
+                                }
+                                break;
+                        case StokesApproximationEnum:
+                                switch(approximation1){
+                                        case StokesApproximationEnum: PenaltyCreateKMatrixDiagnosticStokes(Kgg,kmax); break;
+                                        default: ISSMERROR("not supported yet");
+                                }
+                                break;
+                        default: ISSMERROR("not supported yet");
+                }
         }
         else if (analysis_type==DiagnosticStokesAnalysisEnum){

issm/trunk/src/c/objects/Node.cpp

@@ -84 +84 @@
         if (iomodel->gridonicesheet) this->inputs->AddInput(new BoolInput(NodeOnIceSheetEnum,(IssmBool)iomodel->gridonicesheet[io_index]));
         if (iomodel->numbernodetoelementconnectivity) this->inputs->AddInput(new IntInput(NumberNodeToElementConnectivityEnum,iomodel->numbernodetoelementconnectivity[io_index]));
+        if (analysis_type==DiagnosticHorizAnalysisEnum) this->inputs->AddInput(new IntInput(ApproximationEnum,iomodel->vertices_type[io_index]));
 
         /*set single point constraints: */
@@ -444 +445 @@
 }
 /*}}}*/
+/*FUNCTION Node::GetApproximation {{{1*/
+int   Node::GetApproximation(){
+
+        int approximation;
+
+        /*recover parameters: */
+        inputs->GetParameterValue(&approximation,ApproximationEnum);
+
+        return approximation;
+}
+/*}}}*/
 /*FUNCTION Node::GetConnectivity {{{1*/
 int Node::GetConnectivity(){

issm/trunk/src/c/objects/Node.h

@@ -71 +71 @@
                 void  SetVertexDof(int in_dof);
                 bool  InAnalysis(int analysis_type);
+                int   GetApproximation();
                 int   GetNumberOfDofs(int approximation_enum=0);
                 int   IsClone();