Changeset 5989


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

Deleted NewElementMatrix. Direct call to constructor now

Location:
issm/trunk/src/c
Files:
1 deleted
11 edited

Legend:

Unmodified
Added
Removed

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

    r5986 r5989  
    272272                                        ./shared/Elements/GetGlobalDofList.cpp\
    273273                                        ./shared/Elements/GetNumberOfDofs.cpp\
    274                                         ./shared/Elements/NewElementMatrix.cpp\
    275274                                        ./shared/String/DescriptorIndex.cpp\
    276275                                        ./shared/String/sharedstring.h\
    … …  
    831830                                        ./shared/Elements/GetGlobalDofList.cpp\
    832831                                        ./shared/Elements/GetNumberOfDofs.cpp\
    833                                         ./shared/Elements/NewElementMatrix.cpp\
    834832                                        ./shared/String/DescriptorIndex.cpp\
    835833                                        ./shared/String/sharedstring.h\

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

    r5986 r5989  
    20052005        /*Initialize Element matrix and return if necessary*/
    20062006        if(IsOnWater()) return NULL;
    2007         ElementMatrix* Ke1=NewElementMatrix(pentabase->nodes,NUMVERTICES,this->parameters,MacAyealApproximationEnum);
    2008         ElementMatrix* Ke2=NewElementMatrix(this->nodes     ,NUMVERTICES,this->parameters,PattynApproximationEnum);
     2007        ElementMatrix* Ke1=new ElementMatrix(pentabase->nodes,NUMVERTICES,this->parameters,MacAyealApproximationEnum);
     2008        ElementMatrix* Ke2=new ElementMatrix(this->nodes     ,NUMVERTICES,this->parameters,PattynApproximationEnum);
    20092009        ElementMatrix* Ke=new ElementMatrix(Ke1,Ke2);
    20102010        delete Ke1; delete Ke2;
    … …  
    20732073
    20742074        /*compute all stiffness matrices for this element*/
    2075         ElementMatrix* Ke1=NewElementMatrix(this->nodes,NUMVERTICES,this->parameters,PattynApproximationEnum);
    2076         ElementMatrix* Ke2=NewElementMatrix(this->nodes,NUMVERTICES,this->parameters,StokesApproximationEnum);
     2075        ElementMatrix* Ke1=new ElementMatrix(this->nodes,NUMVERTICES,this->parameters,PattynApproximationEnum);
     2076        ElementMatrix* Ke2=new ElementMatrix(this->nodes,NUMVERTICES,this->parameters,StokesApproximationEnum);
    20772077        ElementMatrix* Ke=new ElementMatrix(Ke1,Ke2);
    20782078        delete Ke1;
    … …  
    21412141        /*Initialize Element matrix and return if necessary*/
    21422142        if(IsOnWater()) return NULL;
    2143         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
     2143        ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
    21442144
    21452145        /*Spawn 3 beam elements: */
    … …  
    22572257        /*Initialize Element matrix and return if necessary*/
    22582258        if(IsOnWater()) return NULL;
    2259         ElementMatrix* Ke=NewElementMatrix(tria->nodes,NUMVERTICES2D,this->parameters,MacAyealApproximationEnum);
     2259        ElementMatrix* Ke=new ElementMatrix(tria->nodes,NUMVERTICES2D,this->parameters,MacAyealApproximationEnum);
    22602260
    22612261        /*Retrieve all inputs and parameters*/
    … …  
    23732373        /*Initialize Element matrix and return if necessary*/
    23742374        if(IsOnWater()) return NULL;
    2375         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES,this->parameters,PattynApproximationEnum);
     2375        ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,PattynApproximationEnum);
    23762376
    23772377        /*Retrieve all inputs and parameters*/
    … …  
    24812481        inputs->GetParameterValue(&approximation,ApproximationEnum);
    24822482        if(IsOnWater() || (approximation!=StokesApproximationEnum && approximation!=PattynStokesApproximationEnum)) return NULL;
    2483         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES,this->parameters,StokesApproximationEnum);
     2483        ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,StokesApproximationEnum);
    24842484
    24852485        /*Retrieve all inputs and parameters*/
    … …  
    25492549        inputs->GetParameterValue(&approximation,ApproximationEnum);
    25502550        if(IsOnWater() || IsOnShelf() || !IsOnBed() || (approximation!=StokesApproximationEnum && approximation!=PattynStokesApproximationEnum)) return NULL;
    2551         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES,this->parameters,StokesApproximationEnum);
     2551        ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,StokesApproximationEnum);
    25522552
    25532553        /*Retrieve all inputs and parameters*/
    … …  
    26402640        /*Initialize Element matrix and return if necessary*/
    26412641        if(IsOnWater()) return NULL;
    2642         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
     2642        ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
    26432643
    26442644        /*Retrieve all inputs and parameters*/
    … …  
    27812781        /*Initialize Element matrix and return if necessary*/
    27822782        if(IsOnWater()) return NULL;
    2783         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
     2783        ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
    27842784
    27852785        /*Retrieve all inputs and parameters*/

  • 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*/

  • issm/trunk/src/c/objects/Loads/Numericalflux.cpp

    r5986 r5989  
    444444        Tria*  tria=(Tria*)element;
    445445        if(tria->IsOnWater()) return NULL;
    446         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES_INTERNAL,this->parameters);
     446        ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES_INTERNAL,this->parameters);
    447447
    448448        /*Retrieve all inputs and parameters*/
    … …  
    515515        Tria*  tria=(Tria*)element;
    516516        if(tria->IsOnWater()) return NULL;
    517         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES_BOUNDARY,this->parameters);
     517        ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES_BOUNDARY,this->parameters);
    518518
    519519        /*Retrieve all inputs and parameters*/

  • issm/trunk/src/c/objects/Loads/Pengrid.cpp

    r5986 r5989  
    545545        penta->inputs->GetParameterValue(&approximation,ApproximationEnum);
    546546        if(approximation!=StokesApproximationEnum) return NULL;
    547         ElementMatrix* Ke=NewElementMatrix(&node,1,this->parameters,StokesApproximationEnum);
     547        ElementMatrix* Ke=new ElementMatrix(&node,1,this->parameters,StokesApproximationEnum);
    548548
    549549        /*Retrieve all inputs and parameters*/
    … …  
    572572        /*check that pengrid is not a clone (penalty to be added only once)*/
    573573        if (node->IsClone()) return NULL;
    574         ElementMatrix* Ke=NewElementMatrix(&node,1,this->parameters);
     574        ElementMatrix* Ke=new ElementMatrix(&node,1,this->parameters);
    575575
    576576        /*Retrieve all inputs and parameters*/
    … …  
    599599        /*Initialize Element matrix and return if necessary*/
    600600        if(!this->active) return NULL;
    601         ElementMatrix* Ke=NewElementMatrix(&node,NUMVERTICES,this->parameters);
     601        ElementMatrix* Ke=new ElementMatrix(&node,NUMVERTICES,this->parameters);
    602602
    603603        /*recover parameters: */

  • issm/trunk/src/c/objects/Loads/Penpair.cpp

    r5940 r5989  
    312312
    313313        /*Initialize Element vector and return if necessary*/
    314         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES,this->parameters);
     314        ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters);
    315315
    316316        /*recover parameters: */
    … …  
    339339
    340340        /*Initialize Element vector and return if necessary*/
    341         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES,this->parameters);
     341        ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters);
    342342
    343343        /*recover parameters: */

  • issm/trunk/src/c/objects/Loads/Riftfront.cpp

    r5986 r5989  
    499499        /*Initialize Element Matrix*/
    500500        if(!this->active) return NULL;
    501         ElementMatrix* Ke=NewElementMatrix(nodes,NUMVERTICES,this->parameters);
     501        ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters);
    502502
    503503        /*Get some parameters: */

  • issm/trunk/src/c/objects/Numerics/ElementMatrix.cpp

    r5885 r5989  
    188188}
    189189/*}}}*/
    190 /*FUNCTION ElementMatrix::ElementMatrix(bool square,int* in_gglobaldoflist,int gsize){{{1*/
    191 ElementMatrix::ElementMatrix(bool square,int* in_gglobaldoflist,int gsize){
    192 
    193         if(square=false)ISSMERROR(" calling square constructor with false square flag!");
    194 
    195         this->nrows=gsize;
    196         this->ncols=gsize;
     190/*FUNCTION ElementMatrix::ElementMatrix(Node** nodes,int numnodes,Parameters* parameters,int approximation){{{1*/
     191ElementMatrix::ElementMatrix(Node** nodes,int numnodes,Parameters* parameters,int approximation){
     192
     193        /*retrieve some parameters: */
     194        parameters->FindParam(&kff,KffEnum);
     195
     196        /*get Matrix size and properties*/
    197197        this->square=true;
    198         this->kff=false;
     198        this->nrows=GetNumberOfDofs(nodes,numnodes,GsetEnum,approximation);
     199        this->ncols=this->nrows;
    199200
    200201        /*fill values with 0: */
    201202        this->values=(double*)xcalloc(this->nrows*this->ncols,sizeof(double));
    202        
    203         if(this->nrows){
    204                 this->gglobaldoflist=(int*)xmalloc(this->nrows*sizeof(int));
    205                 memcpy(this->gglobaldoflist,in_gglobaldoflist,this->nrows*sizeof(int));
    206         }
    207         else{
    208                 this->gglobaldoflist=NULL;
    209         }
    210 
    211         /*don't do rows and cols, because kff is false:*/
    212         this->row_fsize=0;
    213         this->row_flocaldoflist=NULL;
    214         this->row_fglobaldoflist=NULL;
    215         this->row_ssize=0;
    216         this->row_slocaldoflist=NULL;
    217         this->row_sglobaldoflist=NULL;
    218        
    219         this->col_fsize=0;
    220         this->col_flocaldoflist=NULL;
    221         this->col_fglobaldoflist=NULL;
    222         this->col_ssize=0;
    223         this->col_slocaldoflist=NULL;
    224         this->col_sglobaldoflist=NULL;
    225 
    226 }
    227 /*}}}*/
    228 /*FUNCTION ElementMatrix::ElementMatrix(bool square,int* in_gglobaldoflist,int gsize,int* flocaldoflist,int* fglobaldoflist,int fsize,int* slocaldoflist,int* sglobaldoflist,int ssize){{{1*/
    229 ElementMatrix::ElementMatrix(bool square,int* in_gglobaldoflist,int gsize,int* flocaldoflist,int* fglobaldoflist,int fsize,int* slocaldoflist,int* sglobaldoflist,int ssize){
    230 
    231         if(square=false)ISSMERROR(" calling square constructor with false square flag!");
    232         ISSMASSERT(gsize);
    233 
    234         this->nrows=gsize;
    235         this->ncols=gsize;
    236         this->square=true;
    237         this->kff=true;
    238 
    239         /*fill values with 0: */
    240         this->values=(double*)xcalloc(this->nrows*this->ncols,sizeof(double));
    241 
    242         /*g dofs*/
    243         this->gglobaldoflist=(int*)xmalloc(gsize*sizeof(int));
    244         memcpy(this->gglobaldoflist,in_gglobaldoflist,gsize*sizeof(int));
    245 
    246         /*row dofs: */
    247         this->row_fsize=fsize;
    248         if(fsize){
    249                 this->row_flocaldoflist=(int*)xmalloc(fsize*sizeof(int));
    250                 this->row_fglobaldoflist=(int*)xmalloc(fsize*sizeof(int));
    251                 memcpy(this->row_flocaldoflist,flocaldoflist,fsize*sizeof(int));
    252                 memcpy(this->row_fglobaldoflist,fglobaldoflist,fsize*sizeof(int));
    253         }
    254         else{
     203
     204        /*g list*/
     205        this->gglobaldoflist=GetGlobalDofList(nodes,numnodes,GsetEnum,approximation);
     206
     207        /*get dof lists for f and s set: */
     208        if(kff){
     209                this->row_fsize=GetNumberOfDofs(nodes,numnodes,FsetEnum,approximation);
     210                this->row_flocaldoflist =GetLocalDofList( nodes,numnodes,FsetEnum,approximation);
     211                this->row_fglobaldoflist=GetGlobalDofList(nodes,numnodes,FsetEnum,approximation);
     212                this->row_ssize=GetNumberOfDofs(nodes,numnodes,SsetEnum,approximation);
     213                this->row_slocaldoflist =GetLocalDofList( nodes,numnodes,SsetEnum,approximation);
     214                this->row_sglobaldoflist=GetGlobalDofList(nodes,numnodes,SsetEnum,approximation);
     215        }
     216        else{
     217                this->row_fsize=0;
    255218                this->row_flocaldoflist=NULL;
    256219                this->row_fglobaldoflist=NULL;
    257         }
    258 
    259         this->row_ssize=ssize;
    260         if(ssize){
    261                 this->row_slocaldoflist=(int*)xmalloc(ssize*sizeof(int));
    262                 this->row_sglobaldoflist=(int*)xmalloc(ssize*sizeof(int));
    263                 memcpy(this->row_slocaldoflist,slocaldoflist,ssize*sizeof(int));
    264                 memcpy(this->row_sglobaldoflist,sglobaldoflist,ssize*sizeof(int));
    265         }
    266         else{
     220                this->row_ssize=0;
    267221                this->row_slocaldoflist=NULL;
    268222                this->row_sglobaldoflist=NULL;
    269223        }
    270224
    271         /*don't do cols, we can pick them up from the rows: */
     225        /*Because this matrix is "square" don't do cols, we can pick them up from the rows: */
    272226        this->col_fsize=0;
    273227        this->col_flocaldoflist=NULL;

  • issm/trunk/src/c/objects/Numerics/ElementMatrix.h

    r5885 r5989  
    1313#include "../Object.h"
    1414#include "../../toolkits/toolkits.h"
     15#include "../../EnumDefinitions/EnumDefinitions.h"
     16class Node;
    1517/*}}}*/
    1618
    … …  
    5254                ElementMatrix(ElementMatrix* Ke1,ElementMatrix* Ke2);
    5355                ElementMatrix(ElementMatrix* Ke1,ElementMatrix* Ke2,ElementMatrix* Ke3);
    54                 ElementMatrix(bool square,int* gglobaldoflist,int gsize);
    55                 ElementMatrix(bool square,int* gglobaldoflist,int gsize,int* flocaldoflist,int* fglobaldoflist,int fsize,int* slocaldoflist,int* sglobaldoflist,int ssize);
     56                ElementMatrix(Node** nodes,int numnodes,Parameters* parameters,int approximation=NoneApproximationEnum);
    5657                ~ElementMatrix();
    5758                /*}}}*/

  • issm/trunk/src/c/objects/Numerics/ElementVector.cpp

    r5986 r5989  
    137137        parameters->FindParam(&this->pf,KffEnum);
    138138
    139         /*get number of dofs in sets g,f and s: */
     139        /*get Vector size and properties*/
    140140        this->nrows=GetNumberOfDofs(nodes,numnodes,GsetEnum,approximation);
    141141
    … …  
    143143        this->values=(double*)xcalloc(this->nrows,sizeof(double));
    144144       
     145        /*g list*/
     146        this->gglobaldoflist=GetGlobalDofList(nodes,numnodes,GsetEnum,approximation);
     147
    145148        /*Get fsize*/
    146         if(pf) fsize=GetNumberOfDofs(nodes,numnodes,FsetEnum,approximation);
    147         else   fsize=0;
    148 
    149         /*get dof lists for f and s set: */
    150         gglobaldoflist=GetGlobalDofList(nodes,numnodes,GsetEnum,approximation);
    151149        if(pf){
    152                 flocaldoflist =GetLocalDofList( nodes,numnodes,FsetEnum,approximation);
    153                 fglobaldoflist=GetGlobalDofList(nodes,numnodes,FsetEnum,approximation);
    154         }
    155         else{
    156                 flocaldoflist =NULL;
    157                 fglobaldoflist=NULL;
     150                this->fsize=GetNumberOfDofs(nodes,numnodes,FsetEnum,approximation);
     151                this->flocaldoflist =GetLocalDofList( nodes,numnodes,FsetEnum,approximation);
     152                this->fglobaldoflist=GetGlobalDofList(nodes,numnodes,FsetEnum,approximation);
     153        }
     154        else{
     155                this->fsize=0;
     156                this->flocaldoflist =NULL;
     157                this->fglobaldoflist=NULL;
    158158        }
    159159}

  • issm/trunk/src/c/shared/Elements/elements.h

    r5986 r5989  
    1111class ElementVector;
    1212
    13 double         Paterson(double temperature);
    14 int            GetVerticesCoordinates(double* xyz,  Node** nodes, int numvertices);
    15 int            GetNumberOfDofs( Node** nodes,int numnodes,int setenum,int approximation_enum);
    16 int*           GetLocalDofList( Node** nodes,int numnodes,int setenum,int approximation_enum);
    17 int*           GetGlobalDofList(Node** nodes,int numnodes,int setenum,int approximation_enum);
    18 ElementMatrix* NewElementMatrix(Node** nodes,int numnodes,Parameters* parameters,int approximation=NoneApproximationEnum);
     13double Paterson(double temperature);
     14int    GetVerticesCoordinates(double* xyz,  Node** nodes, int numvertices);
     15int    GetNumberOfDofs( Node** nodes,int numnodes,int setenum,int approximation_enum);
     16int*   GetLocalDofList( Node** nodes,int numnodes,int setenum,int approximation_enum);
     17int*   GetGlobalDofList(Node** nodes,int numnodes,int setenum,int approximation_enum);
    1918
    2019inline void printarray(double* array,int lines,int cols=1){
Note: See TracChangeset for help on using the changeset viewer.