Changeset 2938

Timestamp:

01/29/10 16:31:16 (15 years ago)

Author:

Mathieu Morlighem

Message:

revamped metric computation

Location:

issm/trunk/src

Files:

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

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

@@ -912 +912 @@
                 /*Get and process fields*/
                 s=bamgopts->field;
-                nbsol=1;       //for now, only one field
+                nbsol=bamgopts->numfields;
                 typsols=(int*)xmalloc(1*sizeof(int));
                 typsols[0]=0; // only one dof per node
@@ -1246 +1246 @@
                 /*Get and process fields*/
                 s=bamgopts->field;
-                nbsol=1;       //for now, only one field
+                nbsol=bamgopts->numfields;
                 typsols=(int*)xmalloc(1*sizeof(int));
                 typsols[0]=0; // only one dof per node
@@ -1650 +1650 @@
                 /*Get and process fields*/
                 s=bamgopts->field;
-                nbsol=1;       //for now, only one field
+                nbsol=bamgopts->numfields;
                 typsols=(int*)xmalloc(1*sizeof(int));
                 typsols[0]=0; // only one dof per node

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

@@ -139 +139 @@
                 double coef=bamgopts->coef;
                 int    Metrictype=(bamgopts->Metrictype);
-                int    Rescaling=(bamgopts->Rescaling);
 
                 /*Intermediary*/
@@ -153 +152 @@
                  */
                 if (Metrictype==0){
-                        if (Rescaling){
-                                ci= 1/(bamgopts->err*coef*coef) * 1/(smax-smin);
-                        }
-                        else{
-                                ci=1/(bamgopts->err*coef*coef);
-                        }
+                        ci= 2.0/9.0 * 1/(bamgopts->err*coef*coef);
                 }
 
@@ -169 +163 @@
                  */
                 else if (Metrictype==1){
-                        ci=1/(bamgopts->err*coef*coef) * 1/Max( Abs(s), CutOff*(Max(Abs(smin),Abs(smax))));
-                }
-
-                //Interpolation Error
+                        ci= 2.0/9.0 * 1/(bamgopts->err*coef*coef) * 1/Max( Abs(s), CutOff*(Max(Abs(smin),Abs(smax))));
+                }
+
+                //Rescaled absolute error
                 /*
-                 *            2         1       
-                 *Metric M = ---  ------------   Abs(Hessian)
-                 *            9   err * coeff^2  
+                 *            2         1            Abs(Hessian)
+                 *Metric M = ---  ------------  ---------------------- 
+                 *            9   err * coeff^2       (smax-smin)
                  */
                 else if (Metrictype==2){
-                        ci=(2.0/9.0)*(1.0/(bamgopts->err));
+                        ci= 2.0/9.0 * 1/(bamgopts->err*coef*coef) * 1/(smax-smin);
                 }
                 else{

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

@@ -15 +15 @@
         double  anisomax;
         int     NbSmooth;
-        int     Rescaling;
         int     Metrictype;
         int     nbjacobi;
@@ -31 +30 @@
         double* metric;
         double* field;
+        int     numfields;
 
 };

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

@@ -81 +81 @@
 bamg_options.coef=getfieldvalue(options,'coef',1);
 bamg_options.power=getfieldvalue(options,'power',1);
-bamg_options.Rescaling=getfieldvalue(options,'Rescaling',1);
 bamg_options.nbjacobi=getfieldvalue(options,'nbjacobi',1);
 bamg_options.AbsError=getfieldvalue(options,'AbsError',0);
 bamg_options.Hessiantype=getfieldvalue(options,'Hessiantype',2);
-bamg_options.Metrictype=getfieldvalue(options,'Metrictype',2);
+bamg_options.Metrictype=getfieldvalue(options,'Metrictype',0);
 bamg_options.NbSmooth=getfieldvalue(options,'NbSmooth',3);
 bamg_options.omega=getfieldvalue(options,'omega',1.8);

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

@@ -37 +37 @@
         double power;
         int    Hessiantype,Metrictype,NbSmooth;
-        int    Rescaling,nbjacobi,AbsError;
+        int    nbjacobi,AbsError;
         double omega;
         double gradation;
@@ -43 +43 @@
         double* metric=NULL;
         double* field=NULL;
+        int     numfields=0;
 
         /*Boot module: */
@@ -121 +122 @@
         FetchData(&power,mxGetField(BAMGOPTIONS,0,"power"));
         bamgopts.power=power;
-        FetchData(&Rescaling,mxGetField(BAMGOPTIONS,0,"Rescaling"));
-        bamgopts.Rescaling=Rescaling;
         FetchData(&nbjacobi,mxGetField(BAMGOPTIONS,0,"nbjacobi"));
         bamgopts.nbjacobi=nbjacobi;
@@ -151 +150 @@
         FetchData(&metric,NULL,NULL,mxGetField(BAMGOPTIONS,0,"metric"));
         bamgopts.metric=metric;
-        FetchData(&field,NULL,NULL,mxGetField(BAMGOPTIONS,0,"field"));
+        FetchData(&field,NULL,&numfields,mxGetField(BAMGOPTIONS,0,"field"));
+        bamgopts.numfields=numfields;
+        printf("numfields = %i\n",numfields);
         bamgopts.field=field;