Changeset 22498


Ignore:
Timestamp:
03/03/18 15:02:46 (7 years ago)
Author:
Mathieu Morlighem
Message:

CHG: renaming TriMesh Triangle, for consistency (we use a mesher whose name is triangle, Trimesh is another mesher that we do not uese)

Location:
issm/trunk-jpl/src
Files:
11 deleted
15 edited
11 copied
9 moved

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/Makefile.am

    r22471 r22498  
    561561                        ./shared/Threads/PartitionRange.cpp\
    562562                        ./shared/Exp/exp.cpp\
    563                         ./shared/TriMesh/AssociateSegmentToElement.cpp\
    564                         ./shared/TriMesh/GridInsideHole.cpp\
    565                         ./shared/TriMesh/OrderSegments.cpp\
    566                         ./shared/TriMesh/SplitMeshForRifts.cpp\
    567                         ./shared/TriMesh/TriMeshUtils.cpp\
    568                         ./modules/TriMeshx/TriMeshx.cpp\
    569                         ./modules/TriMeshProcessRiftsx/TriMeshProcessRiftsx.cpp\
     563                        ./shared/Triangle/AssociateSegmentToElement.cpp\
     564                        ./shared/Triangle/GridInsideHole.cpp\
     565                        ./shared/Triangle/OrderSegments.cpp\
     566                        ./shared/Triangle/SplitMeshForRifts.cpp\
     567                        ./shared/Triangle/TriangleUtils.cpp\
     568                        ./modules/Trianglex/Trianglex.cpp\
     569                        ./modules/ProcessRiftsx/ProcessRiftsx.cpp\
    570570                        ./modules/PointCloudFindNeighborsx/PointCloudFindNeighborsx.cpp\
    571571                        ./modules/PointCloudFindNeighborsx/PointCloudFindNeighborsxt.cpp\

  • issm/trunk-jpl/src/c/main/issm.js

    r19787 r22498  
    1111        binHeap.set(new Uint8Array(dbinary.buffer)); var binary=binHeap.byteOffset;
    1212
    13         //Declare TriMesh module:
     13        //Declare module:
    1414        issm= Module.cwrap('main','number',['number','number']);
    1515       

  • issm/trunk-jpl/src/c/modules/CoordinateSystemTransformx/CoordinateSystemTransformx.cpp

    r18801 r22498  
    1 /*!\file TriMeshx
    2  * \brief: x code for TriMesh mesher
     1/*!\file CoordinateSystemTransformx
     2 * \brief: x code for CoordinateSystemTransformx
    33 */
    44

  • issm/trunk-jpl/src/c/modules/ProcessRiftsx/ProcessRiftsx.cpp

    r22496 r22498  
    1 /*!\file:  TriMeshProcessRifts.cpp
     1/*!\file:  ProcessRifts.cpp
    22 * \brief split a mesh where a rift (or fault) is present
    33 */
    44
    5 #include "./TriMeshProcessRiftsx.h"
     5#include "./ProcessRiftsx.h"
    66#include "../../classes/RiftStruct.h"
    77#include "../../shared/shared.h"
    88#include "../../toolkits/toolkits.h"
    99
    10 void TriMeshProcessRiftsx(int** pindex, int* pnel,double** px,double** py,int* pnods,int** psegments,int** psegmentmarkers,int *pnum_seg,RiftStruct **priftstruct){
     10void ProcessRiftsx(int** pindex, int* pnel,double** px,double** py,int* pnods,int** psegments,int** psegmentmarkers,int *pnum_seg,RiftStruct **priftstruct){
    1111
    1212        /*Output*/

  • issm/trunk-jpl/src/c/modules/ProcessRiftsx/ProcessRiftsx.h

    r22496 r22498  
    1 /*!\file:  TriMeshProcessRiftsx.h
    2  * \brief header file for TriMeshProcessRifts module
     1/*!\file:  ProcessRiftsx.h
     2 * \brief header file for ProcessRifts module
    33 */
    44
    5 #ifndef _TRIMESHPROCESSRIFTX_H
    6 #define _TRIMESHPROCESSRIFTX_H
     5#ifndef _PROCESSRIFTX_H
     6#define _PROCESSRIFTX_H
    77
    88class RiftStruct;
    99
    10 void TriMeshProcessRiftsx(int** pindex,int* pnel,double** px,double** py,int* pnods,int** psegments,int** psegmentmarkers,int *pnum_seg,RiftStruct **priftstruct);
     10void ProcessRiftsx(int** pindex,int* pnel,double** px,double** py,int* pnods,int** psegments,int** psegmentmarkers,int *pnum_seg,RiftStruct **priftstruct);
    1111
    12 #endif  /* _TRIMESHPROCESSRIFTX_H*/
     12#endif  /* _PROCESSRIFTX_H*/

  • issm/trunk-jpl/src/c/modules/Trianglex/Trianglex.cpp

    r22496 r22498  
    1 /*!\file TriMeshx
    2  * \brief: x code for TriMesh mesher
     1/*!\file Trianglex
     2 * \brief: x code for Triangle mesher
    33 */
    44
    55/*Header files: {{{*/
    6 #include "./TriMeshx.h"
     6#include "./Trianglex.h"
    77#include "../../shared/shared.h"
    88#include "../../toolkits/toolkits.h"
    … …  
    1717/*}}}*/
    1818
    19 void TriMeshx(int** pindex,IssmPDouble** px,IssmPDouble** py,int** psegments,int** psegmentmarkerlist,int* pnels,int* pnods, int* pnsegs,Contours* domain,Contours* rifts,double area){
     19void Trianglex(int** pindex,IssmPDouble** px,IssmPDouble** py,int** psegments,int** psegmentmarkerlist,int* pnels,int* pnods, int* pnsegs,Contours* domain,Contours* rifts,double area){
    2020
    2121#if !defined(_HAVE_TRIANGLE_)

  • issm/trunk-jpl/src/c/modules/Trianglex/Trianglex.h

    r22496 r22498  
    1 /*!\file:  TriMeshx.h
    2  * \brief header file for TriMeshx module
     1/*!\file:  Trianglex.h
     2 * \brief header file for Trianglex module
    33 */
    44
    5 #ifndef _TRIMESHX_H_
    6 #define _TRIMESHX_H_
     5#ifndef _TRIANGLEX_H_
     6#define _TRIANGLEX_H_
    77
    88#include <string.h>
    … …  
    1010
    1111/* local prototypes: */
    12 void TriMeshx(int** pindex,IssmPDouble** px,IssmPDouble** py,int** psegments,int** psegmentmarkerlist,int* pnels,int* pnods, int* pnseg,Contours* domain,Contours* rifts,double area);
    13 #endif  /* _TRIMESHX_H */
     12void Trianglex(int** pindex,IssmPDouble** px,IssmPDouble** py,int** psegments,int** psegmentmarkerlist,int* pnels,int* pnods, int* pnseg,Contours* domain,Contours* rifts,double area);
     13#endif  /* _TRIANGLEX_H */

  • issm/trunk-jpl/src/c/modules/modules.h

    r22418 r22498  
    9191#include "./SpcNodesx/SpcNodesx.h"
    9292#include "./SurfaceAreax/SurfaceAreax.h"
    93 #include "./TriMeshx/TriMeshx.h"
    94 #include "./TriMeshProcessRiftsx/TriMeshProcessRiftsx.h"
     93#include "./Trianglex/Trianglex.h"
     94#include "./ProcessRiftsx/ProcessRiftsx.h"
    9595#include "./ThicknessAbsMisfitx/ThicknessAbsMisfitx.h"
    9696#include "./ThicknessAlongGradientx/ThicknessAlongGradientx.h"

  • issm/trunk-jpl/src/c/shared/Triangle/TriangleUtils.cpp

    r22496 r22498  
    11/*
    2  * TriMeshUtils: mesh manipulation routines:
     2 * TriangleUtils: mesh manipulation routines:
    33 */
    44
    55#include <stdio.h>
    66
    7 #include "./trimesh.h"
     7#include "./triangle.h"
    88#include "../Exceptions/exceptions.h"
    99#include "../MemOps/MemOps.h"

  • issm/trunk-jpl/src/c/shared/Triangle/triangle.h

    r22496 r22498  
    1 /*!\file:  trimesh.h
     1/*!\file:  triangle.h
    22 * \brief
    33 */
    44
    5 #ifndef _SHARED_TRIMESH_H
    6 #define _SHARED_TRIMESH_H
     5#ifndef _SHARED_TRIANGLE_H
     6#define _SHARED_TRIANGLE_H
    77
    88#include <stdio.h>
    … …  
    3131int PairRiftElements(int** priftsnumpairs,int*** priftspairs,int numrifts,int* riftsnumsegments,int** riftssegments,double* x,double* y);
    3232
    33 #endif  /* _SHARED_TRIMESH_H */
     33#endif  /* _SHARED_TRIANGLE_H */

  • issm/trunk-jpl/src/c/shared/shared.h

    r17111 r22498  
    1919#include "./String/sharedstring.h"
    2020#include "./Threads/issm_threads.h"
    21 #include "./TriMesh/trimesh.h"
     21#include "./Triangle/triangle.h"
    2222#include "./LatLong/latlong.h"
    2323

  • issm/trunk-jpl/src/m/mesh/argusmesh.m

    r17558 r22498  
    99%
    1010%   Example:
    11 %     md=argusmesh(md,'TriMesh.exp')
     11%     md=argusmesh(md,'Domain.exp')
    1212
    1313%some argument check:

  • issm/trunk-jpl/src/m/mesh/rifts/meshprocessrifts.m

    r19180 r22498  
    2525
    2626%Call MEX file
    27 [md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.segments,md.mesh.segmentmarkers,md.rifts.riftstruct]=TriMeshProcessRifts(md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.segments,md.mesh.segmentmarkers);
     27[md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.segments,md.mesh.segmentmarkers,md.rifts.riftstruct]=ProcessRifts(md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.segments,md.mesh.segmentmarkers);
    2828if ~isstruct(md.rifts.riftstruct),
    29         error('TriMeshProcessRifts did not find any rift');
     29        error('ProcessRifts did not find any rift');
    3030end
    3131

  • issm/trunk-jpl/src/m/mesh/rifts/meshprocessrifts.py

    r21303 r22498  
    11import numpy as np
    2 from TriMeshProcessRifts import TriMeshProcessRifts
     2from ProcessRifts import ProcessRifts
    33from ContourToMesh import ContourToMesh
    44from meshprocessoutsiderifts import meshprocessoutsiderifts
    … …  
    2222
    2323        #Call MEX file
    24         md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.segments,md.mesh.segmentmarkers,md.rifts.riftstruct=TriMeshProcessRifts(md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.segments,md.mesh.segmentmarkers)
     24        md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.segments,md.mesh.segmentmarkers,md.rifts.riftstruct=ProcessRifts(md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.segments,md.mesh.segmentmarkers)
    2525        md.mesh.elements=md.mesh.elements.astype(int)
    2626        md.mesh.x=md.mesh.x.reshape(-1)
    … …  
    2929        md.mesh.segmentmarkers=md.mesh.segmentmarkers.astype(int)
    3030        if not isinstance(md.rifts.riftstruct,list) or not md.rifts.riftstruct:
    31                 raise RuntimeError("TriMeshProcessRifts did not find any rift")
     31                raise RuntimeError("ProcessRifts did not find any rift")
    3232
    3333        #Fill in rest of fields:

  • issm/trunk-jpl/src/m/mesh/triangle.js

    r19721 r22498  
    22//TRIANGLE - create model mesh using the triangle package
    33//
    4 //   This routine creates a model mesh using TriMesh and a domain outline, to within a certain resolution
     4//   This routine creates a model mesh using Triangle and a domain outline, to within a certain resolution
    55//   where md is a @model object, domainname is the name of an Argus domain outline file,
    66//   and resolution is a characteristic length for the mesh (same unit as the domain outline
    … …  
    3636
    3737        //Call mesher:
    38         var return_array=TriMesh(md, domain, rifts, area);
     38        var return_array=Triangle(md, domain, rifts, area);
    3939
    4040        //Plug into md:

  • issm/trunk-jpl/src/m/mesh/triangle.m

    r21171 r22498  
    22%TRIANGLE - create model mesh using the triangle package
    33%
    4 %   This routine creates a model mesh using TriMesh and a domain outline, to within a certain resolution
     4%   This routine creates a model mesh using Triangle and a domain outline, to within a certain resolution
    55%   where md is a @model object, domainname is the name of an Argus domain outline file,
    66%   and resolution is a characteristic length for the mesh (same unit as the domain outline
    … …  
    4242end
    4343
    44 %Mesh using TriMesh
    45 [elements,x,y,segments,segmentmarkers]=TriMesh(domainname,riftname,area);
     44%Mesh using Triangle
     45[elements,x,y,segments,segmentmarkers]=Triangle(domainname,riftname,area);
    4646
    4747%check that all the created nodes belong to at least one element

  • issm/trunk-jpl/src/m/mesh/triangle.py

    r21303 r22498  
    22import numpy as np
    33from mesh2d import mesh2d
    4 from TriMesh import TriMesh
     4from Triangle import Triangle
    55from NodeConnectivity import NodeConnectivity
    66from ElementConnectivity import ElementConnectivity
    … …  
    1111        TRIANGLE - create model mesh using the triangle package
    1212
    13            This routine creates a model mesh using TriMesh and a domain outline, to within a certain resolution
     13           This routine creates a model mesh using Triangle and a domain outline, to within a certain resolution
    1414           where md is a @model object, domainname is the name of an Argus domain outline file,
    1515           and resolution is a characteristic length for the mesh (same unit as the domain outline
    … …  
    4848                raise IOError("file '%s' not found" % domainname)
    4949
    50         #Mesh using TriMesh
     50        #Mesh using Triangle
    5151        md.mesh=mesh2d()
    52         md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.segments,md.mesh.segmentmarkers=TriMesh(domainname,riftname,area)
     52        md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.segments,md.mesh.segmentmarkers=Triangle(domainname,riftname,area)
    5353        md.mesh.elements=md.mesh.elements.astype(int)
    5454        md.mesh.segments=md.mesh.segments.astype(int)

  • issm/trunk-jpl/src/m/mesh/triangle2dvertical.m

    r17558 r22498  
    22%TRIANGLE - create model mesh using the triangle package
    33%
    4 %   This routine creates a model mesh using TriMesh and a domain outline, to within a certain resolution
     4%   This routine creates a model mesh using Triangle and a domain outline, to within a certain resolution
    55%   where md is a @model object, domainname is the name of an Argus domain outline file,
    66%   and resolution is a characteristic length for the mesh (same unit as the domain outline
    … …  
    2424area=resolution^2;
    2525
    26 %Mesh using TriMesh
    27 [elements,x,z,segments,segmentmarkers]=TriMesh(domainname,'',area);
     26%Mesh using Triangle
     27[elements,x,z,segments,segmentmarkers]=Triangle(domainname,'',area);
    2828
    2929%check that all the created nodes belong to at least one element

  • issm/trunk-jpl/src/m/modules/ProcessRifts.m

    r22497 r22498  
    1 function [index2,x2,y2,segments2,segmentmarkers2,rifts2] = TriMeshProcessRifts(index1,x1,y1,segments1,segmentmarkers1);
     1function [index2,x2,y2,segments2,segmentmarkers2,rifts2] = ProcessRifts(index1,x1,y1,segments1,segmentmarkers1);
    22%TRIMESHPROCESSRIFTS - Split a mesh where a rift (or fault) is present
    33%
    44%   Usage:
    5 %      [index2,x2,y2,segments2,segmentmarkers2,rifts2]=TriMeshProcessRifts(index1,x1,y1,segments1,segmentmarkers1);
     5%      [index2,x2,y2,segments2,segmentmarkers2,rifts2]=ProcessRifts(index1,x1,y1,segments1,segmentmarkers1);
    66%   
    77%   (index1,x1,y1,segments1,segmentmarkers1):   An initial triangulation.
    … …  
    1010% Check usage
    1111if nargin~=5 && nargout~=6
    12         help TriMeshProcessRifts
     12        help ProcessRifts
    1313        error('Wrong usage (see above)');
    1414end
    1515
    1616% Call mex module
    17 [index2,x2,y2,segments2,segmentmarkers2,rifts2] = TriMeshProcessRifts_matlab(index1,x1,y1,segments1,segmentmarkers1);
     17[index2,x2,y2,segments2,segmentmarkers2,rifts2] = ProcessRifts_matlab(index1,x1,y1,segments1,segmentmarkers1);

  • issm/trunk-jpl/src/m/modules/ProcessRifts.py

    r22497 r22498  
    1 from TriMeshProcessRifts_python import TriMeshProcessRifts_python
     1from ProcessRifts_python import ProcessRifts_python
    22
    3 def TriMeshProcessRifts(index1,x1,y1,segments1,segmentmarkers1):
     3def ProcessRifts(index1,x1,y1,segments1,segmentmarkers1):
    44        """
    55        TRIMESHPROCESSRIFTS - Split a mesh where a rift (or fault) is present
    66
    77           Usage:
    8                    [index2,x2,y2,segments2,segmentmarkers2,rifts2]=TriMeshProcessRifts(index1,x1,y1,segments1,segmentmarkers1);
     8                   [index2,x2,y2,segments2,segmentmarkers2,rifts2]=ProcessRifts(index1,x1,y1,segments1,segmentmarkers1);
    99
    1010           (index1,x1,y1,segments1,segmentmarkers1):    An initial triangulation.
    … …  
    1212        """
    1313        # Call mex module
    14         index2,x2,y2,segments2,segmentmarkers2,rifts2 = TriMeshProcessRifts_python(index1,x1,y1,segments1,segmentmarkers1)
     14        index2,x2,y2,segments2,segmentmarkers2,rifts2 = ProcessRifts_python(index1,x1,y1,segments1,segmentmarkers1)
    1515        # Return
    1616        return index2,x2,y2,segments2,segmentmarkers2,rifts2

  • issm/trunk-jpl/src/m/modules/Triangle.m

    r22497 r22498  
    1 function [index,x,y,segments,segmentmarkers] = TriMesh(domainoutlinefilename,rifts,mesh_area);
     1function [index,x,y,segments,segmentmarkers] = Triangle(domainoutlinefilename,rifts,mesh_area);
    22%TRIMESH - Mesh a domain using an .exp file
    33%
    44%   Usage:
    5 %     [index,x,y,segments,segmentmarkers]=TriMesh(domainoutlinefilename,rifts,mesh_area);
     5%     [index,x,y,segments,segmentmarkers]=Triangle(domainoutlinefilename,rifts,mesh_area);
    66%             
    77%   index,x,y:  Defines a triangulation
    … …  
    1414% Check usage
    1515if nargin~=3 && nargout~=5
    16         help TriMesh
     16        help Triangle
    1717        error('Wrong usage (see above)');
    1818end
    1919
    2020% Call mex module
    21 [index,x,y,segments,segmentmarkers]=TriMesh_matlab(domainoutlinefilename,rifts,mesh_area);
     21[index,x,y,segments,segmentmarkers]=Triangle_matlab(domainoutlinefilename,rifts,mesh_area);

  • issm/trunk-jpl/src/m/modules/Triangle.py

    r22497 r22498  
    1 from TriMesh_python import TriMesh_python
     1from Triangle_python import Triangle_python
    22
    3 def TriMesh(domainoutlinefilename,rifts,mesh_area):
     3def Triangle(domainoutlinefilename,rifts,mesh_area):
    44        """
    55        TRIMESH - Mesh a domain using an .exp file
    66
    77           Usage:
    8                         [index,x,y,segments,segmentmarkers]=TriMesh(domainoutlinefilename,rifts,mesh_area);
     8                        [index,x,y,segments,segmentmarkers]=Triangle(domainoutlinefilename,rifts,mesh_area);
    99
    1010           index,x,y: defines a triangulation
    … …  
    1616        """
    1717        # Call mex module
    18         index,x,y,segments,segmentmarkers=TriMesh_python(domainoutlinefilename,rifts,mesh_area)
     18        index,x,y,segments,segmentmarkers=Triangle_python(domainoutlinefilename,rifts,mesh_area)
    1919        # Return
    2020        return index,x,y,segments,segmentmarkers

  • issm/trunk-jpl/src/wrappers/ProcessRifts/ProcessRifts.cpp

    r22496 r22498  
    1 /*!\file:  TriMeshProcessRifts.cpp
     1/*!\file:  ProcessRifts.cpp
    22 * \brief split a mesh where a rift (or fault) is present
    33 */
    44
    5 #include "./TriMeshProcessRifts.h"
     5#include "./ProcessRifts.h"
    66
    7 void TriMeshProcessRiftsUsage(void){/*{{{*/
     7void ProcessRiftsUsage(void){/*{{{*/
    88        _printf_("\n");
    9         _printf_("   usage: [index2,x2,y2,segments2,segmentmarkers2,rifts2]=TriMeshProcessrifts(index1,x1,y1,segments1,segmentmarkers1) \n");
     9        _printf_("   usage: [index2,x2,y2,segments2,segmentmarkers2,rifts2]=ProcessRifts(index1,x1,y1,segments1,segmentmarkers1) \n");
    1010        _printf_("      where: (index1,x1,y1,segments1,segmentmarkers1) is an initial triangulation.\n");
    1111        _printf_("      index2,x2,y2,segments2,segmentmarkers2,rifts2 is the resulting triangulation where rifts have been processed.\n");
    1212}/*}}}*/
    13 WRAPPER(TriMeshProcessRifts_python){
     13WRAPPER(ProcessRifts_python){
    1414
    1515        /* returned quantities: */
    … …  
    2929
    3030        /*checks on arguments on the matlab side: */
    31         CHECKARGUMENTS(NLHS,NRHS,&TriMeshProcessRiftsUsage);
     31        CHECKARGUMENTS(NLHS,NRHS,&ProcessRiftsUsage);
    3232
    3333        /*Fetch data */
    … …  
    3939
    4040        /*call x layer*/
    41         TriMeshProcessRiftsx(&index,&nel,&x,&y,&nods,&segments,&segmentmarkers,&num_seg,&riftstruct);
     41        ProcessRiftsx(&index,&nel,&x,&y,&nods,&segments,&segmentmarkers,&num_seg,&riftstruct);
    4242
    4343        /*Output : */

  • issm/trunk-jpl/src/wrappers/ProcessRifts/ProcessRifts.h

    r22496 r22498  
    11/*
    2  * TriMeshProcessRifts.h
     2 * ProcessRifts.h
    33 */
    44
    5 #ifndef _TRIMESH_PROCESSRIFTS_H_
    6 #define _TRIMESH_PROCESSRIFTS_H_
     5#ifndef _PROCESSRIFTS_H_
     6#define _PROCESSRIFTS_H_
    77
    88#ifdef HAVE_CONFIG_H
    … …  
    2323
    2424#undef __FUNCT__
    25 #define __FUNCT__  "TriMeshProcessRifts"
     25#define __FUNCT__  "ProcessRifts"
    2626
    2727#ifdef _HAVE_MATLAB_MODULES_

  • issm/trunk-jpl/src/wrappers/Triangle/Triangle.cpp

    r22496 r22498  
    11/*
    2  * TriMesh: mesh a domain using an .exp file
     2 * Triangle: mesh a domain using an .exp file
    33 */
    44
    5 #include "./TriMesh.h"
     5#include "./Triangle.h"
    66
    7 void TriMeshUsage(void){/*{{{*/
     7void TriangleUsage(void){/*{{{*/
    88        _printf_("\n");
    9         _printf_("   usage: [index,x,y,segments,segmentmarkers]=TriMesh(domainoutlinefilename,rifts,area) \n");
     9        _printf_("   usage: [index,x,y,segments,segmentmarkers]=Triangle(domainoutlinefilename,rifts,area) \n");
    1010        _printf_("      where: index,x,y defines a triangulation, segments is an array made \n");
    1111        _printf_("      of exterior segments to the mesh domain outline, segmentmarkers is an array flagging each segment, \n");
    … …  
    1414        _printf_("\n");
    1515}/*}}}*/
    16 WRAPPER(TriMesh_python){
     16WRAPPER(Triangle_python){
    1717       
    1818        /*intermediary: */
    … …  
    3333
    3434        /*checks on arguments: */
    35         CHECKARGUMENTS(NLHS,NRHS,&TriMeshUsage);
     35        CHECKARGUMENTS(NLHS,NRHS,&TriangleUsage);
    3636
    3737        /*Fetch data needed for meshing: */
    … …  
    4141
    4242        /*call x core: */
    43         TriMeshx(&index,&x,&y,&segments,&segmentmarkerlist,&nel,&nods,&nsegs,domain,rifts,area);
     43        Trianglex(&index,&x,&y,&segments,&segmentmarkerlist,&nel,&nods,&nsegs,domain,rifts,area);
    4444
    4545        /*write outputs: */

  • issm/trunk-jpl/src/wrappers/Triangle/Triangle.h

    r22496 r22498  
    11/*
    2         TriMesh.h
     2        Triangle.h
    33*/
    44
    5 #ifndef _TRIMESH_H
    6 #define _TRIMESH_H
     5#ifndef _TRIANGLE_H
     6#define _TRIANGLE_H
    77
    88#ifdef HAVE_CONFIG_H
    … …  
    3131
    3232#undef __FUNCT__
    33 #define __FUNCT__  "TriMesh"
     33#define __FUNCT__  "Triangle"
    3434
    3535#ifdef _HAVE_MATLAB_MODULES_
    … …  
    7070#define SEGMENTS          psegments,pnsegs
    7171#define SEGMENTMARKERLIST psegmentmarkers,pnsegs
    72 #define WRAPPER(modulename) extern "C" { int  TriMeshModule(double** pindex, double** px, double** py, int* pnel, int* pnods, double** psegments, double** psegmentmarkers, int* pnsegs, double* domainx, double* domainy, int domainnods, double areain)
    73 #define _DO_NOT_LOAD_GLOBALS_//we only load globals for TriMeshModule.js, not other modules!
     72#define WRAPPER(modulename) extern "C" { int  TriangleModule(double** pindex, double** px, double** py, int* pnel, int* pnods, double** psegments, double** psegmentmarkers, int* pnsegs, double* domainx, double* domainy, int domainnods, double areain)
     73#define _DO_NOT_LOAD_GLOBALS_//we only load globals for TriangleModule.js, not other modules!
    7474#endif
    7575
    … …  
    8181#define NRHS  3
    8282
    83 #endif  /* _TRIMESH_H */
     83#endif  /* _TRIANGLE_H */

  • issm/trunk-jpl/src/wrappers/Triangle/Triangle.js

    r22496 r22498  
    1 function TriMesh(md,domain,rifts, area){
    2 /*TriMesh
    3            usage: var array = TriMesh(domain,rifts,area);
     1function Triangle(md,domain,rifts, area){
     2/*Triangle
     3           usage: var array = Triangle(domain,rifts,area);
    44              where: array is made of [index,x,y,segments,segmentmarkers]
    55                  and index,x,y defines a triangulation, segments is an array made
    … …  
    3636        //}}}
    3737
    38         //Declare TriMesh module:
    39         TriMeshModule = Module.cwrap('TriMeshModule','number',['number','number','number','number','number','number','number','number','number','number','number','number']);
     38        //Declare Triangle module:
     39        TriangleModule = Module.cwrap('TriangleModule','number',['number','number','number','number','number','number','number','number','number','number','number','number']);
    4040       
    41         //Call TriMesh module:
    42         TriMeshModule(pindex,px,py,pnel,pnods,psegments,psegmentmarkers,pnsegs, domainx,domainy,dx.length,area);
     41        //Call Triangle module:
     42        TriangleModule(pindex,px,py,pnel,pnods,psegments,psegmentmarkers,pnsegs, domainx,domainy,dx.length,area);
    4343       
    4444        /*Dynamic copying from heap: {{{*/

  • issm/trunk-jpl/src/wrappers/javascript/Makefile.am

    r21086 r22498  
    77AM_CPPFLAGS+=  -DISSM_PREFIX='"$(prefix)"'
    88
    9 js_scripts = ${ISSM_DIR}/src/wrappers/TriMesh/TriMesh.js  \
     9js_scripts = ${ISSM_DIR}/src/wrappers/Triangle/Triangle.js  \
    1010                         ${ISSM_DIR}/src/wrappers/NodeConnectivity/NodeConnectivity.js\
    1111                         ${ISSM_DIR}/src/wrappers/ContourToMesh/ContourToMesh.js\
    … …  
    8181endif
    8282
    83 IssmModule_SOURCES = ../TriMesh/TriMesh.cpp \
     83IssmModule_SOURCES = ../Triangle/Triangle.cpp \
    8484                                         ../NodeConnectivity/NodeConnectivity.cpp\
    8585                                         ../ContourToMesh/ContourToMesh.cpp\
    … …  
    8989                                         ../Issm/issm.cpp
    9090
    91 IssmModule_CXXFLAGS= -fPIC -D_DO_NOT_LOAD_GLOBALS_  --memory-init-file 0 $(AM_CXXFLAGS) $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) -s EXPORTED_FUNCTIONS="['_TriMeshModule','_NodeConnectivityModule','_ContourToMeshModule','_ElementConnectivityModule','_InterpFromMeshToMesh2dModule','_IssmConfigModule','_IssmModule']"  -s DISABLE_EXCEPTION_CATCHING=0 -s ALLOW_MEMORY_GROWTH=1 -s INVOKE_RUN=0
     91IssmModule_CXXFLAGS= -fPIC -D_DO_NOT_LOAD_GLOBALS_  --memory-init-file 0 $(AM_CXXFLAGS) $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) -s EXPORTED_FUNCTIONS="['_TriangleModule','_NodeConnectivityModule','_ContourToMeshModule','_ElementConnectivityModule','_InterpFromMeshToMesh2dModule','_IssmConfigModule','_IssmModule']"  -s DISABLE_EXCEPTION_CATCHING=0 -s ALLOW_MEMORY_GROWTH=1 -s INVOKE_RUN=0
    9292IssmModule_LDADD = ${deps} $(TRIANGLELIB)  $(GSLLIB)
    9393#}}}

  • issm/trunk-jpl/src/wrappers/matlab/Makefile.am

    r21728 r22498  
    5858                                                 PointCloudFindNeighbors_matlab.la\
    5959                                                 PropagateFlagsFromConnectivity_matlab.la\
    60                                                  TriMesh_matlab.la\
    61                                                  TriMeshProcessRifts_matlab.la\
     60                                                 Triangle_matlab.la\
     61                                                 ProcessRifts_matlab.la\
    6262                                                 Scotch_matlab.la
    6363
    … …  
    233233ShpRead_matlab_la_LIBADD = ${deps} $(SHAPELIBLIB) $(PETSCLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
    234234
    235 TriMesh_matlab_la_SOURCES = ../TriMesh/TriMesh.cpp
    236 TriMesh_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    237 TriMesh_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(TRIANGLELIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
    238 
    239 TriMeshProcessRifts_matlab_la_SOURCES = ../TriMeshProcessRifts/TriMeshProcessRifts.cpp
    240 TriMeshProcessRifts_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    241 TriMeshProcessRifts_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
    242 #}}}
     235Triangle_matlab_la_SOURCES = ../Triangle/Triangle.cpp
     236Triangle_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
     237Triangle_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(TRIANGLELIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
     238
     239ProcessRifts_matlab_la_SOURCES = ../ProcessRifts/ProcessRifts.cpp
     240ProcessRifts_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
     241ProcessRifts_matlab_la_LIBADD = ${deps} $(PETSCLIB) $(MPILIB) $(NEOPZLIB) $(GSLLIB) $(PROJ4LIB)
     242#}}}

  • issm/trunk-jpl/src/wrappers/python/Makefile.am

    r21086 r22498  
    4141                                                MeshProfileIntersection_python.la\
    4242                                                NodeConnectivity_python.la\
    43                                                 TriMesh_python.la\
    44                                                 TriMeshProcessRifts_python.la
     43                                                Triangle_python.la\
     44                                                ProcessRifts_python.la
    4545endif
    4646#}}}
    … …  
    141141NodeConnectivity_python_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
    142142
    143 TriMesh_python_la_SOURCES = ../TriMesh/TriMesh.cpp
    144 TriMesh_python_la_CXXFLAGS = ${AM_CXXFLAGS}
    145 TriMesh_python_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(TRIANGLELIB) $(GSLLIB) $(PROJ4LIB)
     143Triangle_python_la_SOURCES = ../Triangle/Triangle.cpp
     144Triangle_python_la_CXXFLAGS = ${AM_CXXFLAGS}
     145Triangle_python_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(TRIANGLELIB) $(GSLLIB) $(PROJ4LIB)
    146146
    147 TriMeshProcessRifts_python_la_SOURCES = ../TriMeshProcessRifts/TriMeshProcessRifts.cpp
    148 TriMeshProcessRifts_python_la_CXXFLAGS = ${AM_CXXFLAGS}
    149 TriMeshProcessRifts_python_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
     147ProcessRifts_python_la_SOURCES = ../ProcessRifts/ProcessRifts.cpp
     148ProcessRifts_python_la_CXXFLAGS = ${AM_CXXFLAGS}
     149ProcessRifts_python_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
    150150#}}}
Note: See TracChangeset for help on using the changeset viewer.