Index: /issm/trunk-jpl/src/c/classes/AdaptiveMeshRefinement.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/AdaptiveMeshRefinement.cpp (revision 22275) +++ /issm/trunk-jpl/src/c/classes/AdaptiveMeshRefinement.cpp (revision 22276) @@ -32,5 +32,4 @@ this->refinement_type = cp.refinement_type; this->level_max = cp.level_max; - this->radius_level_max = cp.radius_level_max; this->gradation = cp.gradation; this->lag = cp.lag; @@ -39,6 +38,6 @@ this->thicknesserror_threshold = cp.thicknesserror_threshold; this->deviatoricerror_threshold = cp.deviatoricerror_threshold; - this->max_deviatoricerror = cp.max_deviatoricerror; - this->max_thicknesserror = cp.max_thicknesserror; + this->deviatoricerror_maximum = cp.deviatoricerror_maximum; + this->thicknesserror_maximum = cp.thicknesserror_maximum; this->sid2index.clear(); this->sid2index.resize(cp.sid2index.size()); @@ -66,5 +65,4 @@ this->refinement_type = -1; this->level_max = -1; - this->radius_level_max = -1; this->gradation = -1; this->lag = -1; @@ -73,6 +71,6 @@ this->thicknesserror_threshold = -1; this->deviatoricerror_threshold = -1; - this->max_deviatoricerror = -1; - this->max_thicknesserror = -1; + this->deviatoricerror_maximum = -1; + this->thicknesserror_maximum = -1; this->sid2index.clear(); this->index2sid.clear(); @@ -87,5 +85,4 @@ this->refinement_type = -1; this->level_max = -1; - this->radius_level_max = -1; this->gradation = -1; this->lag = -1; @@ -94,6 +91,6 @@ this->thicknesserror_threshold = -1; this->deviatoricerror_threshold = -1; - this->max_deviatoricerror = -1; - this->max_thicknesserror = -1; + this->deviatoricerror_maximum = -1; + this->thicknesserror_maximum = -1; this->sid2index.clear(); this->index2sid.clear(); @@ -139,8 +136,8 @@ int numberofcriteria =-1; int nconformelements = this->sid2index.size(); - double gl_radius_h =-1; - double gl_radius_hmax = std::max(this->radius_level_max,this->groundingline_distance); - double if_radius_h =-1; - double if_radius_hmax = std::max(this->radius_level_max,this->icefront_distance); + double gl_distance_h =-1; + double gl_distance_hmax = this->groundingline_distance; + double if_distance_h =-1; + double if_distance_hmax = this->icefront_distance; double gl_groupdistance =-1; double if_groupdistance =-1; @@ -163,9 +160,9 @@ /*Calculate the maximum of the estimators, if requested{{{*/ - if(this->deviatoricerror_threshold>0 && this->max_deviatoricerror<0){ - for(int i=0;imax_deviatoricerror=max(this->max_deviatoricerror,deviatoricerror[i]); - } - if(this->thicknesserror_threshold>0 && this->max_thicknesserror<0){ - for(int i=0;imax_thicknesserror=max(this->max_thicknesserror,thicknesserror[i]); + if(this->deviatoricerror_threshold>0 && this->deviatoricerror_maximumdeviatoricerror_maximum=max(this->deviatoricerror_maximum,deviatoricerror[i]); + } + if(this->thicknesserror_threshold>0 && this->thicknesserror_maximumthicknesserror_maximum=max(this->thicknesserror_maximum,thicknesserror[i]); } /*}}}*/ @@ -181,8 +178,8 @@ gmesh->Element(this->specialelementsindex[i])->Father()->GetHigherSubElements(sons); /*Limits*/ - gl_radius_h = gl_radius_hmax*std::pow(this->gradation,this->level_max-gmesh->Element(this->specialelementsindex[i])->Level()); - if_radius_h = if_radius_hmax*std::pow(this->gradation,this->level_max-gmesh->Element(this->specialelementsindex[i])->Level()); - d_maxerror = this->deviatoricerror_threshold*this->max_deviatoricerror; - t_maxerror = this->thicknesserror_threshold*this->max_thicknesserror; + gl_distance_h = gl_distance_hmax*std::pow(this->gradation,this->level_max-gmesh->Element(this->specialelementsindex[i])->Level()); + if_distance_h = if_distance_hmax*std::pow(this->gradation,this->level_max-gmesh->Element(this->specialelementsindex[i])->Level()); + d_maxerror = this->deviatoricerror_threshold*this->deviatoricerror_maximum; + t_maxerror = this->thicknesserror_threshold*this->thicknesserror_maximum; /*Calculate the distance and error of the group (sons)*/ gl_groupdistance=INFINITY;if_groupdistance=INFINITY;deviatoric_grouperror=0;thickness_grouperror=0; @@ -196,8 +193,8 @@ } criteria=0; - if(this->groundingline_distance>0 && gl_groupdistanceicefront_distance>0 && if_groupdistancedeviatoricerror_threshold>0 && deviatoric_grouperror>d_maxerror) criteria++; - if(this->thicknesserror_threshold>0 && thickness_grouperror>t_maxerror) criteria++; + if(this->groundingline_distance>0 && gl_groupdistanceicefront_distance>0 && if_groupdistancedeviatoricerror_threshold>0 && deviatoric_grouperror>d_maxerror-DBL_EPSILON) criteria++; + if(this->thicknesserror_threshold>0 && thickness_grouperror>t_maxerror-DBL_EPSILON) criteria++; /*Finally, it keeps the father index if it must be refine*/ if(criteria) index.push_back(gmesh->Element(this->specialelementsindex[i])->FatherIndex()); @@ -230,8 +227,8 @@ if(!gmesh->Element(i)->Father()) _error_("father is NULL!\n"); /*Limits with lag*/ - gl_radius_h = this->lag*gl_radius_hmax*std::pow(this->gradation,this->level_max-gmesh->Element(i)->Level()); - if_radius_h = this->lag*if_radius_hmax*std::pow(this->gradation,this->level_max-gmesh->Element(i)->Level()); - d_maxerror = 0.05*this->max_deviatoricerror;//itapopo definir melhor - t_maxerror = 0.05*this->max_thicknesserror;//itapopo definir melhor + gl_distance_h = this->lag*gl_distance_hmax*std::pow(this->gradation,this->level_max-gmesh->Element(i)->Level()); + if_distance_h = this->lag*if_distance_hmax*std::pow(this->gradation,this->level_max-gmesh->Element(i)->Level()); + d_maxerror = 0.01*this->deviatoricerror_maximum;//itapopo definir melhor 0.05 + t_maxerror = 0.01*this->thicknesserror_maximum;//itapopo definir melhor 0.05 /*Get the sons of the father (sibilings)*/ sons.clear(); @@ -252,8 +249,8 @@ /*Verify the criteria*/ criteria=0; - if(this->groundingline_distance>0 && gl_groupdistance>gl_radius_h) criteria++; - if(this->icefront_distance>0 && if_groupdistance>if_radius_h) criteria++; - if(this->deviatoricerror_threshold>0 && deviatoric_grouperrorthicknesserror_threshold>0 && thickness_grouperrorgroundingline_distance>0 && gl_groupdistance>gl_distance_h-DBL_EPSILON) criteria++; + if(this->icefront_distance>0 && if_groupdistance>if_distance_h-DBL_EPSILON) criteria++; + if(this->deviatoricerror_threshold>0 && deviatoric_grouperrorthicknesserror_threshold>0 && thickness_grouperrorindex2sid[gmesh->Element(i)->Index()]; if(sid<0) continue; - /*Filter: set the region/radius for level h*/ - gl_radius_h = gl_radius_hmax*std::pow(this->gradation,this->level_max-(gmesh->Element(i)->Level()+1));//+1, current element level is gradation,this->level_max-(gmesh->Element(i)->Level()+1));//+1, current element level is deviatoricerror_threshold*this->max_deviatoricerror; - t_maxerror = this->thicknesserror_threshold*this->max_thicknesserror; + /*Set the distance for level h*/ + gl_distance_h = gl_distance_hmax*std::pow(this->gradation,this->level_max-(gmesh->Element(i)->Level()+1));//+1: current element level is gradation,this->level_max-(gmesh->Element(i)->Level()+1));//+1: current element level is deviatoricerror_threshold*this->deviatoricerror_maximum; + t_maxerror = this->thicknesserror_threshold*this->thicknesserror_maximum; /*Verify distance and error of the element, if requested*/ criteria=0; - if(this->groundingline_distance>0 && gl_distance[sid]icefront_distance>0 && if_distance[sid]deviatoricerror_threshold>0 && deviatoricerror[sid]>d_maxerror) criteria++; - if(this->thicknesserror_threshold>0 && thicknesserror[sid]>t_maxerror) criteria++; + if(this->groundingline_distance>0 && gl_distance[sid]icefront_distance>0 && if_distance[sid]deviatoricerror_threshold>0 && deviatoricerror[sid]>d_maxerror-DBL_EPSILON) criteria++; + if(this->thicknesserror_threshold>0 && thicknesserror[sid]>t_maxerror-DBL_EPSILON) criteria++; /*Now, if it attends any criterion, keep the element index to refine in next step*/ if(criteria)index.push_back(i); Index: /issm/trunk-jpl/src/c/classes/AdaptiveMeshRefinement.h =================================================================== --- /issm/trunk-jpl/src/c/classes/AdaptiveMeshRefinement.h (revision 22275) +++ /issm/trunk-jpl/src/c/classes/AdaptiveMeshRefinement.h (revision 22276) @@ -8,4 +8,6 @@ #include #include +#include +#include /*NeoPZ includes*/ @@ -48,22 +50,21 @@ public: /*Public attributes{{{*/ - /* Filter (distance to the points) + /* * to refine: - * radius_h = initial_radius * gradation ^ (level_max-h) - * to unirefine - * radius_h = lag * initial_radius * gradation ^ (level_max-h) + * distance_h = initial_distance * gradation ^ (level_max-h) + * to unrefine: + * distance_h = lag * initial_distance * gradation ^ (level_max-h) */ int refinement_type; //0 uniform (faster); 1 refpattern int level_max; //max level of refinement - double radius_level_max; //initial radius which in the elements will be refined with level max double gradation; //geometric progression ratio to calculate radius of level h double lag; //lag used in the unrefine process /*Target and estimators*/ - double groundingline_distance; //if groundingline_distance>initial_radius, groundingline_distance will be used instead initial_radius - double icefront_distance; //if icefront_distance>initial_radius, icefront_distance will be used instead initial_radius + double groundingline_distance; //all elements with distance from grounding line <= groundingline_distance will be refined + double icefront_distance; //all elements with distance from ice front <= icefront_distance will be refined double thicknesserror_threshold; //if ==0, it will not be used + double thicknesserror_maximum; //max value of the error estimator; in general, it is defined in the first time step. Attention with restart double deviatoricerror_threshold; //if ==0, it will not be used - double max_deviatoricerror; // Max value of the error estimator; in general, it is defined in the first time step. Attention with restart - double max_thicknesserror; // Max value of the error estimator; in general, it is defined in the first time step. Attention with restart + double deviatoricerror_maximum; //max value of the error estimator; in general, it is defined in the first time step. Attention with restart /*}}}*/ /*Public methods{{{*/ Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 22275) +++ /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 22276) @@ -4794,5 +4794,5 @@ for(int j=0;j0.005*maxerror) refine=true;//itapopo must be better defined + if(error_vertices[vid]>0.01*maxerror) refine=true;//itapopo must be better defined } } @@ -4934,12 +4934,4 @@ IssmDouble* z = NULL; int* elements = NULL; - int level_max = -1; - IssmDouble radius_level_max = -1; - IssmDouble gradation = -1; - IssmDouble lag = -1; - IssmDouble groundingline_distance = -1; - IssmDouble icefront_distance = -1; - IssmDouble thicknesserror_threshold = -1; - IssmDouble deviatoricerror_threshold = -1; /*Initialize field as NULL for now*/ @@ -4949,14 +4941,4 @@ /*elements comes in Matlab indexing*/ this->GetMesh(this->vertices,this->elements,&x,&y,&z,&elements); - - /*Get amr parameters*/ - this->parameters->FindParam(&level_max,AmrLevelMaxEnum); - this->parameters->FindParam(&radius_level_max,AmrRadiusLevelMaxEnum); - this->parameters->FindParam(&gradation,AmrGradationEnum); - this->parameters->FindParam(&lag,AmrLagEnum); - this->parameters->FindParam(&groundingline_distance,AmrGroundingLineDistanceEnum); - this->parameters->FindParam(&icefront_distance,AmrIceFrontDistanceEnum); - this->parameters->FindParam(&thicknesserror_threshold,AmrThicknessErrorThresholdEnum); - this->parameters->FindParam(&deviatoricerror_threshold,AmrDeviatoricErrorThresholdEnum); /*Create initial mesh (coarse mesh) in neopz data structure*/ @@ -4965,13 +4947,15 @@ this->SetRefPatterns(); this->amr = new AdaptiveMeshRefinement(); - this->amr->refinement_type = 1;//1 is refpattern; 0 is uniform (faster) - this->amr->level_max = level_max; - this->amr->radius_level_max = radius_level_max; - this->amr->gradation = gradation; - this->amr->lag = lag; - this->amr->groundingline_distance = groundingline_distance; - this->amr->icefront_distance = icefront_distance; - this->amr->thicknesserror_threshold = thicknesserror_threshold; - this->amr->deviatoricerror_threshold = deviatoricerror_threshold; + this->amr->refinement_type=1;//1 is refpattern; 0 is uniform (faster) + /*Get amr parameters*/ + this->parameters->FindParam(&this->amr->level_max,AmrLevelMaxEnum); + this->parameters->FindParam(&this->amr->gradation,AmrGradationEnum); + this->parameters->FindParam(&this->amr->lag,AmrLagEnum); + this->parameters->FindParam(&this->amr->groundingline_distance,AmrGroundingLineDistanceEnum); + this->parameters->FindParam(&this->amr->icefront_distance,AmrIceFrontDistanceEnum); + this->parameters->FindParam(&this->amr->thicknesserror_threshold,AmrThicknessErrorThresholdEnum); + this->parameters->FindParam(&this->amr->thicknesserror_maximum,AmrThicknessErrorMaximumEnum); + this->parameters->FindParam(&this->amr->deviatoricerror_threshold,AmrDeviatoricErrorThresholdEnum); + this->parameters->FindParam(&this->amr->deviatoricerror_maximum,AmrDeviatoricErrorMaximumEnum); if(my_rank==0){ this->amr->CreateInitialMesh(numberofvertices,numberofelements,x,y,elements); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 22275) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 22276) @@ -130,5 +130,4 @@ case AmrNeopzEnum: parameters->AddObject(iomodel->CopyConstantObject("md.amr.level_max",AmrLevelMaxEnum)); - parameters->AddObject(iomodel->CopyConstantObject("md.amr.radius_level_max",AmrRadiusLevelMaxEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.amr.gradation",AmrGradationEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.amr.lag",AmrLagEnum)); Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 22275) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 22276) @@ -879,5 +879,4 @@ AmrLevelMaxEnum, AmrLagEnum, - AmrRadiusLevelMaxEnum, AmrBamgEnum, AmrHminEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 22275) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 22276) @@ -852,5 +852,4 @@ case AmrLevelMaxEnum : return "AmrLevelMax"; case AmrLagEnum : return "AmrLag"; - case AmrRadiusLevelMaxEnum : return "AmrRadiusLevelMax"; case AmrBamgEnum : return "AmrBamg"; case AmrHminEnum : return "AmrHmin"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 22275) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 22276) @@ -866,8 +866,8 @@ else if (strcmp(name,"TransientAmrFrequency")==0) return TransientAmrFrequencyEnum; else if (strcmp(name,"AmrType")==0) return AmrTypeEnum; + else if (strcmp(name,"AmrRestart")==0) return AmrRestartEnum; else if (strcmp(name,"AmrNeopz")==0) return AmrNeopzEnum; else if (strcmp(name,"AmrLevelMax")==0) return AmrLevelMaxEnum; else if (strcmp(name,"AmrLag")==0) return AmrLagEnum; - else if (strcmp(name,"AmrRadiusLevelMax")==0) return AmrRadiusLevelMaxEnum; else if (strcmp(name,"AmrBamg")==0) return AmrBamgEnum; else if (strcmp(name,"AmrHmin")==0) return AmrHminEnum; @@ -886,6 +886,8 @@ else if (strcmp(name,"AmrThicknessErrorResolution")==0) return AmrThicknessErrorResolutionEnum; else if (strcmp(name,"AmrThicknessErrorThreshold")==0) return AmrThicknessErrorThresholdEnum; + else if (strcmp(name,"AmrThicknessErrorMaximum")==0) return AmrThicknessErrorMaximumEnum; else if (strcmp(name,"AmrDeviatoricErrorResolution")==0) return AmrDeviatoricErrorResolutionEnum; else if (strcmp(name,"AmrDeviatoricErrorThreshold")==0) return AmrDeviatoricErrorThresholdEnum; + else if (strcmp(name,"AmrDeviatoricErrorMaximum")==0) return AmrDeviatoricErrorMaximumEnum; else if (strcmp(name,"DeviatoricStressErrorEstimator")==0) return DeviatoricStressErrorEstimatorEnum; else if (strcmp(name,"ThicknessErrorEstimator")==0) return ThicknessErrorEstimatorEnum; @@ -996,10 +998,10 @@ else if (strcmp(name,"SteadystateSolution")==0) return SteadystateSolutionEnum; else if (strcmp(name,"SurfaceSlopeSolution")==0) return SurfaceSlopeSolutionEnum; - else if (strcmp(name,"SmoothAnalysis")==0) return SmoothAnalysisEnum; - else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum; else stage=9; } if(stage==9){ - if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum; + if (strcmp(name,"SmoothAnalysis")==0) return SmoothAnalysisEnum; + else if (strcmp(name,"ThermalAnalysis")==0) return ThermalAnalysisEnum; + else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum; else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum; else if (strcmp(name,"UzawaPressureAnalysis")==0) return UzawaPressureAnalysisEnum; Index: /issm/trunk-jpl/src/m/classes/amrneopz.m =================================================================== --- /issm/trunk-jpl/src/m/classes/amrneopz.m (revision 22275) +++ /issm/trunk-jpl/src/m/classes/amrneopz.m (revision 22276) @@ -7,5 +7,4 @@ properties (SetAccess=public) level_max = 0; - radius_level_max = 0; gradation = 0; lag = 0; @@ -57,4 +56,7 @@ %end + %2017 November 24th + %radius_level_max was deleted! + %end% }}} end @@ -72,5 +74,4 @@ %filter parameters: self.level_max = 2; - self.radius_level_max= 10000; self.gradation = 1.5; self.lag = 1.1; @@ -88,5 +89,4 @@ md = checkfield(md,'fieldname','amr.level_max','numel',[1],'>=',0,'<=',5); - md = checkfield(md,'fieldname','amr.radius_level_max','numel',[1],'>',0,'NaN',1,'Inf',1); md = checkfield(md,'fieldname','amr.gradation','numel',[1],'>=',1.1,'<=',5.0,'NaN',1); md = checkfield(md,'fieldname','amr.lag','numel',[1],'>=',1.0,'<=',3.0,'NaN',1); @@ -103,5 +103,4 @@ fielddisplay(self,'level_max',['maximum refinement level (1, 2, 3, 4 or 5)']); - fielddisplay(self,'radius_level_max',['region which will be refined with level_max [ m ]']); fielddisplay(self,'gradation',['maximum ratio between two adjacent edges']); fielddisplay(self,'lag',['lag used to unrefine the elements']); @@ -118,5 +117,4 @@ WriteData(fid,prefix,'name','md.amr.type','data',2,'format','Integer'); WriteData(fid,prefix,'object',self,'class','amr','fieldname','level_max','format','Integer'); - WriteData(fid,prefix,'object',self,'class','amr','fieldname','radius_level_max','format','Double'); WriteData(fid,prefix,'object',self,'class','amr','fieldname','gradation','format','Double'); WriteData(fid,prefix,'object',self,'class','amr','fieldname','lag','format','Double'); @@ -132,5 +130,4 @@ writejsdouble(fid,[modelname '.amr.level_max'],self.level_max); - writejsdouble(fid,[modelname '.amr.radius_level_max'],self.radius_level_max); writejsdouble(fid,[modelname '.amr.gradation'],self.gradation); writejsdouble(fid,[modelname '.amr.lag'],self.lag);