Changeset 3859

Timestamp:

May 20, 2010, 7:31:11 AM (16 years ago)

Author:

seroussi

Message:

some fixing for Dakota (still not working)

Location:

issm/trunk/src/c

Files:

• objects/Model.cpp (modified) (1 diff)
• parallel/balancedthickness.cpp (modified) (1 diff)
• parallel/balancedthickness2.cpp (modified) (1 diff)
• parallel/balancedvelocities.cpp (modified) (1 diff)
• parallel/diagnostic.cpp (modified) (1 diff)
• parallel/prognostic.cpp (modified) (1 diff)
• parallel/prognostic2.cpp (modified) (1 diff)
• parallel/steadystate.cpp (modified) (1 diff)
• parallel/thermal.cpp (modified) (1 diff)
• parallel/transient.cpp (modified) (1 diff)

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

@@ -632 +632 @@
 /*}}}1*/
 /*FUNCTION Model::UpdateFromDakota(double* variables,char** variables_descriptors,int numvariables,DataSet* parameters, double* qmu_part,int qmu_npart);{{{1:*/
-void    UpdateFromDakota(double* variables,char** variables_descriptors,int numvariables,DataSet* parameters, double* qmu_part,int qmu_npart){
+void Model::UpdateFromDakota(double* variables,char** variables_descriptors,int numvariables,DataSet* parameters, double* qmu_part,int qmu_npart){
         ISSMERROR("not supported yet!");
 }

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

@@ -13 +13 @@
 #include "../EnumDefinitions/EnumDefinitions.h"
 #include "../include/include.h"
+#include "../modules.h"
 #include "./parallel.h"
 

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

@@ -14 +14 @@
 #include "../EnumDefinitions/EnumDefinitions.h"
 #include "../include/include.h"
+#include "../modules.h"
 #include "./parallel.h"
 

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

@@ -14 +14 @@
 #include "../EnumDefinitions/EnumDefinitions.h"
 #include "../include/include.h"
+#include "../modules.h"
 #include "./parallel.h"
 

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

@@ -14 +14 @@
 #include "../EnumDefinitions/EnumDefinitions.h"
 #include "../include/include.h"
+#include "../modules.h"
 #include "./parallel.h"
 

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

@@ -14 +14 @@
 #include "../EnumDefinitions/EnumDefinitions.h"
 #include "../include/include.h"
+#include "../modules.h"
 #include "./parallel.h"
 

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

@@ -14 +14 @@
 #include "../EnumDefinitions/EnumDefinitions.h"
 #include "../include/include.h"
+#include "../modules.h"
 #include "./parallel.h"
 

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

@@ -14 +14 @@
 #include "../EnumDefinitions/EnumDefinitions.h"
 #include "../include/include.h"
+#include "../modules.h"
 #include "./parallel.h"
 

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

@@ -14 +14 @@
 #include "../EnumDefinitions/EnumDefinitions.h"
 #include "../include/include.h"
+#include "../modules.h"
 #include "./parallel.h"
 

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

@@ -14 +14 @@
 #include "../EnumDefinitions/EnumDefinitions.h"
 #include "../include/include.h"
+#include "../modules.h"
 #include "./parallel.h"