Changeset 2941 for issm/trunk/src/mex/Bamg/Bamg.cpp

Timestamp:

02/01/10 14:57:22 (16 years ago)

Author:

Mathieu Morlighem

Message:

now different errors must be used to compute metric

File:

• issm/trunk/src/mex/Bamg/Bamg.cpp (modified) (5 diffs)

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

@@ -32 +32 @@
 
         /*Options inputs*/
-        int    iso,maxnbv,verbose,splitcorners;
+        int    maxnbv,verbose,splitcorners;
         double hmin,hmax,anisomax;
-        double err,errg,coef;
+        double coef;
         double power;
         int    Hessiantype,Metrictype,NbSmooth;
-        int    nbjacobi,AbsError;
+        int    nbjacobi;
         double omega;
         double gradation;
@@ -43 +43 @@
         double* metric=NULL;
         double* field=NULL;
-        int     numfields=0;
+        double* err;
+        int     numfields=0,numerr=0;
 
         /*Boot module: */
@@ -108 +109 @@
 
         /*create bamg options input*/
-        FetchData(&iso,mxGetField(BAMGOPTIONS,0,"iso"));
-        bamgopts.iso=iso;
-        FetchData(&err,mxGetField(BAMGOPTIONS,0,"err"));
-        bamgopts.err=err;
-        FetchData(&errg,mxGetField(BAMGOPTIONS,0,"errg"));
-        bamgopts.errg=errg;
         FetchData(&coef,mxGetField(BAMGOPTIONS,0,"coef"));
         bamgopts.coef=coef;
@@ -124 +119 @@
         FetchData(&nbjacobi,mxGetField(BAMGOPTIONS,0,"nbjacobi"));
         bamgopts.nbjacobi=nbjacobi;
-        FetchData(&AbsError,mxGetField(BAMGOPTIONS,0,"AbsError"));
-        bamgopts.AbsError=AbsError;
         FetchData(&NbSmooth,mxGetField(BAMGOPTIONS,0,"NbSmooth"));
         bamgopts.NbSmooth=NbSmooth;
@@ -153 +146 @@
         bamgopts.numfields=numfields;
         bamgopts.field=field;
+        FetchData(&err,NULL,&numerr,mxGetField(BAMGOPTIONS,0,"err"));
+        bamgopts.err=err;
+
+        /*Some checks*/
+        if (numfields!=0 && numerr!=numfields){
+                throw ErrorException(__FUNCT__,exprintf("the size of 'err' should be the same as 'field'"));
+        }
 
         /*!Generate internal degree of freedom numbers: */