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

Last change on this file since 15393 was 15393, checked in by Mathieu Morlighem, 12 years ago

NEW: adding Archive/14312-15392 for oecreview
File size: 4.0 KB
RevLine 
[15393]1Index: ../trunk-jpl/src/c/solutions/DakotaSpawnCore.h
2===================================================================
3--- ../trunk-jpl/src/c/solutions/DakotaSpawnCore.h (revision 0)
4+++ ../trunk-jpl/src/c/solutions/DakotaSpawnCore.h (revision 14907)
5@@ -0,0 +1,4 @@
6+#ifndef _DAKOTA_SPAWN_CORE_
7+#define _DAKOTA_SPAWN_CORE_
8+int DakotaSpawnCore(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, void* femmodel,int counter);
9+#endif
10Index: ../trunk-jpl/src/c/solutions/solutions.h
11===================================================================
12--- ../trunk-jpl/src/c/solutions/solutions.h (revision 14906)
13+++ ../trunk-jpl/src/c/solutions/solutions.h (revision 14907)
14@@ -5,13 +5,16 @@
15 #ifndef SOLUTIONS_H_
16 #define SOLUTIONS_H_
17
18-#include "../classes/objects/objects.h"
19-#include "../io/io.h"
20-#include "../toolkits/toolkits.h"
21-
22+/*forward declarations: */
23 struct OptArgs;
24 class FemModel;
25+class Parameters;
26+template <class doubletype> class Matrix;
27+template <class doubletype> class Vector;
28
29+#include "../io/Comm/Comm.h"
30+#include "../include/types.h"
31+
32 /*cores: */
33 void adjointdiagnostic_core(FemModel* femmodel);
34 void adjointbalancethickness_core(FemModel* femmodel);
35@@ -50,7 +53,6 @@
36 void ResetBoundaryConditions(FemModel* femmodel, int analysis_type);
37 COMM EnvironmentInit(int argc,char** argv);
38 void EnvironmentFinalize(void);
39-int DakotaSpawnCore(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, void* femmodel,int counter);
40 void PrintBanner(void);
41
42 //solution configuration
43@@ -59,4 +61,5 @@
44 void WrapperCorePointerFromSolutionEnum(void (**psolutioncore)(FemModel*),Parameters* parameters,int solutiontype,bool nodakotacore=false);
45 void AdjointCorePointerFromSolutionEnum(void (**padjointcore)(FemModel*),int solutiontype);
46
47+
48 #endif
49Index: ../trunk-jpl/src/c/solutions/dakota_core.cpp
50===================================================================
51--- ../trunk-jpl/src/c/solutions/dakota_core.cpp (revision 14906)
52+++ ../trunk-jpl/src/c/solutions/dakota_core.cpp (revision 14907)
53@@ -47,6 +47,7 @@
54 #include <DakotaStrategy.H>
55 #include <DakotaModel.H>
56 #include <DakotaInterface.H>
57+#include "./DakotaSpawnCore.h"
58 #endif
59 /*}}}*/
60
61Index: ../trunk-jpl/src/c/Makefile.am
62===================================================================
63--- ../trunk-jpl/src/c/Makefile.am (revision 14906)
64+++ ../trunk-jpl/src/c/Makefile.am (revision 14907)
65@@ -362,6 +362,7 @@
66 ./modules/AverageOntoPartitionx/AverageOntoPartitionx.h\
67 ./modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp\
68 ./solutions/dakota_core.cpp\
69+ ./solutions/DakotaSpawnCore.h\
70 ./solutions/DakotaSpawnCore.cpp
71 #}}}
72 #Transient sources {{{
73Index: ../trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp
74===================================================================
75--- ../trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp (revision 14906)
76+++ ../trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp (revision 14907)
77@@ -20,15 +20,15 @@
78 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
79 #endif
80
81-/*Standard ISSM includes: */
82-#include "../../shared/shared.h"
83-#include "../../include/include.h"
84-#include "../../solutions/solutions.h"
85-#include "../classes.h"
86-
87 /*Standard includes: */
88 #include <string>
89
90+/*ISSM includes: */
91+#include "../../include/types.h"
92+#include "../../shared/MemOps/MemOps.h"
93+#include "../../solutions/DakotaSpawnCore.h"
94+
95+
96 #ifdef _HAVE_DAKOTA_ //only works if dakota library has been compiled in.
97
98 //Dakota headers
99Index: ../trunk-jpl/src/c/classes/dakota/DakotaPlugin.h
100===================================================================
101--- ../trunk-jpl/src/c/classes/dakota/DakotaPlugin.h (revision 14906)
102+++ ../trunk-jpl/src/c/classes/dakota/DakotaPlugin.h (revision 14907)
103@@ -8,8 +8,6 @@
104
105 /*Headers:*/
106 #include <DirectApplicInterface.H>
107-#include "../../toolkits/toolkits.h"
108-#include "../../classes/classes.h"
109
110 namespace SIM {
111
Note: See TracBrowser for help on using the repository browser.