Changeset 22241 for issm/trunk-jpl/src/c/classes/AmrBamg.cpp

Timestamp:

11/08/17 05:07:49 (7 years ago)

Author:

tsantos

Message:

CHG: Updated AMR methods for NeoPZ and Bamg, insert option to restart a simulation using error estimators and Bamg, deleted some non-used methods.

File:

• issm/trunk-jpl/src/c/classes/AmrBamg.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/classes/AmrBamg.cpp

@@ -17 +17 @@
 
 /*Constructor, copy, clean up and destructor*/
-AmrBamg::AmrBamg(IssmDouble hmin,IssmDouble hmax,int fieldenum_in,IssmDouble err_in,int keepmetric_in,IssmDouble gradation_in,
-                                                IssmDouble groundingline_resolution_in,IssmDouble groundingline_distance_in,
-                                                IssmDouble icefront_resolution_in,IssmDouble icefront_distance_in,
-                                                IssmDouble thicknesserror_resolution_in,IssmDouble thicknesserror_threshold_in,
-                                                IssmDouble deviatoricerror_resolution_in,IssmDouble deviatoricerror_threshold_in){/*{{{*/
+AmrBamg::AmrBamg(){/*{{{*/
 
-        this->fieldenum                                         = fieldenum_in;
-        this->keepmetric                                        = keepmetric_in;
-        this->groundingline_resolution  = groundingline_resolution_in;
-        this->groundingline_distance            = groundingline_distance_in;
-        this->icefront_resolution                       = icefront_resolution_in;
-        this->icefront_distance                         = icefront_distance_in;
-        this->thicknesserror_resolution         = thicknesserror_resolution_in;
-        this->thicknesserror_threshold  = thicknesserror_threshold_in;
-        this->deviatoricerror_resolution = deviatoricerror_resolution_in;
-        this->deviatoricerror_threshold  = deviatoricerror_threshold_in;
+        /*These attributes MUST be setup by FemModel*/
+        this->fieldenum                                         = -1;//fieldenum_in;
+        this->keepmetric                                        = -1;//keepmetric_in;
+        this->groundingline_resolution  = -1;//groundingline_resolution_in;
+        this->groundingline_distance            = -1;//groundingline_distance_in;
+        this->icefront_resolution                       = -1;//icefront_resolution_in;
+        this->icefront_distance                         = -1;//icefront_distance_in;
+        this->thicknesserror_resolution         = -1;//thicknesserror_resolution_in;
+        this->thicknesserror_threshold  = -1;//thicknesserror_threshold_in;
+        this->thicknesserror_maximum            = -1;
+        this->deviatoricerror_resolution = -1;//deviatoricerror_resolution_in;
+        this->deviatoricerror_threshold  = -1;//deviatoricerror_threshold_in;
+        this->deviatoricerror_maximum           = -1;
+        
+        /*Geometry and mesh as NULL*/
         this->geometry                                          = NULL;
         this->fathermesh                                        = NULL;
@@ -43 +44 @@
         this->options->coeff             = 1;
         this->options->errg              = 0.1;
-        this->options->gradation         = gradation_in;
+        this->options->gradation         = -1; //MUST be setup by the FemModel 
         this->options->Hessiantype       = 0;
         this->options->maxnbv            = 1e6;
@@ -54 +55 @@
         this->options->verbose           = 0;
         this->options->Crack             = 0;
-        this->options->KeepVertices      = 1; /*!!!!! VERY IMPORTANT !!!!!*/
+        this->options->KeepVertices      = 1; /*!!!!! VERY IMPORTANT !!!!! This avoid numerical errors when remeshing*/
         this->options->splitcorners      = 1;
-        this->options->hmin              = hmin;
-        this->options->hmax              = hmax;
-
-        this->options->err=xNew<IssmDouble>(1);
-        this->options->errSize[0]=1;
-        this->options->errSize[1]=1;
-        this->options->err[0] = err_in;
+        this->options->hmin              = -1;/*MUST be setup by the FemModel*/
+        this->options->hmax              = -1;/*MUST be setup by the FemModel*/
+        this->options->err                                      = xNew<IssmDouble>(1);
+        this->options->err[0]                           = -1;/*MUST be setup by the FemModel*/
+        this->options->errSize[0]                       = 1;
+        this->options->errSize[1]                       = 1;
 }
 /*}}}*/
@@ -174 +174 @@
         *pelementslist = elementslist;
 }/*}}}*/
+void AmrBamg::SetBamgOpts(IssmDouble hmin_in,IssmDouble hmax_in,IssmDouble err_in,IssmDouble gradation_in){/*{{{*/
+
+        if(!this->options) _error_("AmrBamg->options is NULL!");
+        
+        this->options->hmin     = hmin_in; 
+        this->options->hmax     = hmax_in; 
+        this->options->err[0]   = err_in; 
+        this->options->gradation= gradation_in; 
+}/*}}}*/