Changeset 6413


Ignore:
Timestamp:
10/25/10 09:02:20 (14 years ago)
Author:
Mathieu Morlighem
Message:

NDOFX defined only once in typedefs.h

Location:
issm/trunk/src/c
Files:
12 edited

Legend:

Unmodified
Added
Removed

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

    r3281 r6413  
    1212#define PI 3.141592653589793238462643383279502884197169399375105820974944592308
    1313
     14#define NDOF1 1
     15#define NDOF2 2
     16#define NDOF3 3
     17#define NDOF4 4
     18
    1419#endif //ifndef _ISSMTYPEDEFS_H_

  • issm/trunk/src/c/objects/Elements/Penta.cpp

    r6412 r6413  
    2222#define NUMVERTICES   6
    2323#define NUMVERTICES2D 3
    24 #define NDOF1 1
    25 #define NDOF2 2
    26 #define NDOF3 3
    27 #define NDOF4 4
    2824
    2925/*Constructors/destructor/copy*/

  • issm/trunk/src/c/objects/Elements/PentaRef.cpp

    r6412 r6413  
    2424#define NUMNODESP1_2d 3
    2525#define NUMNODESMINI  7
    26 #define NDOF1 1
    27 #define NDOF2 2
    28 #define NDOF3 3
    29 #define NDOF4 4
    3026
    3127/*Object constructors and destructor*/

  • issm/trunk/src/c/objects/Elements/Tria.cpp

    r6412 r6413  
    2121/*Element macros*/
    2222#define NUMVERTICES 3
    23 #define NDOF1 1
    24 #define NDOF2 2
    25 #define NDOF3 3
    26 #define NDOF4 4
    2723
    2824/*Constructors/destructor/copy*/

  • issm/trunk/src/c/objects/Elements/TriaRef.cpp

    r6412 r6413  
    2222/*Element macros*/
    2323#define NUMNODES 3
    24 #define NDOF1 1
    25 #define NDOF2 2
    26 #define NDOF3 3
    27 #define NDOF4 4
    2824
    2925/*Object constructors and destructor*/

  • issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp

    r6412 r6413  
    332332        int i;
    333333        const int numgrids=6;
    334         const int NDOF2=2;
    335334        double B[5][NDOF2*numgrids];
    336335        double velocity[numgrids][NDOF2];
    … …  
    357356        int i;
    358357        const int numgrids=6;
    359         const int NDOF2=2;
    360358        double B[5][NDOF2*numgrids];
    361359        double velocity[numgrids][NDOF2];

  • issm/trunk/src/c/objects/Inputs/TriaVertexInput.cpp

    r6412 r6413  
    186186        int       i;
    187187        const int numgrids=3;
    188         const int NDOF2=2;
    189188        double B[3][NDOF2*numgrids];
    190189        double velocity[3][NDOF2];
    … …  
    210209        int       i;
    211210        const int numgrids=3;
    212         const int NDOF2=2;
    213211        double B[3][NDOF2*numgrids];
    214212        double velocity[3][NDOF2];

  • issm/trunk/src/c/objects/Loads/Icefront.cpp

    r6412 r6413  
    2222#define NUMVERTICESSEG 2
    2323#define NUMVERTICESQUA 4
    24 #define NDOF1 1
    25 #define NDOF2 2
    26 #define NDOF3 3
    27 #define NDOF4 4
    2824
    2925/*Icefront constructors and destructor*/

  • issm/trunk/src/c/objects/Loads/Numericalflux.cpp

    r6412 r6413  
    2222#define NUMVERTICES_INTERNAL 4
    2323#define NUMVERTICES_BOUNDARY 2
    24 #define NDOF1 1
    2524
    2625/*Numericalflux constructors and destructor*/

  • issm/trunk/src/c/objects/Loads/Pengrid.cpp

    r6412 r6413  
    2222/*Element macros*/
    2323#define NUMVERTICES   1
    24 #define NDOF1 1
    25 #define NDOF2 2
    26 #define NDOF3 3
    27 #define NDOF4 4
    2824
    2925/*Pengrid constructors and destructor*/

  • issm/trunk/src/c/objects/Loads/Penpair.cpp

    r6412 r6413  
    2121/*Element macros*/
    2222#define NUMVERTICES 2
    23 #define NDOF1 1
    24 #define NDOF2 2
    25 #define NDOF3 3
    26 #define NDOF4 4
    2723
    2824/*Penpair constructors and destructor*/

  • issm/trunk/src/c/objects/Loads/Riftfront.cpp

    r6412 r6413  
    2222/*Element macros*/
    2323#define NUMVERTICES 2
    24 #define NDOF1 1
    25 #define NDOF2 2
    26 #define NDOF3 3
    27 #define NDOF4 4
    2824
    2925/*Riftfront constructors and destructor*/
Note: See TracChangeset for help on using the changeset viewer.