Changeset 15451

Timestamp:

07/07/13 09:39:55 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: spc vz only for FS

File:

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

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

@@ -341 +341 @@
                                         count++;
                                 }
-                                if(!xIsNan<IssmDouble>(spcvx[v1]) && !xIsNan<IssmDouble>(spcvx[v2])){
+                                if(!xIsNan<IssmDouble>(spcvy[v1]) && !xIsNan<IssmDouble>(spcvy[v2])){
                                         constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+iomodel->numberofvertices+i+1,
                                                                         2,(spcvy[v1]+spcvy[v2])/yts,DiagnosticHorizAnalysisEnum));
                                         count++;
                                 }
-                                if(!xIsNan<IssmDouble>(spcvx[v1]) && !xIsNan<IssmDouble>(spcvx[v2])){
-                                        constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+iomodel->numberofvertices+i+1,
-                                                                        3,(spcvz[v1]+spcvz[v2])/yts,DiagnosticHorizAnalysisEnum));
-                                        count++;
+                                if (reCast<int,IssmDouble>(vertices_type[v1])==StokesApproximationEnum ||  (reCast<int,IssmDouble>(vertices_type[v1])==NoneApproximationEnum)){
+                                        if(!xIsNan<IssmDouble>(spcvz[v1]) && !xIsNan<IssmDouble>(spcvz[v2])){
+                                                constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+iomodel->numberofvertices+i+1,
+                                                                                3,(spcvz[v1]+spcvz[v2])/yts,DiagnosticHorizAnalysisEnum));
+                                                count++;
+                                        }
                                 }
                         }