Ignore:
Timestamp:
09/23/10 13:13:08 (14 years ago)
Author:
Mathieu Morlighem
Message:

Deleted NewElementMatrix. Direct call to constructor now

File:
1 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/objects/Elements/Tria.cpp

    r5986 r5989  
    24252425        /*Initialize Element matrix and return if necessary*/
    24262426        if(IsOnWater()) return NULL;
    2427         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
     2427        ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
    24282428
    24292429        /*Retrieve all Inputs and parameters: */
    … …  
    25302530        /*Initialize Element matrix and return if necessary*/
    25312531        if(IsOnWater()) return NULL;
    2532         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
     2532        ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
    25332533
    25342534        /*Retrieve all inputs and parameters*/
    … …  
    25972597        /*Initialize Element matrix and return if necessary*/
    25982598        if(IsOnWater()) return NULL;
    2599         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
     2599        ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
    26002600
    26012601        /*Retrieve all inputs and parameters*/
    … …  
    27292729        /*Initialize Element matrix and return if necessary*/
    27302730        if(IsOnWater()) return NULL;
    2731         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES,this->parameters,MacAyealApproximationEnum);
     2731        ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,MacAyealApproximationEnum);
    27322732
    27332733        /*Retrieve all inputs and parameters*/
    … …  
    27972797        /*Initialize Element matrix and return if necessary*/
    27982798        if(IsOnWater() || IsOnShelf()) return NULL;
    2799         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES,this->parameters,MacAyealApproximationEnum);
     2799        ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,MacAyealApproximationEnum);
    28002800
    28012801        /*Retrieve all inputs and parameters*/
    … …  
    28682868        /*Initialize Element matrix and return if necessary*/
    28692869        if(IsOnWater() || IsOnShelf()) return NULL;
    2870         ElementMatrix* Ke1=NewElementMatrix(nodes,NUMVERTICES,this->parameters,MacAyealApproximationEnum);
    2871         ElementMatrix* Ke2=NewElementMatrix(nodes,NUMVERTICES,this->parameters,PattynApproximationEnum);
     2870        ElementMatrix* Ke1=new ElementMatrix(nodes,NUMVERTICES,this->parameters,MacAyealApproximationEnum);
     2871        ElementMatrix* Ke2=new ElementMatrix(nodes,NUMVERTICES,this->parameters,PattynApproximationEnum);
    28722872        ElementMatrix* Ke=new ElementMatrix(Ke1,Ke2);
    28732873        delete Ke1; delete Ke2;
    … …  
    29572957        /*Initialize Element matrix and return if necessary*/
    29582958        if(IsOnWater() || IsOnShelf()) return NULL;
    2959         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES,this->parameters,PattynApproximationEnum);
     2959        ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,PattynApproximationEnum);
    29602960
    29612961        /*Retrieve all inputs and parameters*/
    … …  
    30173017        /*Initialize Element matrix and return if necessary*/
    30183018        if(IsOnWater()) return NULL;
    3019         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
     3019        ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
    30203020
    30213021        /*Create Element matrix*/
    … …  
    30473047        /*Initialize Element matrix and return if necessary*/
    30483048        if(IsOnWater()) return NULL;
    3049         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
     3049        ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
    30503050
    30513051        /*Retrieve all inputs and parameters*/
    … …  
    30973097        /*Initialize Element matrix and return if necessary*/
    30983098        if(IsOnWater()) return NULL;
    3099         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
     3099        ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
    31003100
    31013101        /*Retrieve all inputs and parameters*/
    … …  
    31683168        /*Initialize Element matrix and return if necessary*/
    31693169        if(IsOnWater()) return NULL;
    3170         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
     3170        ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
    31713171
    31723172        /*Retrieve all inputs and parameters*/
    … …  
    32873287        /*Initialize Element matrix and return if necessary*/
    32883288        if(IsOnWater()) return NULL;
    3289         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
     3289        ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
    32903290
    32913291        /*Retrieve all inputs and parameters*/
    … …  
    33623362        /*Initialize Element matrix and return if necessary*/
    33633363        if(IsOnWater()) return NULL;
    3364         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
     3364        ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
    33653365
    33663366        GetVerticesCoordinates(&xyz_list[0][0],nodes,NUMVERTICES);
    … …  
    34103410        /*Initialize Element matrix and return if necessary*/
    34113411        if(IsOnWater() || !IsOnShelf()) return NULL;
    3412         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
     3412        ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
    34133413
    34143414        /*Retrieve all inputs and parameters*/
Note: See TracChangeset for help on using the changeset viewer.