Changeset 14907

Timestamp:

05/05/13 10:38:04 (12 years ago)

Author:

Eric.Larour

Message:

CHG: de-entangling dakota include files

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• classes/dakota/DakotaPlugin.cpp (modified) (1 diff)
• classes/dakota/DakotaPlugin.h (modified) (1 diff)
• solutions/DakotaSpawnCore.h (added)
• solutions/dakota_core.cpp (modified) (1 diff)
• solutions/solutions.h (modified) (3 diffs)

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

@@ -363 +363 @@
                                           ./modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp\
                                           ./solutions/dakota_core.cpp\
+                                          ./solutions/DakotaSpawnCore.h\
                                           ./solutions/DakotaSpawnCore.cpp
 #}}}

issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp

@@ -21 +21 @@
 #endif
 
-/*Standard ISSM includes: */
-#include "../../shared/shared.h"
-#include "../../include/include.h"
-#include "../../solutions/solutions.h"
-#include "../classes.h"
-
 /*Standard includes: */
 #include <string>
+
+/*ISSM includes: */
+#include "../../include/types.h"
+#include "../../shared/MemOps/MemOps.h"
+#include "../../solutions/DakotaSpawnCore.h"
+
 
 #ifdef _HAVE_DAKOTA_ //only works if dakota library has been compiled in.

issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.h

@@ -9 +9 @@
 /*Headers:*/
 #include <DirectApplicInterface.H>
-#include "../../toolkits/toolkits.h"
-#include "../../classes/classes.h"
 
 namespace SIM {

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

@@ -48 +48 @@
 #include <DakotaModel.H>
 #include <DakotaInterface.H>
+#include "./DakotaSpawnCore.h"
 #endif
 /*}}}*/

issm/trunk-jpl/src/c/solutions/solutions.h

@@ -6 +6 @@
 #define SOLUTIONS_H_
 
-#include "../classes/objects/objects.h"
-#include "../io/io.h"
-#include "../toolkits/toolkits.h"
-
+/*forward declarations: */
 struct OptArgs;
 class FemModel;
+class Parameters;
+template <class doubletype> class Matrix;
+template <class doubletype> class Vector;
+
+#include "../io/Comm/Comm.h"
+#include "../include/types.h"
 
 /*cores: */
@@ -51 +54 @@
 COMM EnvironmentInit(int argc,char** argv);
 void EnvironmentFinalize(void);
-int  DakotaSpawnCore(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, void* femmodel,int counter);
 void PrintBanner(void);
 
@@ -60 +62 @@
 void AdjointCorePointerFromSolutionEnum(void (**padjointcore)(FemModel*),int solutiontype);
 
+
 #endif