source: issm/oecreview/Archive/14312-15392/ISSM-14906-14907.diff

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

@@ +1 @@
+#ifndef _DAKOTA_SPAWN_CORE_
+#define _DAKOTA_SPAWN_CORE_
+int  DakotaSpawnCore(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, void* femmodel,int counter);
+#endif

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

@@ -5 +5 @@
 #ifndef SOLUTIONS_H_
 #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: */
 void adjointdiagnostic_core(FemModel* femmodel);
 void adjointbalancethickness_core(FemModel* femmodel);
@@ -50 +53 @@
 void ResetBoundaryConditions(FemModel* femmodel, int analysis_type);
 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);
 
 //solution configuration
@@ -59 +61 @@
 void WrapperCorePointerFromSolutionEnum(void (**psolutioncore)(FemModel*),Parameters* parameters,int solutiontype,bool nodakotacore=false);
 void AdjointCorePointerFromSolutionEnum(void (**padjointcore)(FemModel*),int solutiontype);
 
+
 #endif

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

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

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

@@ -362 +362 @@
                                           ./modules/AverageOntoPartitionx/AverageOntoPartitionx.h\
                                           ./modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp\
                                           ./solutions/dakota_core.cpp\
+                                          ./solutions/DakotaSpawnCore.h\
                                           ./solutions/DakotaSpawnCore.cpp
 #}}}
 #Transient sources  {{{

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

@@ -20 +20 @@
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #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.
 
 //Dakota headers

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

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