Changeset 25454


Ignore:
Timestamp:
08/24/20 16:24:50 (5 years ago)
Author:
Mathieu Morlighem
Message:

CHG: renaming AdaptiveMeshRefinement AmrNeopz

Location:
issm/trunk-jpl/src/c
Files:
4 edited
2 moved

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/Makefile.am

    r25379 r25454  
    604604#}}}
    605605#NEOPZ sources  {{{
    606 neopz_sources = ./classes/AdaptiveMeshRefinement.cpp
     606neopz_sources = ./classes/AmrNeopz.cpp
    607607#}}}
    608608#Modules sources{{{

  • issm/trunk-jpl/src/c/classes/AmrNeopz.cpp

    r25453 r25454  
    99#endif
    1010
    11 #include "./AdaptiveMeshRefinement.h"
     11#include "./AmrNeopz.h"
    1212
    1313/*Includes*/
    … …  
    4242
    4343/*Constructor, copy, clean up and destructor*/
    44 AdaptiveMeshRefinement::AdaptiveMeshRefinement(){/*{{{*/
     44AmrNeopz::AmrNeopz(){/*{{{*/
    4545
    4646        /*Set pointers to NULL*/
    … …  
    6767}
    6868/*}}}*/
    69 AdaptiveMeshRefinement::AdaptiveMeshRefinement(const AdaptiveMeshRefinement &cp){/*{{{*/
     69AmrNeopz::AmrNeopz(const AmrNeopz &cp){/*{{{*/
    7070        this->Initialize();
    7171        this->operator =(cp);
    7272}
    7373/*}}}*/
    74 AdaptiveMeshRefinement & AdaptiveMeshRefinement::operator =(const AdaptiveMeshRefinement &cp){/*{{{*/
     74AmrNeopz & AmrNeopz::operator =(const AmrNeopz &cp){/*{{{*/
    7575
    7676        /*Clean all attributes*/
    … …  
    102102}
    103103/*}}}*/
    104 AdaptiveMeshRefinement::~AdaptiveMeshRefinement(){/*{{{*/
     104AmrNeopz::~AmrNeopz(){/*{{{*/
    105105        int writemesh = 0;//only to restart
    106106        if(writemesh) this->WriteMesh();
    … …  
    109109}
    110110/*}}}*/
    111 void AdaptiveMeshRefinement::CleanUp(){/*{{{*/
     111void AmrNeopz::CleanUp(){/*{{{*/
    112112
    113113        /*Verify and delete all data*/
    … …  
    136136
    137137/*Mesh refinement methods*/
    138 void AdaptiveMeshRefinement::SetMesh(int** elementslist_in,IssmDouble** x_in,IssmDouble** y_in,int* numberofvertices_in,int* numberofelements_in){/*{{{*/
     138void AmrNeopz::SetMesh(int** elementslist_in,IssmDouble** x_in,IssmDouble** y_in,int* numberofvertices_in,int* numberofelements_in){/*{{{*/
    139139   
    140140   /*Delete previous mesh and keep the entire mesh*/
    … …  
    149149   this->numberofelements  = *numberofelements_in;
    150150}/*}}}*/
    151 void AdaptiveMeshRefinement::GetMesh(int** elementslist_out,IssmDouble** x_out,IssmDouble** y_out,int* numberofvertices_out,int* numberofelements_out){/*{{{*/
     151void AmrNeopz::GetMesh(int** elementslist_out,IssmDouble** x_out,IssmDouble** y_out,int* numberofvertices_out,int* numberofelements_out){/*{{{*/
    152152   
    153153   /*Get the entire mesh*/
    … …  
    158158   *numberofelements_out= this->numberofelements;
    159159}/*}}}*/
    160 void AdaptiveMeshRefinement::ExecuteRefinement(double* gl_distance,double* if_distance,double* deviatoricerror,double* thicknesserror,int** pdatalist,double** pxylist,int** pelementslist){/*{{{*/
     160void AmrNeopz::ExecuteRefinement(double* gl_distance,double* if_distance,double* deviatoricerror,double* thicknesserror,int** pdatalist,double** pxylist,int** pelementslist){/*{{{*/
    161161
    162162        /*IMPORTANT! pelementslist are in Matlab indexing*/
    … …  
    187187}
    188188/*}}}*/
    189 void AdaptiveMeshRefinement::RefineMeshOneLevel(bool &verbose,double* gl_distance,double* if_distance,double* deviatoricerror,double* thicknesserror){/*{{{*/
     189void AmrNeopz::RefineMeshOneLevel(bool &verbose,double* gl_distance,double* if_distance,double* deviatoricerror,double* thicknesserror){/*{{{*/
    190190
    191191        /*Intermediaries*/
    … …  
    370370}
    371371/*}}}*/
    372 int AdaptiveMeshRefinement::VerifyRefinementType(TPZGeoEl* geoel,TPZGeoMesh* gmesh){/*{{{*/
     372int AmrNeopz::VerifyRefinementType(TPZGeoEl* geoel,TPZGeoMesh* gmesh){/*{{{*/
    373373
    374374        /*
    … …  
    401401}
    402402/*}}}*/
    403 void AdaptiveMeshRefinement::RefineMeshWithSmoothing(bool &verbose,TPZGeoMesh* gmesh){/*{{{*/
     403void AmrNeopz::RefineMeshWithSmoothing(bool &verbose,TPZGeoMesh* gmesh){/*{{{*/
    404404
    405405        /*Intermediaries*/
    … …  
    451451}
    452452/*}}}*/
    453 void AdaptiveMeshRefinement::RefineMeshToAvoidHangingNodes(bool &verbose,TPZGeoMesh* gmesh){/*{{{*/
     453void AmrNeopz::RefineMeshToAvoidHangingNodes(bool &verbose,TPZGeoMesh* gmesh){/*{{{*/
    454454
    455455        /*Now, insert special elements to avoid hanging nodes*/
    … …  
    489489}
    490490/*}}}*/
    491 void AdaptiveMeshRefinement::DeleteSpecialElements(bool &verbose,TPZGeoMesh* gmesh){/*{{{*/
     491void AmrNeopz::DeleteSpecialElements(bool &verbose,TPZGeoMesh* gmesh){/*{{{*/
    492492
    493493        /*Intermediaries*/
    … …  
    510510}
    511511/*}}}*/
    512 void AdaptiveMeshRefinement::GetMesh(TPZGeoMesh* gmesh,int** pdata,double** pxy, int** pelements){/*{{{*/
     512void AmrNeopz::GetMesh(TPZGeoMesh* gmesh,int** pdata,double** pxy, int** pelements){/*{{{*/
    513513
    514514        /* IMPORTANT! pelements are in Matlab indexing
    … …  
    611611}
    612612/*}}}*/
    613 void AdaptiveMeshRefinement::Initialize(){/*{{{*/
     613void AmrNeopz::Initialize(){/*{{{*/
    614614
    615615        /* IMPORTANT! elements come in Matlab indexing
    … …  
    665665}
    666666/*}}}*/
    667 TPZGeoMesh* AdaptiveMeshRefinement::CreateRefPatternMesh(TPZGeoMesh* gmesh){/*{{{*/
     667TPZGeoMesh* AmrNeopz::CreateRefPatternMesh(TPZGeoMesh* gmesh){/*{{{*/
    668668
    669669        TPZGeoMesh *newgmesh = new TPZGeoMesh();
    … …  
    756756}
    757757/*}}}*/
    758 void AdaptiveMeshRefinement::CheckMesh(int** pdata,double** pxy,int** pelements){/*{{{*/
     758void AmrNeopz::CheckMesh(int** pdata,double** pxy,int** pelements){/*{{{*/
    759759
    760760        /*Basic verification*/
    … …  
    766766}
    767767/*}}}*/
    768 void AdaptiveMeshRefinement::PrintGMeshVTK(TPZGeoMesh* gmesh,std::ofstream &file,bool matColor){/*{{{*/
     768void AmrNeopz::PrintGMeshVTK(TPZGeoMesh* gmesh,std::ofstream &file,bool matColor){/*{{{*/
    769769
    770770        file.clear();
    … …  
    851851}
    852852/*}}}*/
    853 int AdaptiveMeshRefinement::GetVTK_ElType(TPZGeoEl * gel){/*{{{*/
     853int AmrNeopz::GetVTK_ElType(TPZGeoEl * gel){/*{{{*/
    854854
    855855        MElementType pzElType = gel->Type();
    … …  
    915915}
    916916/*}}}*/
    917 void AdaptiveMeshRefinement::ReadMesh(){/*{{{*/
     917void AmrNeopz::ReadMesh(){/*{{{*/
    918918
    919919        std::string fathermeshfile              = "/home/santos/issm_fathermesh.txt";
    … …  
    957957}
    958958/*}}}*/
    959 void AdaptiveMeshRefinement::WriteMesh(){/*{{{*/
     959void AmrNeopz::WriteMesh(){/*{{{*/
    960960
    961961        std::string fathermeshfile              = "/home/santos/issm_fathermesh.txt";

  • issm/trunk-jpl/src/c/classes/AmrNeopz.h

    r25453 r25454  
    1 #ifndef ADAPTIVEMESHREFINEMENT
    2 #define ADAPTIVEMESHREFINEMENT
     1#ifndef AMRNEOPZ
     2#define AMRNEOPZ
    33
    44/*Includes*/
    … …  
    1010/*}}}*/
    1111
    12 class AdaptiveMeshRefinement{
     12class AmrNeopz{
    1313
    1414public:
    … …  
    3636        /*Public methods{{{*/
    3737        /* Constructor, destructor etc*/
    38         AdaptiveMeshRefinement();                                                                                                                       
    39         AdaptiveMeshRefinement(const AdaptiveMeshRefinement &cp);                                       
    40         AdaptiveMeshRefinement & operator= (const AdaptiveMeshRefinement &cp); 
    41         virtual ~AdaptiveMeshRefinement();                                                                                             
     38        AmrNeopz();                                                                                                                     
     39        AmrNeopz(const AmrNeopz &cp);                                   
     40        AmrNeopz & operator= (const AmrNeopz &cp);     
     41        virtual ~AmrNeopz();                                                                                           
    4242        /*General methods*/
    4343        void CleanUp();

  • issm/trunk-jpl/src/c/classes/FemModel.cpp

    r25446 r25454  
    57905790   /*Initialize refinement pattern*/
    57915791        this->SetRefPatterns();
    5792         this->amr = new AdaptiveMeshRefinement();
     5792        this->amr = new AmrNeopz();
    57935793        this->amr->refinement_type=1;//1 is refpattern; 0 is uniform (faster)
    57945794        /*Get amr parameters*/

  • issm/trunk-jpl/src/c/classes/FemModel.h

    r25379 r25454  
    2222class Elements;
    2323#if defined(_HAVE_NEOPZ_) && !defined(_HAVE_AD_)
    24 #include "./AdaptiveMeshRefinement.h"
     24#include "./AmrNeopz.h"
    2525#endif
    2626#if defined(_HAVE_BAMG_) && !defined(_HAVE_AD_)
    … …  
    5757                Nodes       **nodes_list;
    5858
    59                 //FIXME: do we want only one class and have virtual functions? or keep 2 classes, at least rename AdaptiveMeshRefinement -> AmrNeopz
     59                //FIXME: do we want only one class and have virtual functions? or keep 2 classes?
    6060                #if defined(_HAVE_NEOPZ_) && !defined(_HAVE_AD_)
    61                 AdaptiveMeshRefinement *amr;              //adaptive mesh refinement object. It keeps coarse mesh and execute refinement process
     61                AmrNeopz *amr;            //adaptive mesh refinement object. It keeps coarse mesh and execute refinement process
    6262                #endif
    6363

  • issm/trunk-jpl/src/c/shared/Enum/Enum.vim

    r25379 r25454  
    13451345
    13461346"ISSM objects
    1347 syn keyword cType AdaptiveMeshRefinement
    13481347syn keyword cType AmrBamg
     1348syn keyword cType AmrNeopz
    13491349syn keyword cType ArrayInput
    13501350syn keyword cType BoolInput
Note: See TracChangeset for help on using the changeset viewer.