Changeset 8910 for issm/trunk/src/mex/InputConvergence/InputConvergence.cpp

Timestamp:

07/11/11 16:41:47 (14 years ago)

Author:

Eric.Larour

Message:

Reorganized io/ directory quite a bit.
Separated Matlab io from the other Disk related io.
Renamed WriteData to WriteMatlabData and FetchData to FetchMatlabData.
Folded WriteParams and FetchParams into FetchMatlabData and WriteMatlabData.

File:

• issm/trunk/src/mex/InputConvergence/InputConvergence.cpp (modified) (2 diffs)

issm/trunk/src/mex/InputConvergence/InputConvergence.cpp

@@ -35 +35 @@
         CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&InputConvergenceUsage);
 
-        FetchData((DataSet**)&elements,ELEMENTS);
-        FetchData((DataSet**)&loads,LOADS);
-        FetchData((DataSet**)&nodes,NODES);
-        FetchData((DataSet**)&vertices,VERTICES);
-        FetchData((DataSet**)&materials,MATERIALS);
-        FetchParams(&parameters,PARAMETERS);
+        FetchMatlabData((DataSet**)&elements,ELEMENTS);
+        FetchMatlabData((DataSet**)&loads,LOADS);
+        FetchMatlabData((DataSet**)&nodes,NODES);
+        FetchMatlabData((DataSet**)&vertices,VERTICES);
+        FetchMatlabData((DataSet**)&materials,MATERIALS);
+        FetchMatlabData(&parameters,PARAMETERS);
 
-        FetchData(&double_fields,&numfields,FIELDENUMS);
+        FetchMatlabData(&double_fields,&numfields,FIELDENUMS);
         field_enums=(int*)xmalloc(numfields*sizeof(int));
         for(i=0;i<numfields;i++)field_enums[i]=(int)double_fields[i];
 
-        FetchData(&double_criterion,&numcriterions,CRITERIONENUMS);
-        FetchData(&criterion_values,&numcriterions,CRITERIONVALUES);
+        FetchMatlabData(&double_criterion,&numcriterions,CRITERIONENUMS);
+        FetchMatlabData(&criterion_values,&numcriterions,CRITERIONVALUES);
         criterion_enums=(int*)xmalloc(numcriterions*sizeof(int));
         for(i=0;i<numcriterions;i++)criterion_enums[i]=(int)double_criterion[i];
@@ -60 +60 @@
 
         /*Write output data: */
-        WriteData(CONVERGED,converged);
+        WriteMatlabData(CONVERGED,converged);
 
         /*Free ressources: */