Changeset 11401
- Timestamp:
- 02/13/12 07:47:29 (13 years ago)
- Location:
- issm/trunk-jpl/src/c
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/modules/BamgTriangulatex/BamgTriangulatex.cpp
r10205 r11401 17 17 Th.WriteIndex(pindex,pnels); 18 18 //delete &Th; 19 return 0; 19 20 20 21 } -
issm/trunk-jpl/src/c/modules/Chacox/Chacox.cpp
r4648 r11401 191 191 192 192 193 #endif //ifdef _HAVE_CHACO_ 193 #else //ifdef _HAVE_CHACO_ 194 return (0); 195 #endif 194 196 } -
issm/trunk-jpl/src/c/modules/Chacox/input_parse.cpp
r4648 r11401 262 262 return(0); 263 263 264 #endif //#ifdef _HAVE_CHACO_ 264 #else //#ifdef _HAVE_CHACO_ 265 return(0); 266 #endif 265 267 } -
issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshxt.cpp
r9320 r11401 69 69 } 70 70 71 return NULL; 72 71 73 } -
issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.cpp
r8303 r11401 36 36 /*Assign output pointers: */ 37 37 *pflags=flags; 38 38 39 return 1; 39 40 } -
issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp
r7145 r11401 126 126 } 127 127 if (debug && my_thread==0) printf("\b\b\b\b\b\b\b%5.2lf %%\n",100.0); 128 129 return NULL; 128 130 129 131 } -
issm/trunk-jpl/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsx.cpp
r7640 r11401 36 36 /*Assign output pointers: */ 37 37 *pflags=flags; 38 39 return 1; 38 40 } -
issm/trunk-jpl/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsxt.cpp
r7649 r11401 74 74 /*Free ressources:*/ 75 75 xfree((void**)&already); 76 77 return NULL; 76 78 } -
issm/trunk-jpl/src/c/modules/Scotchx/Scotchx.cpp
r4656 r11401 339 339 return (0); 340 340 341 #endif //#ifdef _HAVE_SCOTCH_ 341 #else //#ifdef _HAVE_SCOTCH_ 342 return(0); 343 #endif 342 344 } -
issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp
r10380 r11401 24 24 sgn,cm,sp)); 25 25 26 #endif //ifdef _HAVE_SHAPELIB_ 26 #else //ifdef _HAVE_SHAPELIB_ 27 return 0; 28 #endif 27 29 } 28 30 … … 607 609 return(iret); 608 610 609 #endif //ifdef _HAVE_SHAPELIB_ 611 #else //ifdef _HAVE_SHAPELIB_ 612 return 0; 613 #endif 610 614 } 611 615 -
issm/trunk-jpl/src/c/shared/Numerics/Verbosity.cpp
r9320 r11401 64 64 65 65 verbositylevel = (int)level; 66 return verbositylevel; 66 67 67 68 #else -
issm/trunk-jpl/src/c/shared/TriMesh/TriMeshUtils.cpp
r9320 r11401 124 124 ******************************************************************************************************************************/ 125 125 126 intRiftSegmentsFromSegments(int* pnriftsegs, int** priftsegments, int nel, double* index, int nsegs,double* segments){126 void RiftSegmentsFromSegments(int* pnriftsegs, int** priftsegments, int nel, double* index, int nsegs,double* segments){ 127 127 128 128 int i,counter; … … 379 379 IsInPoly 380 380 ******************************************************************************************************************************/ 381 intIsInPoly(double* in,double* xc,double* yc,int numnodes,double* x,double* y,int nods){382 383 int i;384 double x0,y0;385 386 /*Go through all nodes of the mesh:*/387 for (i=0;i<nods;i++){388 if (in[i]){389 /*this node already is inside one of the contours, continue*/390 continue;391 }392 /*pick up node: */393 x0=x[i];394 y0=y[i];395 if (pnpoly(numnodes,xc,yc,x0,y0)){396 in[i]=1;397 }398 }399 }381 //void IsInPoly(double* in,double* xc,double* yc,int numnodes,double* x,double* y,int nods){ 382 // 383 // int i; 384 // double x0,y0; 385 // 386 // /*Go through all nodes of the mesh:*/ 387 // for (i=0;i<nods;i++){ 388 // if (in[i]){ 389 // /*this node already is inside one of the contours, continue*/ 390 // continue; 391 // } 392 // /*pick up node: */ 393 // x0=x[i]; 394 // y0=y[i]; 395 // if (pnpoly(numnodes,xc,yc,x0,y0)){ 396 // in[i]=1; 397 // } 398 // } 399 //} 400 400 401 401 /****************************************************************************************************************************** -
issm/trunk-jpl/src/c/shared/TriMesh/trimesh.h
r9320 r11401 26 26 int IsNeighbor(int el1,int el2,double* index); 27 27 int IsOnRift(int el,int nriftsegs,int* riftsegments); 28 intRiftSegmentsFromSegments(int* pnriftsegs, int** priftsegments, int nel, double* index, int nsegs,double* segments);28 void RiftSegmentsFromSegments(int* pnriftsegs, int** priftsegments, int nel, double* index, int nsegs,double* segments); 29 29 int DetermineGridElementListOnOneSideOfRift(int* pNumGridElementListOnOneSideOfRift, int** pGridElementListOnOneSideOfRift, int segmentnumber, int nriftsegs, int* riftsegments, int node,double* index,int nel); 30 30 int UpdateSegments(double** psegments,double** psegmentmarkerlist, int* pnsegs, double* index, double* x,double* y,int* riftsegments,int nriftsegs);
Note:
See TracChangeset
for help on using the changeset viewer.