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

    r9650 r12004  
    3131
    3232        /*Input datasets: */
    33         FetchMatlabData((DataSet**)&elements,ELEMENTSIN);
    34         FetchMatlabData((DataSet**)&nodes,NODESIN);
    35         FetchMatlabData((DataSet**)&vertices,VERTICESIN);
    36         FetchMatlabData((DataSet**)&loads,LOADSIN);
    37         FetchMatlabData((DataSet**)&materials,MATERIALSIN);
    38         FetchMatlabData(&parameters,PARAMETERSIN);
     33        FetchData((DataSet**)&elements,ELEMENTSIN);
     34        FetchData((DataSet**)&nodes,NODESIN);
     35        FetchData((DataSet**)&vertices,VERTICESIN);
     36        FetchData((DataSet**)&loads,LOADSIN);
     37        FetchData((DataSet**)&materials,MATERIALSIN);
     38        FetchData(&parameters,PARAMETERSIN);
    3939
    4040        /*number of responses: */
    … …  
    6464
    6565        /*write output datasets: */
    66         WriteMatlabData(RESPONSES,responses,numresponses);
     66        WriteData(RESPONSES,responses,numresponses);
    6767
    6868        /*Free ressources: */
Note: See TracChangeset for help on using the changeset viewer.