Changeset 2934

Timestamp:

01/29/10 14:45:30 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added anisomax option on Bamg

Location:

issm/trunk/src

Files:

• c/Bamgx/Bamgx.cpp (modified) (1 diff)
• c/Bamgx/objects/Triangles.cpp (modified) (9 diffs)
• c/objects/BamgOpts.h (modified) (1 diff)
• m/classes/public/bamg.m (modified) (1 diff)
• mex/Bamg/Bamg.cpp (modified) (2 diffs)

issm/trunk/src/c/Bamgx/Bamgx.cpp

@@ -140 +140 @@
                         Metric Mhmax(hmax);
                         for (Int4 iv=0;iv<BTh.nbv;iv++) BTh[iv].m = Mhmax;
+                        // change using hVertices if required
+                        if (bamgmesh->hVertices){
+                                for (i=0;i<BTh.nbv;i++){
+                                        if (!isnan(bamgmesh->hVertices[i])){
+                                                BTh[i].m=Metric((Real4)bamgmesh->hVertices[i]);
+                                        }
+                                }
+                        }
 
                         //use present fields to generate metric if present

issm/trunk/src/c/Bamgx/objects/Triangles.cpp

@@ -869 +869 @@
                         MatVVP2x2 Vp(vertices[i]);
                         double lmax=Vp.lmax();
-                        h1 =Min(h1,Vp.lmin());
-                        h2 =Max(h2,Vp.lmax());
                         Vp*=Min(lminaniso,lmax)/lmax;
                         Vp.BoundAniso2(coef);
@@ -877 +875 @@
                         //info to be displayed
                         if (verbosity>2){
+                                h1 =Min(h1,Vp.lmin());
+                                h2 =Max(h2,Vp.lmax());
                                 hn1=Min(hn1,Vp.lmin());
                                 hn2=Max(hn2,Vp.lmax());
@@ -907 +907 @@
                 Real8 hmax1;
                 Real8 coef;
-                Real8 anisomax=1e30;
+                Real8 anisomax;
                 Real8 CutOff;
                 int NbJacobi;
@@ -924 +924 @@
                 Rescaling=bamgopts->Rescaling; //do normalization
                 power=bamgopts->power;
+                anisomax=bamgopts->anisomax;
 
                 /*process options*/
@@ -1331 +1332 @@
                 Real8 hmax1;
                 Real8 coef;
-                Real8 anisomax=1e30;
+                Real8 anisomax;
                 Real8 CutOff;
                 int NbJacobi;
@@ -1348 +1349 @@
                 Rescaling=bamgopts->Rescaling; //do normalization
                 power=bamgopts->power;
+                anisomax=bamgopts->anisomax;
 
                 /*process options*/
@@ -1823 +1825 @@
                 const int dim = 2;
                 double* s=NULL;
-                Int4 nbsol;
-                int* typsols=NULL;
-                int verbosity;
-                Real8 hmin1;
-                Real8 hmax1;
+                Int4   nbsol;
+                int*   typsols=NULL;
+                int    verbosity;
+                Real8  hmin1;
+                Real8  hmax1;
+                double power;
+                double anisomax;
+
                 int   i,j,k,iA,iB,iC;
                 int   iv,nbfield;
+                double coef;
+
+                /*Recover options*/
+                verbosity=bamgopts->verbose;
+                power=bamgopts->power;
+                hmin1=bamgopts->hmin;
+                hmax1=bamgopts->hmax;
 
                 /*Recover options*/
@@ -1835 +1847 @@
                 hmin1=bamgopts->hmin;
                 hmax1=bamgopts->hmax;
-
-                /*Recover options*/
-                verbosity=bamgopts->verbose;
-                hmin1=bamgopts->hmin;
-                hmax1=bamgopts->hmax;
+                anisomax=bamgopts->anisomax;
 
                 /*Get and process fields*/
@@ -2024 +2032 @@
                                         Vp.Abs();
 
+                                        //Apply a power if requested by user
+                                        if(power!=1.0) Vp.pow(power);
+
                                         //modify eigen values according to hmin and hmax
                                         Vp.Maxh(hmax);
                                         Vp.Minh(hmin);
+
+                                        //Bound anisotropy by 1/(anisomax)^2
+                                        Vp.BoundAniso2(1/(anisomax*anisomax));
 
                                         //rebuild Metric from Vp

issm/trunk/src/c/objects/BamgOpts.h

@@ -13 +13 @@
         int     Hessiantype;
         double  power;
+        double  anisomax;
         int     NbSmooth;
         int     Rescaling;

issm/trunk/src/m/classes/public/bamg.m

@@ -91 +91 @@
 bamg_options.hmin=getfieldvalue(options,'hmin',10^-100);
 bamg_options.hmax=getfieldvalue(options,'hmax',10^100);
+bamg_options.anisomax=getfieldvalue(options,'anisomax',10^30);
 bamg_options.gradation=getfieldvalue(options,'gradation',1.5);
 bamg_options.cutoff=getfieldvalue(options,'cutoff',10^-5);

issm/trunk/src/mex/Bamg/Bamg.cpp

@@ -33 +33 @@
         /*Options inputs*/
         int    iso,maxnbv,verbose,splitcorners;
-        double hmin,hmax;
+        double hmin,hmax,anisomax;
         double err,errg,coef;
         double power;
@@ -135 +135 @@
         FetchData(&hmax,mxGetField(BAMGOPTIONS,0,"hmax"));
         bamgopts.hmax=hmax;
+        FetchData(&anisomax,mxGetField(BAMGOPTIONS,0,"anisomax"));
+        bamgopts.anisomax=anisomax;
         FetchData(&gradation,mxGetField(BAMGOPTIONS,0,"gradation"));
         bamgopts.gradation=gradation;