Changeset 5523


Ignore:
Timestamp:
08/23/10 15:38:15 (15 years ago)
Author:
seroussi
Message:

keep working on stokes

Location:
issm/trunk/src/c/objects
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r5518 r5523  
    22062206        }
    22072207
    2208         //if diagnostic Full-Stokes: check that the element is Stokes
    2209         if(analysis_type==DiagnosticStokesAnalysisEnum){
    2210                 ISSMASSERT(iomodel->elements_type);
    2211                 if(iomodel->elements_type[index]==StokesApproximationEnum)
    2212                  this->inputs->AddInput(new BoolInput(IsStokesEnum,true));
    2213                 else
    2214                  this->inputs->AddInput(new BoolInput(IsStokesEnum,false));
    2215         }
    2216 
    22172208}
    22182209/*}}}*/
    … …  
    29442935        bool onbed;
    29452936        bool shelf;
    2946         bool isstokes;
    29472937
    29482938        /*inputs: */
    … …  
    29582948        inputs->GetParameterValue(&onbed,ElementOnBedEnum);
    29592949        inputs->GetParameterValue(&shelf,ElementOnIceShelfEnum);
    2960         inputs->GetParameterValue(&isstokes,IsStokesEnum);
    29612950        inputs->GetParameterValue(&approximation,ApproximationEnum);
    29622951
    29632952        /*If on water or not Stokes, skip stiffness: */
    2964         if(onwater || !isstokes || approximation!=StokesApproximationEnum) return;
     2953        if(onwater || approximation!=StokesApproximationEnum) return;
    29652954
    29662955        /*recovre material parameters: */
    … …  
    41314120        bool onbed;
    41324121        bool shelf;
    4133         bool isstokes;
    41344122        int  approximation;
    41354123        Input* vx_input=NULL;
    … …  
    41424130        inputs->GetParameterValue(&onbed,ElementOnBedEnum);
    41434131        inputs->GetParameterValue(&shelf,ElementOnIceShelfEnum);
    4144         inputs->GetParameterValue(&isstokes,IsStokesEnum);
    41454132        inputs->GetParameterValue(&approximation,ApproximationEnum);
    41464133
    … …  
    41494136
    41504137        /*If on water or not Stokes, skip load: */
    4151         if(onwater || !isstokes || approximation!=StokesApproximationEnum) return;
     4138        if(onwater || approximation!=StokesApproximationEnum) return;
    41524139
    41534140        /*If on water, skip load: */

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

    r5426 r5523  
    697697        double v35[3];
    698698        double v45[3];
    699         bool isstokes;
     699        int approximation;
    700700
    701701        /*Recover hook objects: */
    … …  
    709709
    710710        /*If not Stokes, return*/
    711         penta->inputs->GetParameterValue(&isstokes,IsStokesEnum);
    712         if(!isstokes) return;
     711        penta->inputs->GetParameterValue(&approximation,ApproximationEnum);
     712        if(approximation!=StokesApproximationEnum) return;
    713713
    714714        /* Get dof list and node coordinates: */

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

    r5510 r5523  
    574574        double Ke[4][4]={0.0};
    575575        double penalty_offset;
    576         bool isstokes;
     576        int approximation;
    577577
    578578        /*pointers: */
    … …  
    588588
    589589        /*If not Stokes, return*/
    590         penta->inputs->GetParameterValue(&isstokes,IsStokesEnum);
    591         if(!isstokes) return;
     590        penta->inputs->GetParameterValue(&approximation,ApproximationEnum);
     591        if(approximation!=StokesApproximationEnum) return;
    592592
    593593        //recover slope: */
Note: See TracChangeset for help on using the changeset viewer.