Changeset 4611

Timestamp:

07/14/10 17:00:52 (15 years ago)

Author:

Mathieu Morlighem

Message:

minor

File:

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

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

@@ -43 +43 @@
                 if(iomodel->my_vertices[i]){
 
-                        if ((int)iomodel->spcvelocity[6*i+0] | (int)iomodel->gridonhutter[i]) 
+                        if ((int)iomodel->spcvelocity[6*i+0] || (int)iomodel->gridonhutter[i]){
                                 constraints->AddObject(new Spc(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,*(iomodel->spcvelocity+6*i+3)/iomodel->yts,DiagnosticHorizAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx.
-
-                        count++;
+                                count++;
+                        }
                         
-                        if ((int)iomodel->spcvelocity[6*i+1] | (int)iomodel->gridonhutter[i]) 
+                        if ((int)iomodel->spcvelocity[6*i+1] || (int)iomodel->gridonhutter[i]){
                                 constraints->AddObject(new Spc(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,2,*(iomodel->spcvelocity+6*i+4)/iomodel->yts,DiagnosticHorizAnalysisEnum)); //add count'th spc, on node i+1, setting dof 2 to vy
-
-                        count++;
+                                count++;
+                        }
                 }
         }