Changeset 1844

Timestamp:

08/24/09 18:02:11 (15 years ago)

Author:

Eric.Larour

Message:

Brachning back from issm.controlstatic, by hand

Location:

issm/trunk/src/c

Files:

• io/IoModelFetchData.cpp (added)
• io/ModelFetchData.cpp (deleted)
• io/io.h (modified) (1 diff)
• issm.h (modified) (1 diff)
• shared/Numerics/OptFunc.cpp (modified) (1 diff)

issm/trunk/src/c/io/io.h

@@ -22 +22 @@
 void FetchData(void** pdata,int* pM,int* pN,ConstDataHandle data_handle,char* data_type,char* sub_data_type);
 void WriteData(DataHandle* pdata_handle,void* data,int M,int N,char* data_type,char* sub_data_type);
-void ModelFetchData(void** pdata,int* pM,int* pN,ConstDataHandle model_handle,char* data_name,char* data_type,char* sub_data_type);
+void IoModelFetchData(void** pdata,int* pM,int* pN,ConstDataHandle model_handle,char* data_name,char* data_type,char* sub_data_type);
 
 /*Serial: */

issm/trunk/src/c/issm.h

@@ -18 +18 @@
 
 /*Modules: */
-#include "./ModelProcessorx/Model.h"
+#include "./ModelProcessorx/IoModel.h"
 #include "./Dofx/Dofx.h"
 #include "./Dux/Dux.h"

issm/trunk/src/c/shared/Numerics/OptFunc.cpp

@@ -29 +29 @@
         psearch_scalar=mxCreateDoubleScalar(scalar);
         inputs[0]=psearch_scalar;
-        inputs[1]=optargs->m;
+        inputs[1]=optargs->models;
         inputs[2]=optargs->inputs;
         inputs[3]=optargs->param_g;