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/InputUpdateFromVector/InputUpdateFromVector.cpp

    r8910 r12004  
    2626
    2727        /*Input datasets: */
    28         FetchMatlabData((DataSet**)&elements,ELEMENTSIN);
    29         FetchMatlabData((DataSet**)&nodes,NODESIN);
    30         FetchMatlabData((DataSet**)&vertices,VERTICESIN);
    31         FetchMatlabData((DataSet**)&loads,LOADSIN);
    32         FetchMatlabData((DataSet**)&materials,MATERIALSIN);
    33         FetchMatlabData(&parameters,PARAMETERSIN);
    34         FetchMatlabData(&vector,&dummy,VECTOR);
    35         FetchMatlabData(&name,NAME);
    36         FetchMatlabData(&type,TYPE);
     28        FetchData((DataSet**)&elements,ELEMENTSIN);
     29        FetchData((DataSet**)&nodes,NODESIN);
     30        FetchData((DataSet**)&vertices,VERTICESIN);
     31        FetchData((DataSet**)&loads,LOADSIN);
     32        FetchData((DataSet**)&materials,MATERIALSIN);
     33        FetchData(&parameters,PARAMETERSIN);
     34        FetchData(&vector,&dummy,VECTOR);
     35        FetchData(&name,NAME);
     36        FetchData(&type,TYPE);
    3737
    3838        /*Check that type is one of Constant, Vertex or Element: */
    … …  
    5050
    5151        /*write output datasets: */
    52         WriteMatlabData(ELEMENTS,elements);
    53         WriteMatlabData(NODES,nodes);
    54         WriteMatlabData(VERTICES,vertices);
    55         WriteMatlabData(LOADS,loads);
    56         WriteMatlabData(MATERIALS,materials);
    57         WriteMatlabData(PARAMETERS,parameters);
     52        WriteData(ELEMENTS,elements);
     53        WriteData(NODES,nodes);
     54        WriteData(VERTICES,vertices);
     55        WriteData(LOADS,loads);
     56        WriteData(MATERIALS,materials);
     57        WriteData(PARAMETERS,parameters);
    5858
    5959        /*Free ressources: */
Note: See TracChangeset for help on using the changeset viewer.