Changeset 2914

Timestamp:

01/26/10 15:57:09 (15 years ago)

Author:

Mathieu Morlighem

Message:

fixed metric computation Bamg

Location:

issm/trunk/src

Files:

• c/Bamgx/Bamgx.cpp (modified) (6 diffs)
• c/Bamgx/Mesh2.h (modified) (1 diff)
• c/Bamgx/objects/Triangles.cpp (modified) (5 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

@@ -37 +37 @@
         double hmin,hmax;
         double err,errg,coef;
-        double cutoff;
         int    verbosity;
-        int    Hessiantype,NbSmooth;
-        double power;
+        int    NbSmooth;
         double omega;
 
@@ -46 +44 @@
         int noerr=1;
         int i,j,num;
-        int AbsError=0,nbjacoby=1,allquad=0;
+        int allquad=0;
         double costheta=2;
         double anisomax = 1e6;
@@ -53 +51 @@
         const double  boundmaxsubdiv = 10;
         double  maxsubdiv=boundmaxsubdiv;
-        int Rescaling=1;
 
         Triangles* Thr=NULL;
@@ -62 +59 @@
         err=bamgopts->err;
         errg=bamgopts->errg;
-        Hessiantype=bamgopts->Hessiantype;
-        power=bamgopts->power;
         NbSmooth=bamgopts->NbSmooth;
         omega=bamgopts->omega;
@@ -70 +65 @@
         hmin=bamgopts->hmin;
         hmax=bamgopts->hmax;
-        cutoff=bamgopts->cutoff;
         verbosity=bamgopts->verbose;
 
@@ -150 +144 @@
                         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);
+                                BTh.IntersectConsMetric(bamgopts);
                         }
                 }

issm/trunk/src/c/Bamgx/Mesh2.h

@@ -794 +794 @@
                                                  void ReadMetric(BamgOpts* bamgopts,const Real8 hmin,const Real8 hmax,const Real8 coef);
                                                  void WriteMetric(BamgOpts* bamgopts);
-                                                 void IntersectConsMetric(const double * s,const Int4 nbsol,const int * typsols,
-                                                                         const  Real8 hmin,const Real8 hmax, const Real8 coef,
-                                                                         const Real8  anisomax,const Real8 CutOff=1.e-4,const int NbJacobi=1,
-                                                                         const int DoNormalisation=1,
-                                                                         const double power=1.0,
-                                                                         const int choise=0);
+                                                 void IntersectConsMetric(BamgOpts* bamgopts);
                                                  void IntersectGeomMetric(const Real8 err,const int iso);
 

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

@@ -2728 +2728 @@
         /*}}}1*/
 /*FUNCTION Triangles::IntersectConsMetric{{{1*/
-void Triangles::IntersectConsMetric(const double* s,const Int4 nbsol,const int * typsols,
-                        const  Real8 hmin1,const Real8 hmax1,const Real8 coef,
-                        const Real8 anisomax ,const Real8 CutOff,const int NbJacobi,
-                        const int DoNormalisation,const double power,const int choice){
+void Triangles::IntersectConsMetric(BamgOpts* bamgopts){
+           /*const double* s,const Int4 nbsol,const int * typsols,
+                 *      const  Real8 hmin1,const Real8 hmax1,const Real8 coef,
+                 *           const Real8 anisomax ,const Real8 CutOff,const int NbJacobi,
+                 *                const int Rescaling,const double power,const int Hessiantype)*/
         //  the array of solution s is store    
         // sol0,sol1,...,soln    on vertex 0
@@ -2739 +2740 @@
         //  otherwise  =>  H is computed from P2 on 4T 
 
+        /*Options*/
         const int dim = 2;
-        long int verbosity=0;
+        int AbsError;
+        double* s;
+        Int4 nbsol;
+        int * typsols;
+        Real8 hmin1;
+        Real8 hmax1;
+        Real8 coef;
+        Real8 anisomax=1e30;
+        Real8 CutOff;
+        int NbJacobi;
+        int Rescaling;
+        double power;
+        int Hessiantype;
+        int verbosity;
+
+        /*Recover options*/
+        verbosity=bamgopts->verbose;
+        s=bamgopts->field;
+        nbsol=1;   //for now, only one field
+        typsols=0; // only one dof per node
+        AbsError=bamgopts->AbsError;   
+        CutOff=bamgopts->cutoff;
+        hmin1=bamgopts->hmin;
+        hmax1=bamgopts->hmax;
+        coef=bamgopts->coef;
+        NbJacobi=bamgopts->nbjacobi;
+        Rescaling=bamgopts->Rescaling; //do normalization
+        power=bamgopts->power;
+        Hessiantype=bamgopts->Hessiantype;
+
+        /*process options*/
+        if (AbsError) CutOff=0.0;
+        coef=sqrt(bamgopts->err)*coef;
 
         int sizeoftype[] = { 1, dim ,dim * (dim+1) / 2, dim * dim } ; 
@@ -2823 +2857 @@
                  Mmass[iC] += dett;
 
-                 if((nbb==0)|| !choice){
+                 if((nbb==0)|| !Hessiantype){
                          Mmassxx[iA] += dett;
                          Mmassxx[iB] += dett;
@@ -2859 +2893 @@
                 Real8 sdelta = smax-smin;
                 Real8 absmax=Max(Abs(smin),Abs(smax));
-                Real8 cnorm = DoNormalisation ? coef2/sdelta : coef2;
+                Real8 cnorm = Rescaling ? coef2/sdelta : coef2;
 
                 if(verbosity>2) printf("      Solution %i, Min = %g, Max = %g, Delta = %g, cnorm = %g, number of fields = %i\n",nusol,smin,smax,sdelta,cnorm,nbfield);
@@ -2905 +2939 @@
 
                                  R2 Grads = (nAB * sC + nBC * sA + nCA * sB ) /detT[i] ;
-                                 if(choice){
+                                 if(Hessiantype){
                                          int nbb = 0;
                                          Real8 dd = detT[i];

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

@@ -14 +14 @@
         double  power;
         int     NbSmooth;
+        int     Rescaling;
+        int     nbjacobi;
+        int     AbsError;
         double  omega;
         double  hmin;

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',0);
 bamg_options.NbSmooth=getfieldvalue(options,'NbSmooth',3);

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

@@ -37 +37 @@
         double power;
         int    Hessiantype,NbSmooth;
+        int    Rescaling,nbjacobi,AbsError;
         double omega;
         double gradation;
@@ -118 +119 @@
         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;
+        FetchData(&AbsError,mxGetField(BAMGOPTIONS,0,"AbsError"));
+        bamgopts.AbsError=AbsError;
         FetchData(&NbSmooth,mxGetField(BAMGOPTIONS,0,"NbSmooth"));
         bamgopts.NbSmooth=NbSmooth;