Changeset 21759 for issm/branches/trunk-larour-NatGeoScience2016/src/c/bamg/Metric.h

Timestamp:

06/07/17 10:50:54 (8 years ago)

Author:

Eric.Larour

Message:

CHG: merged branch back to trunk-jpl 21754.

File:

• issm/branches/trunk-larour-NatGeoScience2016/src/c/bamg/Metric.h (modified) (5 diffs)

issm/branches/trunk-larour-NatGeoScience2016/src/c/bamg/Metric.h

@@ -30 +30 @@
                         Metric(double a);
                         Metric(double a,double b,double c);
-                        Metric( double  a,const  Metric& ma, double  b,const  Metric& mb);
-                        Metric(const double  a[3],const  Metric& m0,const  Metric& m1,const  Metric& m2 );
+                        Metric(double  a,const Metric ma,double  b,const Metric mb);
+                        Metric(const double  a[3],const Metric m0,const Metric m1,const Metric m2 );
                         void        Echo();
-                        R2          mul(const R2 x)const;
                         double      det() const;
                         int         IntersectWith(const  Metric& M2);
@@ -42 +41 @@
                         R2 Orthogonal(const R2 x){ return R2(-(a21*x.x+a22*x.y),a11*x.x+a21*x.y); }
                         R2 Orthogonal(const I2 x){ return R2(-(a21*x.x+a22*x.y),a11*x.x+a21*x.y); }
+                        double Length(double Ax,double Ay) const;
 
                         //operators
@@ -47 +47 @@
                         Metric operator/(double c) const {double c2=1/(c*c);return  Metric(a11*c2,a21*c2,a22*c2);} 
                         operator D2xD2(){ return D2xD2(a11,a21,a21,a22);}
-                        double  operator()(R2 x) const { return sqrt(x.x*x.x*a11+2*x.x*x.y*a21+x.y*x.y*a22);};        // length of x in metric sqrt(<Mx,x>)
+                        //double  operator()(R2 x) const { return sqrt(x.x*x.x*a11+2*x.x*x.y*a21+x.y*x.y*a22);};        // length of x in metric sqrt(<Mx,x>) FIXME: replace by Length!
                         double  operator()(R2 x,R2 y) const { return x.x*y.x*a11+(x.x*x.y+x.y*y.x)*a21+x.y*y.y*a22;};
 
@@ -57 +57 @@
                         //fields
                         double lambda1,lambda2;
-                        D2     v;
+                        double vx,vy;
 
                         //friends
@@ -114 +114 @@
         }
         inline Metric::Metric(const EigenMetric& M) {
-                double v00=M.v.x*M.v.x;
-                double v11=M.v.y*M.v.y;
-                double v01=M.v.x*M.v.y;
+                double v00=M.vx*M.vx;
+                double v11=M.vy*M.vy;
+                double v01=M.vx*M.vy;
                 a11=v00*M.lambda1+v11*M.lambda2;
                 a21=v01*(M.lambda1-M.lambda2);