Changeset 25663

Timestamp:

10/08/20 20:18:25 (4 years ago)

Author:

jdquinn

Message:

BUG: Do not run Dakota statistics if fmemopen is not available

Location:

issm/trunk-jpl

Files:

• m4/issm_options.m4 (modified) (1 diff)
• src/c/main/issm_dakota.cpp (modified) (3 diffs)

issm/trunk-jpl/m4/issm_options.m4

@@ -209 +209 @@
         SYSTEM_FMEMOPEN="no"
         if test "${IS_MAC}" == "yes"; then
-                AC_MSG_CHECKING([if system libc has fmemopen])
                 if [[ $(system_profiler SPSoftwareDataType | $(which grep) "System Version:" | sed -e "s/[[:space:]]*System Version: macOS //" | cut -d "." -f 2) -ge 13 ]]; then
                         SYSTEM_FMEMOPEN="yes"
+                        AC_DEFINE([_SYSTEM_FMEMOPEN_], [1], [does system libc have fmemopen])
                 fi
         fi
         AM_CONDITIONAL([SYSTEM_HAS_FMEMOPEN], [test "${SYSTEM_FMEMOPEN}" == "yes"])
-        AC_MSG_RESULT([${SYSTEM_FMEMOPEN}])
 
         IS_WINDOWS=no

issm/trunk-jpl/src/c/main/issm_dakota.cpp

@@ -41 +41 @@
 
         /*Create directory structure for model outputs:*/
+        #ifdef (_SYSTEM_FMEMOPEN_)
         statistics=DakotaDirStructure(argc,argv);
+        #endif
 
         /* Parse input and construct Dakota LibraryEnvironment, performing input data checks*/
@@ -88 +90 @@
 
         /* Run statistics if requested:*/
+        #ifdef (_SYSTEM_FMEMOPEN_)
         if(statistics)DakotaStatistics(argc,argv);
+        #endif
 
         /*free allocations:*/
@@ -98 +102 @@
         return 0; 
         #else 
-        Cout <<  "ISSM Dakota  executable was compiled without support of Dakota! Will just return now!" << "\n";
+        Cout <<  "ISSM Dakota executable was compiled without support of Dakota! Will just return now!" << "\n";
         return 1;
         #endif