Ignore:
Timestamp:
04/16/12 14:57:18 (13 years ago)
Author:
Mathieu Morlighem
Message:

merged trunk-jpl and trunk for revision 11994M

Location:
issm/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk

  • issm/trunk/src/mex

    • Property svn:ignore

      •  

        old new  
         1__pycache__
        12Makefile
        23.ignore.txt

  • issm/trunk/src/mex/Orth/Orth.cpp

    r8910 r11995  
    88
    99        /*input datasets: */
    10         Vec gradj=NULL;
    11         Vec oldgradj=NULL;
     10        Vector* gradj=NULL;
     11        Vector* oldgradj=NULL;
    1212
    1313        /* output datasets: */
    14         Vec newgradj=NULL;
     14        Vector* newgradj=NULL;
    1515
    1616        /*Boot module: */
    … …  
    2121
    2222        /*Input datasets: */
    23         FetchMatlabData(&gradj,GRADJ);
    24         FetchMatlabData(&oldgradj,OLDGRADJ);
     23        FetchData(&gradj,GRADJ);
     24        FetchData(&oldgradj,OLDGRADJ);
    2525
    2626        /*!Reduce load from g to f size: */
    … …  
    2828
    2929        /*write output datasets: */
    30         WriteMatlabData(NEWGRADJ,newgradj);
     30        WriteData(NEWGRADJ,newgradj);
    3131
    3232        /*Free ressources: */
    33         VecFree(&gradj);
    34         VecFree(&oldgradj);
    35         VecFree(&newgradj);
     33        xdelete(&gradj);
     34        xdelete(&oldgradj);
     35        xdelete(&newgradj);
    3636
    3737        /*end module: */
Note: See TracChangeset for help on using the changeset viewer.