Ignore:
Timestamp:
04/16/12 16:06:52 (13 years ago)
Author:
cborstad
Message:

merged trunk-jpl into trunk-jpl-damage through revision 11990

Location:
issm/branches/trunk-jpl-damage
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/branches/trunk-jpl-damage

  • issm/branches/trunk-jpl-damage/src/mex

    • Property svn:ignore

      •  

        old new  
         1__pycache__
        12Makefile
        23.ignore.txt

  • issm/branches/trunk-jpl-damage/src/mex/InputUpdateFromConstant/InputUpdateFromConstant.cpp

    r8910 r12004  
    2424
    2525        /*Input datasets: */
    26         FetchMatlabData((DataSet**)&elements,ELEMENTSIN);
    27         FetchMatlabData((DataSet**)&nodes,NODESIN);
    28         FetchMatlabData((DataSet**)&vertices,VERTICESIN);
    29         FetchMatlabData((DataSet**)&loads,LOADSIN);
    30         FetchMatlabData((DataSet**)&materials,MATERIALSIN);
    31         FetchMatlabData(&parameters,PARAMETERSIN);
    32         FetchMatlabData(&constant,CONSTANT);
    33         FetchMatlabData(&name,NAME);
     26        FetchData((DataSet**)&elements,ELEMENTSIN);
     27        FetchData((DataSet**)&nodes,NODESIN);
     28        FetchData((DataSet**)&vertices,VERTICESIN);
     29        FetchData((DataSet**)&loads,LOADSIN);
     30        FetchData((DataSet**)&materials,MATERIALSIN);
     31        FetchData(&parameters,PARAMETERSIN);
     32        FetchData(&constant,CONSTANT);
     33        FetchData(&name,NAME);
    3434
    3535        /*configure: */
    … …  
    4242
    4343        /*write output datasets: */
    44         WriteMatlabData(ELEMENTS,elements);
    45         WriteMatlabData(LOADS,loads);
     44        WriteData(ELEMENTS,elements);
     45        WriteData(LOADS,loads);
    4646
    4747        /*Free ressources: */
Note: See TracChangeset for help on using the changeset viewer.