Changeset 12815


Ignore:
Timestamp:
07/30/12 09:43:46 (13 years ago)
Author:
Mathieu Morlighem
Message:

CHG: use common patch for matlab and python. Do not use mxFree and mxMalloc. Matlab's API is used by WriteData

Location:
issm/trunk-jpl/externalpackages/triangle
Files:
4 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/externalpackages/triangle/install-linux64.sh

    r12802 r12815  
    1818
    1919#Patch triangle.c
    20 patch triangle.c ../triangle.c.patch.matlab
     20patch triangle.c ../triangle.c.patch
    2121
    2222#Compile triangle

  • issm/trunk-jpl/externalpackages/triangle/triangle.c.patch

    r1 r12815  
    55>  * double precision activation in exactinit(); The rest is not changed.
    66>  * We also created the ice_makefile to compile Triangle into a library. */
    7 > #include <mat.h>
    8 > #include <matrix.h>
     7> /* #include <mat.h>
     8> #include <matrix.h> */
    99> #define ANSI_DECLARATORS
    1010> #define NO_TIMER
    … …  
    134134<   memptr = (VOID *) malloc((unsigned int) size);
    135135---
    136 >   memptr = (VOID *) mxMalloc((unsigned int) size);
    137 >   //memptr = (VOID *) malloc((unsigned int) size);
     136>   //memptr = (VOID *) mxMalloc((unsigned int) size);
     137>   memptr = (VOID *) malloc((unsigned int) size);
    1381381447c1543,1544
    139139<   free(memptr);
    140140---
    141 >   //free(memptr);
    142 >   mxFree(memptr);
     141>   free(memptr);
     142>   //mxFree(memptr);
    1431433665,3670c3762,3767
    144144< void printtriangle(struct mesh *m, struct behavior *b, struct otri *t)
Note: See TracChangeset for help on using the changeset viewer.