Changeset 15724


Ignore:
Timestamp:
08/06/13 11:17:55 (12 years ago)
Author:
seroussi
Message:

CHG: changed from FSApproximationEnum to FSvelocityEnum when recovering FS dof

File:
1 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

    r15714 r15724  
    67226722        /*Initialize Element matrix and return if necessary*/
    67236723        ElementMatrix* Ke1=new ElementMatrix(pentabase->nodes,NUMVERTICES,this->parameters,SSAApproximationEnum);
    6724         ElementMatrix* Ke2=new ElementMatrix(this->nodes     ,NUMVERTICES,this->parameters,FSApproximationEnum);
     6724        ElementMatrix* Ke2=new ElementMatrix(this->nodes     ,NUMVERTICES,this->parameters,FSvelocityEnum);
    67256725        ElementMatrix* Ke=new ElementMatrix(Ke1,Ke2);
    67266726        delete Ke1; delete Ke2;
    … …  
    68186818        if(IsFloating() || !IsOnBed()) return NULL;
    68196819        ElementMatrix* Ke1=new ElementMatrix(this->nodes,NUMVERTICES,this->parameters,SSAApproximationEnum);
    6820         ElementMatrix* Ke2=new ElementMatrix(this->nodes,NUMVERTICES,this->parameters,FSApproximationEnum);
     6820        ElementMatrix* Ke2=new ElementMatrix(this->nodes,NUMVERTICES,this->parameters,FSvelocityEnum);
    68216821        ElementMatrix* Ke=new ElementMatrix(Ke1,Ke2);
    68226822        delete Ke1; delete Ke2;
    … …  
    69216921        /*compute all stiffness matrices for this element*/
    69226922        ElementMatrix* Ke1=new ElementMatrix(this->nodes,NUMVERTICES,this->parameters,HOApproximationEnum);
    6923         ElementMatrix* Ke2=new ElementMatrix(this->nodes,NUMVERTICES,this->parameters,FSApproximationEnum);
     6923        ElementMatrix* Ke2=new ElementMatrix(this->nodes,NUMVERTICES,this->parameters,FSvelocityEnum);
    69246924        ElementMatrix* Ke=new ElementMatrix(Ke1,Ke2);
    69256925        delete Ke1;
    … …  
    76547654
    76557655        /*Initialize Element matrix and vectors*/
    7656         ElementMatrix* Ke     = new ElementMatrix(nodes,vnumnodes+pnumnodes,this->parameters,FSApproximationEnum);
     7656        ElementMatrix* Ke     = new ElementMatrix(nodes,vnumnodes+pnumnodes,this->parameters,FSvelocityEnum);
    76577657        IssmDouble*    B      = xNew<IssmDouble>(8*numdof);
    76587658        IssmDouble*    Bprime = xNew<IssmDouble>(8*numdof);
    … …  
    77257725
    77267726        /*Initialize Element matrix and vectors*/
    7727         ElementMatrix* Ke        = new ElementMatrix(nodes,vnumnodes+pnumnodes,this->parameters,FSApproximationEnum);
     7727        ElementMatrix* Ke        = new ElementMatrix(nodes,vnumnodes+pnumnodes,this->parameters,FSvelocityEnum);
    77287728        IssmDouble*    BFriction = xNew<IssmDouble>(2*numdof);
    77297729        IssmDouble*    D         = xNewZeroInit<IssmDouble>(2*2);
    … …  
    79097909        inputs->GetInputValue(&approximation,ApproximationEnum);
    79107910        if(approximation!=SSAFSApproximationEnum) return NULL;
    7911         ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters,FSApproximationEnum);
     7911        ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters,FSvelocityEnum);
    79127912
    79137913        /*Retrieve all inputs and parameters*/
    … …  
    79737973        inputs->GetInputValue(&approximation,ApproximationEnum);
    79747974        if(approximation!=SSAFSApproximationEnum) return NULL;
    7975         ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters,FSApproximationEnum);
     7975        ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters,FSvelocityEnum);
    79767976
    79777977        /*Retrieve all inputs and parameters*/
    … …  
    80548054        inputs->GetInputValue(&approximation,ApproximationEnum);
    80558055        if(approximation!=HOFSApproximationEnum) return NULL;
    8056         ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters,FSApproximationEnum);
     8056        ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters,FSvelocityEnum);
    80578057
    80588058        /*Retrieve all inputs and parameters*/
    … …  
    81188118        inputs->GetInputValue(&approximation,ApproximationEnum);
    81198119        if(approximation!=HOFSApproximationEnum) return NULL;
    8120         ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters,FSApproximationEnum);
     8120        ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters,FSvelocityEnum);
    81218121
    81228122        /*Retrieve all inputs and parameters*/
    … …  
    85738573
    85748574        /*Initialize Element matrix and vectors*/
    8575         ElementVector* pe     = new ElementVector(nodes,vnumnodes+pnumnodes,this->parameters,FSApproximationEnum);
     8575        ElementVector* pe     = new ElementVector(nodes,vnumnodes+pnumnodes,this->parameters,FSvelocityEnum);
    85768576        IssmDouble*    vbasis = xNew<IssmDouble>(vnumnodes);
    85778577
    … …  
    87368736
    87378737        /*Initialize Element matrix and vectors*/
    8738         ElementVector* pe     = new ElementVector(nodes,vnumnodes+pnumnodes,this->parameters,FSApproximationEnum);
     8738        ElementVector* pe     = new ElementVector(nodes,vnumnodes+pnumnodes,this->parameters,FSvelocityEnum);
    87398739        IssmDouble*    vbasis = xNew<IssmDouble>(vnumnodes);
    87408740
    … …  
    88088808
    88098809        /*Initialize Element matrix and vectors*/
    8810         ElementVector* pe     = new ElementVector(nodes,vnumnodes+pnumnodes,this->parameters,FSApproximationEnum);
     8810        ElementVector* pe     = new ElementVector(nodes,vnumnodes+pnumnodes,this->parameters,FSvelocityEnum);
    88118811        IssmDouble*    vbasis = xNew<IssmDouble>(vnumnodes);
    88128812
Note: See TracChangeset for help on using the changeset viewer.