Merge Pull Request trilinos#5759 from gsjaardema/Trilinos/seacas-augu…

…st-snapshot

Automatically Merged using Trilinos Pull Request AutoTester
PR Title: Automatic snapshot commit from seacas at e6496d0cc0
PR Author: gsjaardema

packages/seacas/applications/aprepro/aprepro.C

@@ -64,8 +64,14 @@ int main(int argc, char *argv[])
         aprepro.add_variable(var, value, true); // Make it immutable
       }
       else {
-        double dval = std::stod(value);
-        aprepro.add_variable(var, dval, true);
+        try {
+          double dval = std::stod(value);
+          aprepro.add_variable(var, dval, true);
+        }
+        catch (std::exception &e) {
+          // If cannot convert to double; make it a string variable...
+          aprepro.add_variable(var, value, true); // Make it immutable
+        }
       }
     }
     else {

packages/seacas/libraries/exodus/include/exodusII.h

@@ -150,7 +150,7 @@ extern "C" {
 #define EX_MPIPOSIX 0x40000 /**< \deprecated As of libhdf5 1.8.13. */
 #define EX_PNETCDF 0x80000
 
-/*@}*/
+/** @}*/
 
 /*! \sa ex_inquire() */
 enum ex_inquiry {
@@ -248,7 +248,7 @@ enum ex_option_type {
                             the database. */
 };
 typedef enum ex_option_type ex_option_type;
-/*@}*/
+/** @}*/
 
 enum ex_entity_type {
   EX_NODAL      = 14, /**< nodal "block" for variables*/
@@ -306,7 +306,7 @@ typedef enum ex_options ex_options;
 #define MAX_LINE_LENGTH 80L
 /** Maximum length of an error message passed to ex_err() function. Typically, internal use only */
 #define MAX_ERR_LENGTH 256
-/* @} */
+/** @} */
 
 /** Specifies that this argument is the id of an entity: element block, nodeset, sideset, ... */
 typedef int64_t ex_entity_id;
@@ -425,7 +425,7 @@ typedef struct ex_var_params
   int *sset_var_tab;
   int *elset_var_tab;
 } ex_var_params;
-/* @} */
+/** @} */
 
 #ifndef EXODUS_EXPORT
 #define EXODUS_EXPORT extern
@@ -1699,7 +1699,7 @@ EXODUS_EXPORT int ex_get_idx(int         exoid,       /**< NetCDF/Exodus file ID
 #define EX_FATAL -1 /**< fatal error flag def                     */
 #define EX_NOERR 0  /**< no error flag def                        */
 #define EX_WARN 1   /**< warning flag def                         */
-/* @} */
+/** @} */
 
 #ifdef __cplusplus
 } /* close brackets on extern "C" declaration */

packages/seacas/libraries/exodus/src/ex_err.c

@@ -344,6 +344,7 @@ const char *ex_strerror(int err_num)
   case EX_NOTROOTID: return "File id is not the root id; it is a subgroup id.";
   case EX_NULLENTITY: return "Null entity found.";
   case EX_DUPLICATEID: return "Duplicate entity id found.";
+  case EX_MSG: return "Message printed; no error implied.";
   default: return nc_strerror(err_num);
   }
 }

packages/seacas/libraries/exodus/src/ex_open.c

@@ -84,27 +84,23 @@ number. Possible causes of errors include:
 \param[in,out] comp_ws The word size in bytes (0, 4 or 8) of the floating point
 variables
                used in the application program. If 0 (zero) is passed, the
-default
-               size of floating point values for the machine will be used and
-               returned in this variable. WARNING: all exodus functions
-requiring
-               reals must be passed reals declared with this passed in or
-returned
-               compute word size (4 or 8).
+               default size of floating point values for the machine will be
+               used and returned in this variable. WARNING: all exodus functions
+               requiring reals must be passed reals declared with this passed
+               in or returned compute word size (4 or 8).
 
 
 \param[in,out] io_ws The word size in bytes (0, 4 or 8) of the floating
                     point data as they are stored in the exodus file. If the
-word
-                    size does not match the word size of data stored in the
-file,
-                    a fatal error is returned. If this argument is 0, the word
-size
-                    of the floating point data already stored in the file is
-returned.
+                    word size does not match the word size of data stored in
+                    the file, a fatal error is returned. If this argument is
+                    0, the word size of the floating point data already
+                    stored in the file is returned.
 
 \param[out] version  Returned exodus database version number. Note that this is always a float,
-never a double.
+                     never a double.
+
+\param[in] run_version Internally generated to verify library compatability.
 
 The following opens an exodus file named \file{test.exo} for read
 only, using default settings for compute and I/O word sizes:

packages/seacas/libraries/exodus/src/ex_utils.c

@@ -121,15 +121,15 @@ void ex_print_config(void)
   }
 #endif
 #if NC_HAS_PARALLEL
-  fprintf(stderr, "\t\tparallel IO enabled via HDF5 and/or PnetCDF\n");
+  fprintf(stderr, "\t\tParallel IO enabled via HDF5 and/or PnetCDF\n");
 #endif
 #if NC_HAS_PARALLEL4
-  fprintf(stderr, "\t\tparallel IO enabled via HDF5\n");
+  fprintf(stderr, "\t\tParallel IO enabled via HDF5\n");
 #endif
 #if NC_HAS_PNETCDF
   {
     char *libver = ncmpi_inq_libvers();
-    fprintf(stderr, "\t\tparallel IO enabled via PnetCDF (%s)\n", libver);
+    fprintf(stderr, "\t\tParallel IO enabled via PnetCDF (%s)\n", libver);
   }
 #endif
 #if NC_HAS_ERANGE_FILL
@@ -942,18 +942,18 @@ int ex__id_lkup(int exoid, ex_entity_type id_type, ex_entity_id num)
     stat_vals = tmp_stats->stat_vals;
   }
 
+  if (!(tmp_stats->valid_ids)) {
+    free(id_vals);
+  }
+
   if (stat_vals[i] == 0) /* is this object null? */ {
     ex_err_fn(exoid, __func__, "", EX_NULLENTITY);
     if (!(tmp_stats->valid_stat)) {
       free(stat_vals);
     }
-    if (!(tmp_stats->valid_ids)) {
-      free(id_vals);
-    }
     return (-((int)i + 1)); /* return index into id array (1-based) */
   }
-  if (!(tmp_stats->valid_ids)) {
-    free(id_vals);
+  if (!(tmp_stats->valid_stat)) {
     free(stat_vals);
   }
   return (i + 1); /* return index into id array (1-based) */