Changeset 22758 for issm/trunk/src/c/bamg/BamgVertex.cpp

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/BamgVertex.cpp (modified) (4 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/BamgVertex.cpp

@@ -114 +114 @@
                 if ( t && (IndexInTriangle >= 0 ) && (IndexInTriangle <3) ){
                         ret = t->Optim(IndexInTriangle,koption);
-                        if(!i){
+                        if(i==0){
                                 t =0; // for no future optim
                                 IndexInTriangle= 0;
@@ -122 +122 @@
         }
         /*}}}*/
-        double  BamgVertex::Smoothing(Mesh &Th,const Mesh &BTh,Triangle* &tstart ,double omega){/*{{{*/
+        double  BamgVertex::Smoothing(Mesh &Th,Mesh &BTh,Triangle* &tstart ,double omega){/*{{{*/
                 /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/Smoothing)*/
 
@@ -157 +157 @@
                 double delta=Norme2_2(Xmove); 
 
-                Icoor2 deta[3];
+                long long deta[3];
                 I2 IBTh  = BTh.R2ToI2(PNew);
 
@@ -194 +194 @@
                                 tria->det =  bamg::det( (*tria)[0],(*tria)[1]  ,(*tria)[2]);
                                 if (loop) {
-                                        BamgVertex *v0,*v1,*v2,*v3;
                                         if (tria->det<0) ok =1;                        
                                         else if ( (double)tria->det < detold/2 ) ok=1;

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