Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/mex/InputConvergence/InputConvergence.cpp

    r6412 r8910  
    3535        CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&InputConvergenceUsage);
    3636
    37         FetchData((DataSet**)&elements,ELEMENTS);
    38         FetchData((DataSet**)&loads,LOADS);
    39         FetchData((DataSet**)&nodes,NODES);
    40         FetchData((DataSet**)&vertices,VERTICES);
    41         FetchData((DataSet**)&materials,MATERIALS);
    42         FetchParams(&parameters,PARAMETERS);
     37        FetchMatlabData((DataSet**)&elements,ELEMENTS);
     38        FetchMatlabData((DataSet**)&loads,LOADS);
     39        FetchMatlabData((DataSet**)&nodes,NODES);
     40        FetchMatlabData((DataSet**)&vertices,VERTICES);
     41        FetchMatlabData((DataSet**)&materials,MATERIALS);
     42        FetchMatlabData(&parameters,PARAMETERS);
    4343
    44         FetchData(&double_fields,&numfields,FIELDENUMS);
     44        FetchMatlabData(&double_fields,&numfields,FIELDENUMS);
    4545        field_enums=(int*)xmalloc(numfields*sizeof(int));
    4646        for(i=0;i<numfields;i++)field_enums[i]=(int)double_fields[i];
    4747
    48         FetchData(&double_criterion,&numcriterions,CRITERIONENUMS);
    49         FetchData(&criterion_values,&numcriterions,CRITERIONVALUES);
     48        FetchMatlabData(&double_criterion,&numcriterions,CRITERIONENUMS);
     49        FetchMatlabData(&criterion_values,&numcriterions,CRITERIONVALUES);
    5050        criterion_enums=(int*)xmalloc(numcriterions*sizeof(int));
    5151        for(i=0;i<numcriterions;i++)criterion_enums[i]=(int)double_criterion[i];
     
    6060
    6161        /*Write output data: */
    62         WriteData(CONVERGED,converged);
     62        WriteMatlabData(CONVERGED,converged);
    6363
    6464        /*Free ressources: */
Note: See TracChangeset for help on using the changeset viewer.