Ignore:
Timestamp:
04/16/12 14:57:18 (13 years ago)
Author:
Mathieu Morlighem
Message:

merged trunk-jpl and trunk for revision 11994M

Location:
issm/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk

  • issm/trunk/src/mex

    • Property svn:ignore

      •  

        old new  
         1__pycache__
        12Makefile
        23.ignore.txt

  • issm/trunk/src/mex/InputDuplicate/InputDuplicate.cpp

    r8910 r11995  
    2323
    2424        /*Input datasets: */
    25         FetchMatlabData((DataSet**)&elements,ELEMENTS);
    26         FetchMatlabData((DataSet**)&nodes,NODES);
    27         FetchMatlabData((DataSet**)&vertices,VERTICES);
    28         FetchMatlabData((DataSet**)&loads,LOADS);
    29         FetchMatlabData((DataSet**)&materials,MATERIALS);
    30         FetchMatlabData(&parameters,PARAMETERS);
     25        FetchData((DataSet**)&elements,ELEMENTS);
     26        FetchData((DataSet**)&nodes,NODES);
     27        FetchData((DataSet**)&vertices,VERTICES);
     28        FetchData((DataSet**)&loads,LOADS);
     29        FetchData((DataSet**)&materials,MATERIALS);
     30        FetchData(&parameters,PARAMETERS);
    3131       
    32         FetchMatlabData(&original_enum,ORIGINALENUM);
    33         FetchMatlabData(&new_enum,NEWENUM);
     32        FetchData(&original_enum,ORIGINALENUM);
     33        FetchData(&new_enum,NEWENUM);
    3434
    3535        /*!Call core code: */
    … …  
    3737
    3838        /*write output : */
    39         WriteMatlabData(ELEMENTSOUT,elements);
     39        WriteData(ELEMENTSOUT,elements);
    4040
    4141        /*Free ressources: */
Note: See TracChangeset for help on using the changeset viewer.