Changeset 27101


Ignore:
Timestamp:
06/24/22 01:17:55 (3 years ago)
Author:
jdquinn
Message:

BUG: Changed deconstructor into static cleanup method

Location:
issm/trunk-jpl/src/c
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/analyses/SealevelchangeAnalysis.cpp

    r27099 r27101  
    99
    1010/*Model processing*/
    11 SealevelchangeAnalysis::~SealevelchangeAnalysis(){/*{{{*/
    12 
     11void SealevelchangeAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/
     12        /*No constraints*/
     13}/*}}}*/
     14void SealevelchangeAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/
     15        /*No loads*/
     16}/*}}}*/
     17void SealevelchangeAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel,bool isamr){/*{{{*/
     18        ::CreateNodes(nodes,iomodel,SealevelchangeAnalysisEnum,P1Enum);
     19}/*}}}*/
     20void SealevelchangeAnalysis::DeleteBarystaticContributionsParam(FemModel* femmodel){/*{{{*/
    1321        BarystaticContributions* barycontrib=NULL;
    1422        GenericParam<BarystaticContributions*>* barycontribparam=NULL;
    … …  
    1826
    1927        delete barycontrib;
    20 }/*}}}*/
    21 void SealevelchangeAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/
    22         /*No constraints*/
    23 }/*}}}*/
    24 void SealevelchangeAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/
    25         /*No loads*/
    26 }/*}}}*/
    27 void SealevelchangeAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel,bool isamr){/*{{{*/
    28         ::CreateNodes(nodes,iomodel,SealevelchangeAnalysisEnum,P1Enum);
    2928}/*}}}*/
    3029int  SealevelchangeAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/

  • issm/trunk-jpl/src/c/analyses/SealevelchangeAnalysis.h

    r27100 r27101  
    1313        public:
    1414                /*Model processing*/
    15                 ~SealevelchangeAnalysis();
    1615                void CreateConstraints(Constraints* constraints,IoModel* iomodel);
    1716                void CreateLoads(Loads* loads, IoModel* iomodel);
    1817                void CreateNodes(Nodes* nodes,IoModel* iomodel,bool isamr=false);
     18                static void DeleteBarystaticContributionsParam(FemModel* femmodel);
    1919                int  DofsPerNode(int** doflist,int domaintype,int approximation);
    2020                void UpdateElements(Elements* elements,Inputs* inputs,IoModel* iomodel,int analysis_counter,int analysis_type);

  • issm/trunk-jpl/src/c/cores/sealevelchange_core.cpp

    r27097 r27101  
    8282        femmodel->profiler->Stop(SLRCORE);
    8383
    84         /*Free ressources:*/
     84        /*Free resources:*/
     85        SealevelchangeAnalysis::DeleteBarystaticContributionsParam(femmodel);
    8586        delete slgeom;
    86 
    8787}
    8888/*}}}*/
    … …  
    147147        }
    148148
    149         /*Free ressources:*/   
     149        /*Free resources:*/     
    150150        delete bedrock; delete bedrock_rate;
    151151        delete geoid; delete geoid_rate;
    … …  
    439439        }
    440440
    441         /*Free ressources:*/
     441        /*Free resources:*/
    442442        delete loads;
    443443        delete subelementoceanareas;
    … …  
    502502        InputUpdateFromVectorx(femmodel,sealevel,SealevelEnum,VertexSIdEnum);   
    503503
    504         /*Free ressources:*/   
     504        /*Free resources:*/     
    505505        delete sealevel;
    506506        delete deltadsl;
    … …  
    572572        femmodel->inputs->AXPY(1,BedGRDEnum,BedEnum);
    573573
    574         /*Free ressources: */
     574        /*Free resources: */
    575575        xDelete<IssmDouble>(xx);
    576576        xDelete<IssmDouble>(yy);
    … …  
    693693        femmodel->parameters->AddObject(new DoubleVecParam(AreaeEnum,areae,nel));
    694694
    695         /*Free ressources:*/
     695        /*Free resources:*/
    696696        xDelete<IssmDouble>(xxe);
    697697        xDelete<IssmDouble>(yye);
    … …  
    11281128        /*}}}*/
    11291129
    1130         /*Free ressources:{{{*/
     1130        /*Free resources:{{{*/
    11311131        if(forcings){
    11321132                for(int i=0;i<nummodels-1;i++){
    … …  
    12401240        /*}}}*/
    12411241
    1242         /*Free ressources:{{{*/
     1242        /*Free resources:{{{*/
    12431243        if(forcingglobal)xDelete<IssmDouble>(forcingglobal);
    12441244        if(forcing)xDelete<IssmDouble>(forcing);
Note: See TracChangeset for help on using the changeset viewer.