Changeset 2913 for issm/trunk/src/c/Bamgx/Bamgx.cpp

Timestamp:

01/26/10 14:23:56 (15 years ago)

Author:

Mathieu Morlighem

Message:

minor more tweaks in Bamg

File:

• issm/trunk/src/c/Bamgx/Bamgx.cpp (modified) (4 diffs)

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

@@ -25 +25 @@
 int Bamgx(BamgMesh* bamgmesh,BamgGeom* bamggeom,BamgOpts* bamgopts){
         
-        int noerr=1;
 
         /*output: */
@@ -37 +36 @@
         int    maxnbv;
         double hmin,hmax;
+        double err,errg,coef;
         double cutoff;
         int    verbosity;
-
-        /*Bamg variables: */
+        int    Hessiantype,NbSmooth;
+        double power;
+        double omega;
+
+        /*intermediary*/
+        int noerr=1;
         int i,j,num;
         int AbsError=0,nbjacoby=1,allquad=0;
         double costheta=2;
         double anisomax = 1e6;
-        double err=0.01,errg=0.1,coef=1;
         int KeepBackVertices=1;
         double hminaniso=1e-100; 
         const double  boundmaxsubdiv = 10;
         double  maxsubdiv=boundmaxsubdiv;
-        double omega=1.8;
-        int NbSmooth=3;
-        int ChoiseHessien = 0;
-        double power=1;
         int Rescaling=1;
 
@@ -61 +60 @@
         /*Bamg options*/
         iso=bamgopts->iso;
+        err=bamgopts->err;
+        errg=bamgopts->errg;
+        Hessiantype=bamgopts->Hessiantype;
+        power=bamgopts->power;
+        NbSmooth=bamgopts->NbSmooth;
+        omega=bamgopts->omega;
+        coef=bamgopts->coef;
         maxnbv=bamgopts->maxnbv;
         hmin=bamgopts->hmin;
@@ -135 +141 @@
                         BTh.ReadMetric(bamgopts,hmin,hmax,coef);
                 }
-                else if (bamgopts->field){
-                        if (verbosity>1) printf("   Generating Metric from solution field...\n");
-                        BTh.IntersectConsMetric(bamgopts->field,1,0,hmin,hmax,sqrt(err)*coef,1e30,AbsError?0.0:cutoff,nbjacoby,Rescaling,power,ChoiseHessien);
-                }
-                else { // init with hmax 
+                else { 
+
+                        // init with hmax 
                         Metric Mhmax(hmax);
                         for (Int4 iv=0;iv<BTh.nbv;iv++) BTh[iv].m = Mhmax;
+
+                        //use present fields to generate metric if present
+                        if (bamgopts->field){
+                                if (verbosity>1) printf("   Generating Metric from solution field...\n");
+                                BTh.IntersectConsMetric(bamgopts->field,1,0,hmin,hmax,sqrt(err)*coef,1e30,AbsError?0.0:cutoff,nbjacoby,Rescaling,power,Hessiantype);
+                        }
                 }