Changeset 1843

Timestamp:

08/24/09 18:00:57 (16 years ago)

Author:

Eric.Larour

Message:

Brachning back from issm.controlstatic, by hand

Location:

issm/trunk/src/c/objects

Files:

• DakotaPlugin.cpp (modified) (2 diffs)
• DakotaPlugin.h (modified) (1 diff)
• Model.cpp (added)
• Model.h (added)
• OptArgs.h (modified) (2 diffs)
• Riftfront.cpp (modified) (1 diff)
• objects.h (modified) (1 diff)

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

@@ -44 +44 @@
 
 //constructor
-DakotaPlugin::DakotaPlugin(const Dakota::ProblemDescDB& problem_db,void* in_femmodels, void* in_inputs, int in_analysis_type, int in_sub_analysis_type):Dakota::DirectApplicInterface(problem_db){
+DakotaPlugin::DakotaPlugin(const Dakota::ProblemDescDB& problem_db,void* in_model, void* in_inputs, int in_analysis_type, int in_sub_analysis_type):Dakota::DirectApplicInterface(problem_db){
 
 
-        femmodels=in_femmodels;
+        model=in_model;
         inputs=in_inputs;
         analysis_type=in_analysis_type;
@@ -91 +91 @@
 
         /*run core solution: */
-        SpawnCore(responses,numFns, variables,variable_descriptors,numACV,femmodels,inputs,analysis_type,sub_analysis_type,counter);
+        SpawnCore(responses,numFns, variables,variable_descriptors,numACV,model,inputs,analysis_type,sub_analysis_type,counter);
 
         /*populate responses: */

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

@@ -18 +18 @@
 public:
 
-        DakotaPlugin(const Dakota::ProblemDescDB& problem_db,void* femmodels, void* inputs, int analysis_type, int sub_analysis_type);
+        DakotaPlugin(const Dakota::ProblemDescDB& problem_db,void* model, void* inputs, int analysis_type, int sub_analysis_type);
         ~DakotaPlugin();
 
         /*these fields are used by core solutions: */
-        void* femmodels;
+        void* model;
         void* inputs;
 

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

@@ -13 +13 @@
 
         char* function_name;
-        mxArray* m;
+        mxArray* models;
         mxArray* inputs;
         mxArray* param_g;
@@ -29 +29 @@
 
 struct OptArgs{
-        FemModel* femmodel;
+        Model* model;
         double* param_g;
         double* grad_g;

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

@@ -787 +787 @@
         return this->material_converged;
 }
-                
+
 #undef __FUNCT__ 
 #define __FUNCT__ "Riftfront::OutputProperties"

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

@@ -28 +28 @@
 #include "./Element.h" 
 #include "./NodeSets.h"
+#include "./Model.h"
 
 /*C objects: */