Changeset 12493 for issm/trunk-jpl/src/c/objects/Bamg/BamgOpts.cpp

Timestamp:

06/21/12 10:02:29 (13 years ago)

Author:

Mathieu Morlighem

Message:

replaced all _error_ to _error2_

File:

• issm/trunk-jpl/src/c/objects/Bamg/BamgOpts.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/objects/Bamg/BamgOpts.cpp

@@ -60 +60 @@
         int i;
 
-        if (this->anisomax<1) _error_("'anisomax' option should be >=1");
-        if (this->coeff==0) _error_("'coeff' should be positive");
-        if (this->errg<0) _error_("'errg' option should be >0");
-        if (this->gradation<1) _error_("'gradation' option should be >=1");
-        if (this->Hessiantype!=0  && this->Hessiantype!=1) _error_("'Hessiantype' supported options are 0 and 1");
-        if (this->maxnbv<3) _error_("'maxnbv' option should be >3");
-        if (this->maxsubdiv<=1) _error_("'maxsubdiv' should be >1");
-        if (this->Metrictype!=0   && this->Metrictype!=1 && this->Metrictype!=2) _error_("'Metrictype' supported options are 0, 1 and 2");
-        if (this->nbjacobi<=0) _error_("'nbjacobi' option should be >0");
-        if (this->nbsmooth<=0) _error_("'nbsmooth' option should be >0");
+        if (this->anisomax<1) _error2_("'anisomax' option should be >=1");
+        if (this->coeff==0) _error2_("'coeff' should be positive");
+        if (this->errg<0) _error2_("'errg' option should be >0");
+        if (this->gradation<1) _error2_("'gradation' option should be >=1");
+        if (this->Hessiantype!=0  && this->Hessiantype!=1) _error2_("'Hessiantype' supported options are 0 and 1");
+        if (this->maxnbv<3) _error2_("'maxnbv' option should be >3");
+        if (this->maxsubdiv<=1) _error2_("'maxsubdiv' should be >1");
+        if (this->Metrictype!=0   && this->Metrictype!=1 && this->Metrictype!=2) _error2_("'Metrictype' supported options are 0, 1 and 2");
+        if (this->nbjacobi<=0) _error2_("'nbjacobi' option should be >0");
+        if (this->nbsmooth<=0) _error2_("'nbsmooth' option should be >0");
 
-        if (this->Crack!=0  && this->Crack!=1) _error_("'Crack' supported options are 0 and 1");
-        if (this->KeepVertices!=0 && this->KeepVertices!=1) _error_("'KeepVertices' supported options are 0 and 1");
-        if (this->geometricalmetric!=0  && this->geometricalmetric!=1) _error_("'geometricalmetric' supported options are 0 and 1");
+        if (this->Crack!=0  && this->Crack!=1) _error2_("'Crack' supported options are 0 and 1");
+        if (this->KeepVertices!=0 && this->KeepVertices!=1) _error2_("'KeepVertices' supported options are 0 and 1");
+        if (this->geometricalmetric!=0  && this->geometricalmetric!=1) _error2_("'geometricalmetric' supported options are 0 and 1");
 
-        if (this->hmin<=0) _error_("'hmin' option should be >0");
-        if (this->hmax<=0 || this->hmax<this->hmin) _error_("'hmax' option should be between 0 and hmin=%g",this->hmin);
-        if (this->hminVertices && this->hminVerticesSize[1]!=1) _error_("'hminVertices' should be a column");
-        if (this->hmaxVertices && this->hmaxVerticesSize[1]!=1) _error_("'hmaxVertices' should be a column");
-        if (this->hVertices && this->hVerticesSize[1]!=1) _error_("'hVertices' should be a column");
-        if (this->metric && (this->metricSize[1]!=1 && this->metricSize[1]!=3)) _error_("'metric' should have either 1 (iso) or 3 (aniso) columns.");
+        if (this->hmin<=0) _error2_("'hmin' option should be >0");
+        if (this->hmax<=0 || this->hmax<this->hmin) _error2_("'hmax' option should be between 0 and hmin=" << this->hmin);
+        if (this->hminVertices && this->hminVerticesSize[1]!=1) _error2_("'hminVertices' should be a column");
+        if (this->hmaxVertices && this->hmaxVerticesSize[1]!=1) _error2_("'hmaxVertices' should be a column");
+        if (this->hVertices && this->hVerticesSize[1]!=1) _error2_("'hVertices' should be a column");
+        if (this->metric && (this->metricSize[1]!=1 && this->metricSize[1]!=3)) _error2_("'metric' should have either 1 (iso) or 3 (aniso) columns.");
         if (this->field){
-                if (this->errSize[0]!=1 || this->errSize[1]!=this->fieldSize[1]) _error_("'err' should be of size %i x %i",1,this->fieldSize[1]);
-                for (i=0;i<this->fieldSize[1];i++) {if (this->err[i]<=0) _error_("'err' option should be >0");};
+                if (this->errSize[0]!=1 || this->errSize[1]!=this->fieldSize[1]) _error2_("'err' should be of size " << 1 << " x " << this->fieldSize[1]);
+                for (i=0;i<this->fieldSize[1];i++) {if (this->err[i]<=0) _error2_("'err' option should be >0");};
         }