Changeset 24172

Timestamp:

09/27/19 15:48:22 (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

@@ -65 +65 @@
                          In addition, the parameter can be either a static or transient (nrows+1) vector. */
                         
-                        //_printf_("nrows: " << nrows << " numberofvertices: " << numberofvertices << " qmu_npart: " << qmu_npart << "\n");
+                        //_printf_("nrows: " << nrows << " numberofvertices: " << numberofvertices << " numberofelements: " << numberofelements << "\n");
 
                         if (nrows==numberofvertices || nrows==(numberofvertices+1)){
@@ -101 +101 @@
 
                         /*Update inputs using the parameter matrix: */
-                        if(nrows==numberofvertices| nrows==numberofvertices+1)
+                        if(nrows==numberofvertices || (nrows==numberofvertices+1))
                                 InputUpdateFromMatrixDakotax(femmodel, parameter, nrows,ncols,StringToEnumx(root), VertexEnum);
                         else