Changeset 14634

Timestamp:

04/17/13 15:10:57 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed compiler warnings

File:

• issm/trunk-jpl/src/c/modules/Chacox/input_parse.cpp (modified) (8 diffs)

issm/trunk-jpl/src/c/modules/Chacox/input_parse.cpp

@@ -49 +49 @@
         *architecture = (int)options[OPT_ARCH];
         if (*architecture < 0 || *architecture > 3) {
-                printf("%s -- Architecture %d must be between 0 and 3.\n",
-                           __FUNCT__,options[OPT_ARCH]);
+                printf("%s -- Architecture %d must be between 0 and 3.\n",__FUNCT__,*architecture);
                 return(-1);
         }
@@ -85 +84 @@
                 *global_method = (int)options[OPT_GLOBAL];
                 if (*global_method < 1 || *global_method > 7) {
-                        printf("%s -- Global method %d must be between 1 and 7.\n",
-                                   __FUNCT__,options[OPT_GLOBAL]);
+                        printf("%s -- Global method %d must be between 1 and 7.\n",__FUNCT__,*global_method);
                         return(-1);
                 }
@@ -109 +107 @@
                 eigensolver = (int)options[OPT_RQI];
                 if (eigensolver < 0 || eigensolver > 2) {
-                        printf("%s -- RQI/Symmlq flag %d must be between 0 and 2.\n",
-                                   __FUNCT__,options[OPT_RQI]);
+                        printf("%s -- RQI/Symmlq flag %d must be between 0 and 2.\n",__FUNCT__,eigensolver);
                         return(-1);
                 }
@@ -123 +120 @@
                         *vmax = (int)options[OPT_VMAX];
                         if (*vmax <= 0) {
-                                printf("%s -- Vmax %d must be greater then 0.\n",
-                                           __FUNCT__,options[OPT_VMAX]);
+                                printf("%s -- Vmax %d must be greater then 0.\n",__FUNCT__,*vmax);
                                 return(-1);
                         }
@@ -142 +138 @@
                 *vmax = (int)options[OPT_VMAX];
                 if (*vmax <= 0) {
-                        printf("%s -- Vmax %d must be greater then 0.\n",
-                                   __FUNCT__,options[OPT_VMAX]);
+                        printf("%s -- Vmax %d must be greater then 0.\n",__FUNCT__,*vmax);
                         return(-1);
                 }
@@ -173 +168 @@
                 *local_method = (int)options[OPT_LOCAL];
                 if (*local_method < 1 || *local_method > 2) {
-                        printf("%s -- Local method %d must be 1 and 2.\n",
-                                   __FUNCT__,options[OPT_LOCAL]);
+                        printf("%s -- Local method %d must be 1 and 2.\n",__FUNCT__,*local_method);
                         return(-1);
                 }
@@ -232 +226 @@
                 *ndims = (int)options[OPT_NDIMS];
                 if (*ndims < 1 || *ndims > 2) {
-                        printf("%s -- Ndims %d must be 1 or 2 for %d processors.\n",
-                                   __FUNCT__,options[OPT_NDIMS],*nprocs);
+                        printf("%s -- Ndims %d must be 1 or 2 for %d processors.\n",__FUNCT__,*ndims,*nprocs);
                         return(-1);
                 }
@@ -246 +239 @@
                 *ndims = (int)options[OPT_NDIMS];
                 if (*ndims < 1 || *ndims > 3) {
-                        printf("%s -- Ndims %d must be between 1 and 3 for %d processors.\n",
-                                   __FUNCT__,options[OPT_NDIMS],*nprocs);
+                        printf("%s -- Ndims %d must be between 1 and 3 for %d processors.\n",__FUNCT__,*ndims,*nprocs);
                         return(-1);
                 }