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

    r11313 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(&norm_list,NULL,NULL,NORMLIST);
    33 FetchMatlabData(&step,STEP);
     26FetchData((DataSet**)&elements,ELEMENTSIN);
     27FetchData((DataSet**)&nodes,NODESIN);
     28FetchData((DataSet**)&vertices,VERTICESIN);
     29FetchData((DataSet**)&loads,LOADSIN);
     30FetchData((DataSet**)&materials,MATERIALSIN);
     31FetchData(&parameters,PARAMETERSIN);
     32FetchData(&norm_list,NULL,NULL,NORMLIST);
     33FetchData(&step,STEP);
    3434
    3535/*configure: */
    … …  
    4242
    4343/*write output datasets: */
    44 WriteMatlabData(ELEMENTS,elements);
    45 WriteMatlabData(NODES,nodes);
    46 WriteMatlabData(VERTICES,vertices);
    47 WriteMatlabData(LOADS,loads);
    48 WriteMatlabData(MATERIALS,materials);
    49 WriteMatlabData(PARAMETERS,parameters);
     44WriteData(ELEMENTS,elements);
     45WriteData(NODES,nodes);
     46WriteData(VERTICES,vertices);
     47WriteData(LOADS,loads);
     48WriteData(MATERIALS,materials);
     49WriteData(PARAMETERS,parameters);
    5050
    5151/*Free ressources: */
Note: See TracChangeset for help on using the changeset viewer.