Changeset 246 for issm/trunk/src/c/DataSet/DataSet.cpp

Timestamp:

05/05/09 14:11:46 (16 years ago)

Author:

Eric.Larour

Message:

New parameter inputs framework, that can adapt to unknow number of dofs problems

File:

• issm/trunk/src/c/DataSet/DataSet.cpp (modified) (10 diffs)

issm/trunk/src/c/DataSet/DataSet.cpp

@@ -881 +881 @@
 #undef __FUNCT__
 #define __FUNCT__ "DataSet::CreateKMatrix"
-void  DataSet::CreateKMatrix(Mat Kgg,ParameterInputs* inputs,int analysis_type){
+void  DataSet::CreateKMatrix(Mat Kgg,void* inputs,int analysis_type){
 
         vector<Object*>::iterator object;
@@ -905 +905 @@
 #undef __FUNCT__
 #define __FUNCT__ "DataSet::CreatePVector"
-void  DataSet::CreatePVector(Vec pg,ParameterInputs* inputs,int analysis_type){
+void  DataSet::CreatePVector(Vec pg,void* inputs,int analysis_type){
 
         vector<Object*>::iterator object;
@@ -929 +929 @@
 #undef __FUNCT__                
 #define __FUNCT__ "UpdateFromInputs"
-void  DataSet::UpdateFromInputs(ParameterInputs* inputs){
+void  DataSet::UpdateFromInputs(void* inputs){
 
         vector<Object*>::iterator object;
@@ -965 +965 @@
 #undef __FUNCT__
 #define __FUNCT__ "DataSet::PenaltyCreateKMatrix"
-void  DataSet::PenaltyCreateKMatrix(Mat Kgg,ParameterInputs* inputs,double kmax,int analysis_type){
+void  DataSet::PenaltyCreateKMatrix(Mat Kgg,void* inputs,double kmax,int analysis_type){
 
         vector<Object*>::iterator object;
@@ -983 +983 @@
 #undef __FUNCT__
 #define __FUNCT__ "DataSet::PenaltyCreatePVector"
-void  DataSet::PenaltyCreatePVector(Vec pg,ParameterInputs* inputs,double kmax,int analysis_type){
+void  DataSet::PenaltyCreatePVector(Vec pg,void* inputs,double kmax,int analysis_type){
 
         vector<Object*>::iterator object;
@@ -1009 +1009 @@
 #undef __FUNCT__
 #define __FUNCT__ "RiftConstraints"
-void  DataSet::RiftConstraints(int* pnum_unstable_constraints,ParameterInputs* inputs,int analysis_type){
+void  DataSet::RiftConstraints(int* pnum_unstable_constraints,void* inputs,int analysis_type){
         
         throw ErrorException(__FUNCT__," not implemented yet!");
@@ -1026 +1026 @@
 #undef __FUNCT__
 #define __FUNCT__ "MeltingConstraints"
-void  DataSet::MeltingConstraints(int* pnum_unstable_constraints,ParameterInputs* inputs,int analysis_type){
+void  DataSet::MeltingConstraints(int* pnum_unstable_constraints,void* inputs,int analysis_type){
 
         throw ErrorException(__FUNCT__," not implemented yet!");
@@ -1065 +1065 @@
 
 
-void  DataSet::Du(Vec du_g,double*  u_g,double* u_g_obs,ParameterInputs* inputs,int analysis_type){
+void  DataSet::Du(Vec du_g,double*  u_g,double* u_g_obs,void* inputs,int analysis_type){
 
 
@@ -1083 +1083 @@
 }
 
-void  DataSet::Gradj(Vec grad_g,double*  u_g,double* lambda_g,ParameterInputs* inputs,int analysis_type,char* control_type){
+void  DataSet::Gradj(Vec grad_g,double*  u_g,double* lambda_g,void* inputs,int analysis_type,char* control_type){
 
 
@@ -1101 +1101 @@
 }               
                 
-void  DataSet::Misfit(double* pJ, double* u_g,double* u_g_obs,ParameterInputs* inputs,int analysis_type){
+void  DataSet::Misfit(double* pJ, double* u_g,double* u_g_obs,void* inputs,int analysis_type){
 
         double J=0;;