Changeset 10537

Timestamp:

11/08/11 17:01:38 (13 years ago)

Author:

Mathieu Morlighem

Message:

Fixed coupling spc bug

File:

• issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (modified) (1 diff)

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

@@ -302 +302 @@
                                         count++;
                                 }
-
                         }
 
                         /*Constraint at the bedrock interface (v.n = vz = 0) (Coordinates will be updated according to the bed slope)*/
                         if(nodeonbed[i] && nodeonicesheet[i] && nodeonstokes[i]){
-                                constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,3,0.,DiagnosticHorizAnalysisEnum));
-                                count++;
+                                switch((int)vertices_type[i]){
+                                        case MacAyealStokesApproximationEnum:
+                                                constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,5,0.,DiagnosticHorizAnalysisEnum));
+                                                count++;
+                                                break;
+                                        case PattynStokesApproximationEnum:
+                                                constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,5,0.,DiagnosticHorizAnalysisEnum));
+                                                count++;
+                                                break;
+                                        case StokesApproximationEnum:
+                                                constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,3,0.,DiagnosticHorizAnalysisEnum));
+                                                count++;
+                                                break;
+                                        default: _error_("Vertex approximation %s not supported",EnumToStringx((int)vertices_type[i]));
+                                }
                         }
                 }