Changeset 24171

Timestamp:

09/27/19 15:27:44 (5 years ago)

Author:

Eric.Larour

Message:

CHG: diverse

File:

• issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp

@@ -67 +67 @@
                         //_printf_("nrows: " << nrows << " numberofvertices: " << numberofvertices << " qmu_npart: " << qmu_npart << "\n");
 
-                        if (nrows==numberofvertices | nrows==(numberofvertices+1)){
+                        if (nrows==numberofvertices || nrows==(numberofvertices+1)){
                                 for(k=0;k<numberofvertices;k++){
                                         for(l=0;l<ncols;l++){
@@ -74 +74 @@
                                 }
                         }
-                        else if (nrows==numberofelements | nrows==(numberofelements+1)){
+                        else if (nrows==numberofelements || nrows==(numberofelements+1)){
                                 for(k=0;k<numberofelements;k++){
                                         for(l=0;l<ncols;l++){