Changeset 3280


Ignore:
Timestamp:
03/16/10 09:22:14 (15 years ago)
Author:
Mathieu Morlighem
Message:

some reorganization in BAMG

Location:
issm/trunk/src/c
Files:
11 added
1 deleted
27 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/Bamgx/objects/CrackedEdge.h

    r3263 r3280  
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../meshtype.h"
     9#include "../include/typedefs.h"
     10#include "../include/macros.h"
    1011#include "Vertex.h"
    1112#include "TriangleAdjacent.h"

  • issm/trunk/src/c/Bamgx/objects/Curve.h

    r3263 r3280  
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../meshtype.h"
     9#include "../include/typedefs.h"
     10#include "../include/macros.h"
     11#include "../shared/shared.h"
    1012#include "GeometricalEdge.h"
    1113

  • issm/trunk/src/c/Bamgx/objects/Direction.h

    r3263 r3280  
    22#define _DIRECTION_H_
    33
    4 #include "../meshtype.h"
     4#include "../include/typedefs.h"
     5#include "../include/macros.h"
     6#include "../shared/shared.h"
    57
    68namespace bamg {

  • issm/trunk/src/c/Bamgx/objects/DoubleAndInt.h

    r3245 r3280  
    22#define _DOUBLEANDINT_H_
    33
    4 #include "../meshtype.h"
     4#include "../include/typedefs.h"
     5#include "../include/macros.h"
    56
    67namespace bamg {

  • issm/trunk/src/c/Bamgx/objects/Edge.h

    r3263 r3280  
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../meshtype.h"
     9#include "../include/typedefs.h"
     10#include "../include/macros.h"
    1011#include "Vertex.h"
    1112#include "TriangleAdjacent.h"

  • issm/trunk/src/c/Bamgx/objects/GeometricalEdge.h

    r3272 r3280  
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../meshtype.h"
     9#include "../include/typedefs.h"
     10#include "../include/macros.h"
    1011#include "Edge.h"
    1112#include "GeometricalVertex.h"

  • issm/trunk/src/c/Bamgx/objects/GeometricalSubDomain.h

    r3263 r3280  
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../meshtype.h"
     9#include "../include/typedefs.h"
     10#include "../include/macros.h"
    1011#include "GeometricalEdge.h"
    1112

  • issm/trunk/src/c/Bamgx/objects/GeometricalVertex.h

    r3263 r3280  
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../meshtype.h"
     9#include "../include/typedefs.h"
     10#include "../include/macros.h"
    1011#include "Vertex.h"
    1112

  • issm/trunk/src/c/Bamgx/objects/Geometry.h

    r3246 r3280  
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../meshtype.h"
     9#include "../include/typedefs.h"
     10#include "../include/macros.h"
    1011#include "Vertex.h"
    1112#include "Edge.h"

  • issm/trunk/src/c/Bamgx/objects/ListofIntersectionTriangles.h

    r3243 r3280  
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../meshtype.h"
     9#include "../include/typedefs.h"
     10#include "../include/macros.h"
    1011#include "Metric.h"
    1112#include "Vertex.h"

  • issm/trunk/src/c/Bamgx/objects/Metric.h

    r3243 r3280  
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../meshtype.h"
     9#include "../include/typedefs.h"
     10#include "../include/macros.h"
     11#include "../shared/shared.h"
    1012#include "R2.h"
    1113

  • issm/trunk/src/c/Bamgx/objects/QuadTree.h

    r3267 r3280  
    77#include "../../toolkits/toolkits.h"
    88
     9#include "../include/typedefs.h"
     10#include "../include/macros.h"
    911
    1012namespace bamg {

  • issm/trunk/src/c/Bamgx/objects/SubDomain.h

    r3263 r3280  
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../meshtype.h"
     9#include "../include/typedefs.h"
     10#include "../include/macros.h"
    1011#include "Edge.h"
    1112#include "Triangle.h"

  • issm/trunk/src/c/Bamgx/objects/Triangle.h

    r3272 r3280  
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../meshtype.h"
     9#include "../include/typedefs.h"
     10#include "../include/macros.h"
    1011#include "Vertex.h"
    1112#include "TriangleAdjacent.h"

  • issm/trunk/src/c/Bamgx/objects/TriangleAdjacent.h

    r3263 r3280  
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../meshtype.h"
     9#include "../include/typedefs.h"
     10#include "../include/macros.h"
    1011#include "Vertex.h"
    1112

  • issm/trunk/src/c/Bamgx/objects/Triangles.h

    r3277 r3280  
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../meshtype.h"
     9#include "../include/typedefs.h"
     10#include "../include/macros.h"
     11#include "../shared/shared.h"
    1012#include "Metric.h"
    1113#include "SetOfE4.h"

  • issm/trunk/src/c/Bamgx/objects/Vertex.h

    r3272 r3280  
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../meshtype.h"
     9#include "../include/typedefs.h"
     10#include "../include/macros.h"
    1011#include "Direction.h"
    1112#include "Metric.h"

  • issm/trunk/src/c/Bamgx/objects/VertexOnEdge.h

    r3263 r3280  
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../meshtype.h"
     9#include "../include/typedefs.h"
     10#include "../include/macros.h"
    1011#include "Vertex.h"
    1112#include "Edge.h"

  • issm/trunk/src/c/Bamgx/objects/VertexOnGeom.h

    r3277 r3280  
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../meshtype.h"
     9#include "../include/typedefs.h"
     10#include "../include/macros.h"
    1011#include "Vertex.h"
    1112#include "GeometricalVertex.h"

  • issm/trunk/src/c/Bamgx/objects/VertexOnVertex.h

    r3263 r3280  
    77#include "../../toolkits/toolkits.h"
    88
    9 #include "../meshtype.h"
     9#include "../include/typedefs.h"
     10#include "../include/macros.h"
    1011#include "Vertex.h"
    1112

  • issm/trunk/src/c/Bamgx/shared/BigPrimeNumber.cpp

    r3254 r3280  
    2626
    2727                        /*compute oo = min ( r , n-r , |n - 2r|, |n-3r|)*/
    28                         long oo = Min(Min(r,n-r),Min(Abs(n-2*r),Abs(n-3*r)));
     28                        long oo =Min(Min(r,n-r),Min(Abs(n-2*r),Abs(n-3*r)));
    2929                        if ( o < oo){
    3030                                o=oo;

  • issm/trunk/src/c/Bamgx/shared/BigPrimeNumber.h

    r3254 r3280  
    22#define _BIGPRIMENUMBER_H_
    33
    4 #include "../meshtype.h"
     4#include "./Abs.h"
     5#include "./extrema.h"
    56
    67namespace bamg {

  • issm/trunk/src/c/Bamgx/shared/shared.h

    r3263 r3280  
    77#define _SHAREDBamg_H_
    88
     9#include "Abs.h"
    910#include "BigPrimeNumber.h"
     11#include "BinaryRand.h"
     12#include "det.h"
     13#include "Exchange.h"
     14#include "extrema.h"
     15#include "HeapSort.h"
     16#include "OppositeAngle.h"
    1017
    1118#endif

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

    r3263 r3280  
    329329                                        ./OutputRiftsx/OutputRiftsx.h\
    330330                                        ./OutputRiftsx/OutputRiftsx.cpp\
    331                                         ./Bamgx/BamgObjects.h\
    332331                                        ./Bamgx/Bamgx.cpp\
    333332                                        ./Bamgx/Bamgx.h\
    334                                         ./Bamgx/meshtype.h\
     333                                        ./Bamgx/include/macros.h \
     334                                        ./Bamgx/include/typedefs.h \
    335335                                        ./Bamgx/objects/CrackedEdge.h\
    336336                                        ./Bamgx/objects/CrackedEdge.cpp\
    … …  
    380380                                        ./Bamgx/objects/VertexOnVertex.h\
    381381                                        ./Bamgx/objects/VertexOnVertex.cpp\
     382                                        ./Bamgx/shared/Abs.h \
     383                                        ./Bamgx/shared/BinaryRand.h \
     384                                        ./Bamgx/shared/det.h \
     385                                        ./Bamgx/shared/Exchange.h \
     386                                        ./Bamgx/shared/extrema.h \
     387                                        ./Bamgx/shared/HeapSort.h \
     388                                        ./Bamgx/shared/Norm.h \
     389                                        ./Bamgx/shared/OppositeAngle.h \
    382390                                        ./Bamgx/shared/shared.h
    383391
    … …  
    708716                                        ./parallel/steadystate_core.cpp\
    709717                                        ./parallel/OutputResults.cpp\
    710                                         ./Bamgx/BamgObjects.h\
    711718                                        ./Bamgx/Bamgx.cpp\
    712719                                        ./Bamgx/Bamgx.h\
    713                                         ./Bamgx/meshtype.h\
     720                                        ./Bamgx/include/macros.h \
     721                                        ./Bamgx/include/typedefs.h \
    714722                                        ./Bamgx/objects/CrackedEdge.h\
    715723                                        ./Bamgx/objects/CrackedEdge.cpp\
    … …  
    759767                                        ./Bamgx/objects/VertexOnVertex.h\
    760768                                        ./Bamgx/objects/VertexOnVertex.cpp\
     769                                        ./Bamgx/shared/Abs.h \
     770                                        ./Bamgx/shared/BinaryRand.h \
     771                                        ./Bamgx/shared/det.h \
     772                                        ./Bamgx/shared/Exchange.h \
     773                                        ./Bamgx/shared/extrema.h \
     774                                        ./Bamgx/shared/HeapSort.h \
     775                                        ./Bamgx/shared/Norm.h \
     776                                        ./Bamgx/shared/OppositeAngle.h \
    761777                                        ./Bamgx/shared/shared.h
    762778

  • issm/trunk/src/c/include/typedefs.h

    r3159 r3280  
    1212#define PI 3.141592653589793238462643383279502884197169399375105820974944592308
    1313
     14const double Pi =3.141592653589793238462643383279502884197169399375105820974944592308;
     15const float  fPi=3.141592653589793238462643383279502884197169399375105820974944592308;
     16
    1417#endif //ifndef _ISSMTYPEDEFS_H_

  • issm/trunk/src/c/shared/Alloc/alloc.cpp

    r2316 r3280  
    6868}
    6969
    70 void xfree( void* *pv)
    71 {
     70void xfree( void* *pv){
    7271
    7372        if (pv && *pv) {

  • issm/trunk/src/c/shared/Alloc/alloc.h

    r2316 r3280  
    33 */
    44
    5 
    65#ifndef _ALLOC_H_
    76#define _ALLOC_H_
    8 
    97
    108void* xmalloc(int size);
Note: See TracChangeset for help on using the changeset viewer.