Changeset 6715

Timestamp:

12/10/10 09:14:32 (14 years ago)

Author:

seroussi

Message:

fixed some problems in MacAyealStokes constraints

File:

• issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (modified) (3 diffs)

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

@@ -126 +126 @@
                         else if ((int)iomodel->vertices_type[i]==MacAyealStokesApproximationEnum){
                                 /*If grion,pattyn spc stokes dofs: 3 4 & 5*/
-                                        if ((int)iomodel->gridonpattyn[i]){
+                                        if ((int)iomodel->gridonmacayeal[i]){
                                                 constraints->AddObject(new Spc(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,3,0,DiagnosticHorizAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx.
                                                 count++;
@@ -143 +143 @@
 
                                         }
-                                        else if ((int)iomodel->gridonstokes[i]){ //spc pattyn grids: 1 & 2
+                                        else if ((int)iomodel->gridonstokes[i]){ //spc macayeal grids: 1 & 2
                                                 constraints->AddObject(new Spc(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,0,DiagnosticHorizAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx.
                                                 count++;
@@ -161 +161 @@
                                                 }
                                         }
-                                        else _error_("if vertices_type is MacAyealStokes, you shoud have gridonpattyn or gridonstokes");
+                                        else _error_("if vertices_type is MacAyealStokes, you shoud have gridonmacayeal or gridonstokes");
                         }
                         /*Now add the regular spcs*/