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

    r8910 r12004  
    3434       
    3535        /*open file input for reading: */
    36         FetchMatlabData(&inputfilename,INPUTFILE);
     36        FetchData(&inputfilename,INPUTFILE);
    3737        IOMODEL= pfopen(inputfilename ,"rb");
    3838
    3939        /*retrieve solution type and analyses: */
    40         FetchMatlabData(&solution_type,SOLUTIONTYPE);
    41         FetchMatlabData(&double_analyses,&numanalyses,ANALYSES);
     40        FetchData(&solution_type,SOLUTIONTYPE);
     41        FetchData(&double_analyses,&numanalyses,ANALYSES);
    4242        analyses=(int*)xmalloc(numanalyses*sizeof(int));
    4343        for(i=0;i<numanalyses;i++)analyses[i]=(int)double_analyses[i];
    … …  
    4747
    4848        /*Write output data: */
    49         WriteMatlabData(ELEMENTS,elements);
    50         WriteMatlabData(NODES,nodes);
    51         WriteMatlabData(VERTICES,vertices);
    52         WriteMatlabData(CONSTRAINTS,constraints);
    53         WriteMatlabData(LOADS,loads);
    54         WriteMatlabData(MATERIALS,materials);
    55         WriteMatlabData(PARAMETERS,parameters);
     49        WriteData(ELEMENTS,elements);
     50        WriteData(NODES,nodes);
     51        WriteData(VERTICES,vertices);
     52        WriteData(CONSTRAINTS,constraints);
     53        WriteData(LOADS,loads);
     54        WriteData(MATERIALS,materials);
     55        WriteData(PARAMETERS,parameters);
    5656
    5757        /*Free ressources: */
Note: See TracChangeset for help on using the changeset viewer.