Changeset 22758 for issm/trunk/src/c/bamg/Triangle.h

Timestamp:

05/10/18 10:24:27 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22757

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/bamg/Triangle.h (modified) (2 diffs)

issm/trunk/src/c

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod

issm/trunk/src/c/bamg/Triangle.h

@@ -21 +21 @@
 
                 public: 
-                        Icoor2 det; //Integer determinant (twice its area)
+                        long long det; //Integer determinant (twice its area)
                         union { 
                                 Triangle *link;
@@ -60 +60 @@
 
                         //Inline methods
-                        double qualite() ;
                         void  Set(const Triangle &,const Mesh &,Mesh &);
                         int   In(BamgVertex *v) const { return vertices[0]==v || vertices[1]==v || vertices[2]==v ;}

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod