Changeset 15177

Timestamp:

05/30/13 11:58:56 (12 years ago)

Author:

jschierm

Message:

NEW: Updated dakota_core.cpp for Dakota 5.3.

File:

• issm/trunk-jpl/src/c/analyses/dakota_core.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/analyses/dakota_core.cpp

@@ -40 +40 @@
 
 #ifdef _HAVE_DAKOTA_ //only works if dakota library has been compiled in.
+#if _DAKOTA_MAJOR_ < 5 || (_DAKOTA_MAJOR_ == 5 && _DAKOTA_MINOR_ < 3)
 #include <ParallelLibrary.H>
 #include <ProblemDescDB.H>
@@ -45 +46 @@
 #include <DakotaModel.H>
 #include <DakotaInterface.H>
+#else
+#include <ParallelLibrary.hpp>
+#include <ProblemDescDB.hpp>
+#include <DakotaStrategy.hpp>
+#include <DakotaModel.hpp>
+#include <DakotaInterface.hpp>
+#endif
 #include "./DakotaSpawnCore.h"
 #endif
@@ -50 +58 @@
 /*DakotaPlugin class {{{*/
 #ifdef _HAVE_DAKOTA_ //only works if dakota library has been compiled in.
+#if _DAKOTA_MAJOR_ < 5 || (_DAKOTA_MAJOR_ == 5 && _DAKOTA_MINOR_ < 3)
 #include <DirectApplicInterface.H>
 #include <DakotaResponse.H>
@@ -56 +65 @@
 #include <ProblemDescDB.H>
 #include <ParallelLibrary.H>
+#else
+#include <DirectApplicInterface.hpp>
+#include <DakotaResponse.hpp>
+#include <ParamResponsePair.hpp>
+#include <ProblemDescDB.hpp>
+#include <ParallelLibrary.hpp>
+#endif
 namespace SIM {
         class DakotaPlugin: public Dakota::DirectApplicInterface{