Changeset 14876

Timestamp:

05/03/13 16:20:00 (12 years ago)

Author:

Eric.Larour

Message:

CHG: NORM_FROBENIUS already used by petsc :(
Switching to NORM_FROB.

Location:

issm/trunk-jpl/src/c/toolkits

Files:

• issm/IssmDenseMat.h (modified) (2 diffs)
• issm/IssmMpiDenseMat.h (modified) (1 diff)
• toolkitsenums.h (modified) (1 diff)

issm/trunk-jpl/src/c/toolkits/issm/IssmDenseMat.h

@@ -22 +22 @@
 #include "../../shared/Alloc/alloc.h"
 #include "../../include/macros.h"
+
+#ifdef _HAVE_ADOLC_
+#include "adolc.h"
+#endif
+
 #include <math.h>
 
@@ -151 +156 @@
                                         return norm;
                                         break; 
-                                case NORM_FROBENIUS:
+                                case NORM_FROB:
                                         norm=0;
                                         for(i=0;i<this->M;i++){

issm/trunk-jpl/src/c/toolkits/issm/IssmMpiDenseMat.h

@@ -340 +340 @@
                                         return norm;
                                         break; 
-                                case NORM_FROBENIUS:
+                                case NORM_FROB:
                                         local_norm=0;
                                         for(i=0;i<this->m;i++){

issm/trunk-jpl/src/c/toolkits/toolkitsenums.h

@@ -13 +13 @@
 
 typedef enum {INS_VAL, ADD_VAL} InsMode;
-typedef enum {NORM_INF,NORM_TWO,NORM_FROBENIUS} NormMode;
+typedef enum {NORM_INF,NORM_TWO,NORM_FROB} NormMode;
 typedef enum {DENSE_SEQUENTIAL,SPARSE_SEQUENTIAL} MatrixType;