Changeset 662

Timestamp:

06/01/09 09:59:30 (16 years ago)

Author:

Eric.Larour

Message:

Conditional Dakota compilation

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (2 diffs)
• objects/DakotaPlugin.cpp (modified) (3 diffs)
• objects/DakotaPlugin.h (modified) (2 diffs)
• parallel/diagnostic.cpp (modified) (1 diff)
• parallel/qmu.cpp (modified) (3 diffs)

issm/trunk/src/c/Makefile.am

@@ -295 +295 @@
                                         ./objects/Friction.h\
                                         ./objects/Friction.cpp\
+                                        ./objects/DakotaPlugin.h\
+                                        ./objects/DakotaPlugin.cpp\
                                         ./objects/Node.h\
                                         ./objects/Node.cpp\
@@ -542 +544 @@
                                         ./parallel/SpawnCore.cpp\
                                         ./parallel/ProcessResults.cpp\
+                                        ./parallel/qmu.cpp\
+                                        ./parallel/DakotaResponses.cpp\
                                         ./parallel/OutputResults.cpp
 

issm/trunk/src/c/objects/DakotaPlugin.cpp

@@ -2 +2 @@
  */ 
 
-#include "DakotaResponse.H"
-#include "ParamResponsePair.H"
-#include "DakotaPlugin.h"
-#include "system_defs.h"
-#include "ProblemDescDB.H"
-#include "ParallelLibrary.H"
-
-#include "../shared/shared.h"
-#include "../include/macros.h"
-#include "../objects/objects.h"
-#include "../parallel/parallel.h"
 
 #ifdef HAVE_CONFIG_H
@@ -20 +9 @@
 #endif
 
+/*Standard ISSM includes: */
+#include "../shared/shared.h"
+#include "../include/macros.h"
+#include "../objects/objects.h"
+#include "../parallel/parallel.h"
+
+/*Standard includes: */
 #include <string>
 
+#ifdef _HAVE_DAKOTA_ //only works if dakota library has been compiled in.
+
+//Dakota headers
+#include "DakotaResponse.H"
+#include "ParamResponsePair.H"
+#include "DakotaPlugin.h"
+#include "system_defs.h"
+#include "ProblemDescDB.H"
+#include "ParallelLibrary.H"
 
 namespace SIM {
@@ -91 +96 @@
 
 } // namespace SIM
+
+
+#endif //only works if dakota library has been compiled in.

issm/trunk/src/c/objects/DakotaPlugin.h

@@ -8 +8 @@
 #ifndef DAKOTAPLUGIN_H
 #define DAKOTAPLUGIN_H
+
+
+#ifdef _HAVE_DAKOTA_ //only works if dakota library has been compiled in.
 
 #include "DirectApplicInterface.H"
@@ -43 +46 @@
 } // namespace SIM
 
+#endif //only works if dakota library has been compiled in.
+
 
 #endif

issm/trunk/src/c/parallel/diagnostic.cpp

@@ -103 +103 @@
                 /*run qmu analysis: */
                 _printf_("calling qmu analysis on diagnostic core:\n");
-                
-                //qmu(qmuinname,qmuoutname,qmuerrname,&femmodels[0],inputs,DiagnosticAnalysisEnum(),NoneAnalysisEnum());
+        
+                #ifdef _HAVE_DAKOTA_ 
+                qmu(qmuinname,qmuoutname,qmuerrname,&femmodels[0],inputs,DiagnosticAnalysisEnum(),NoneAnalysisEnum());
+                #else
+                throw ErrorException(__FUNCT__," Dakota not present, cannot do qmu!");
+                #endif
         }
 

issm/trunk/src/c/parallel/qmu.cpp

@@ -12 +12 @@
 #define __FUNCT__ "qmu"
 
+#include "../objects/DakotaPlugin.h"
+#include "../shared/shared.h"
+#include "../include/macros.h"
+#include "parallel.h"
+
+
+#ifdef _HAVE_DAKOTA_ //only works if dakota library has been compiled in.
+
 #include "ParallelLibrary.H"
 #include "ProblemDescDB.H"
@@ -18 +26 @@
 #include "DakotaInterface.H"
 
-#include "../objects/DakotaPlugin.h"
-#include "../shared/shared.h"
-#include "../include/macros.h"
-#include "parallel.h"
 
 void qmu(const char* dakota_input_file,const char* dakota_output_file,const char* dakota_error_file, FemModel* femmodels,ParameterInputs* inputs,int analysis_type,int sub_analysis_type){
@@ -94 +98 @@
         }
 }
+
+#endif //only works if dakota library has been compiled in.
+