Changeset 25666 for issm/trunk-jpl/src/c

Timestamp:

10/09/20 01:12:19 (5 years ago)

Author:

jdquinn

Message:

BUG: What should be final fix for fmemopen issue

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• main/issm_dakota.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/Makefile.am

@@ -354 +354 @@
         ./modules/ModelProcessorx/Dakota/UpdateElementsAndMaterialsDakota.cpp \
         ./cores/dakota_core.cpp
-        if SYSTEM_FMEMOPEN
-                issm_sources += ./modules/QmuStatisticsx/QmuStatisticsx.cpp
-        fi
+if SYSTEM_HAS_FMEMOPEN
+issm_sources += ./modules/QmuStatisticsx/QmuStatisticsx.cpp
+endif
 endif
 #}}}

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

@@ -41 +41 @@
 
         /*Create directory structure for model outputs:*/
-        #ifdef _SYSTEM_FMEMOPEN_
+        #if _SYSTEM_HAS_FMEMOPEN_ == 1
         statistics=DakotaDirStructure(argc,argv);
         #endif
@@ -90 +90 @@
 
         /* Run statistics if requested:*/
-        #ifdef _SYSTEM_FMEMOPEN_
+        #if _SYSTEM_HAS_FMEMOPEN_ == 1
         if(statistics)DakotaStatistics(argc,argv);
         #endif