Changeset 22519


Ignore:
Timestamp:
03/11/18 09:13:55 (7 years ago)
Author:
Mathieu Morlighem
Message:

CHG: removing old function that we don't need

Location:
issm/trunk-jpl/src/c/classes/Inputs
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/classes/Inputs/BoolInput.h

    r21974 r22519  
    5757                void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist);
    5858                int  GetInputInterpolationType(){_error_("not implemented yet!");};
    59                 IssmDouble InfinityNorm(void){_error_("InfinityNorm not implemented for booleans");};
    6059                IssmDouble Max(void){_error_("Max not implemented for booleans");};
    6160                IssmDouble MaxAbs(void){_error_("Max not implemented for booleans");};

  • issm/trunk-jpl/src/c/classes/Inputs/ControlInput.h

    r22515 r22519  
    6767                void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist,const char* data);
    6868                void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist);
    69                 IssmDouble InfinityNorm(void){_error_("not implemented yet");};
    7069                IssmDouble Max(void){_error_("not implemented yet");};
    7170                IssmDouble MaxAbs(void){_error_("not implemented yet");};

  • issm/trunk-jpl/src/c/classes/Inputs/DatasetInput.h

    r21974 r22519  
    6363                int GetResultNumberOfNodes(void){_error_("not implemented yet");};
    6464                void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist){_error_("not implemented yet");};
    65                 IssmDouble InfinityNorm(void){_error_("not implemented yet");};
    6665                IssmDouble Max(void){_error_("not implemented yet");};
    6766                IssmDouble MaxAbs(void){_error_("not implemented yet");};

  • issm/trunk-jpl/src/c/classes/Inputs/DoubleArrayInput.h

    r21974 r22519  
    5959                void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist){_error_("not implemented yet");};
    6060                int  GetInputInterpolationType(){_error_("not implemented yet!");};
    61                 IssmDouble InfinityNorm(void){_error_("not implemented yet");};
    6261                IssmDouble Max(void){_error_("not implemented yet");};
    6362                IssmDouble MaxAbs(void){_error_("not implemented yet");};

  • issm/trunk-jpl/src/c/classes/Inputs/DoubleInput.h

    r21974 r22519  
    6060                int  GetInputInterpolationType(){return P0Enum; };
    6161                void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist);
    62                 IssmDouble InfinityNorm(void){_error_("not implemented yet");};
    6362                IssmDouble Max(void);
    6463                IssmDouble MaxAbs(void);

  • issm/trunk-jpl/src/c/classes/Inputs/Input.h

    r21974 r22519  
    4444                virtual void   Extrude(int start)=0;
    4545                virtual void   GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist)=0;
    46                 virtual IssmDouble InfinityNorm(void)=0;
    4746                virtual IssmDouble Max(void)=0;
    4847                virtual IssmDouble MaxAbs(void)=0;

  • issm/trunk-jpl/src/c/classes/Inputs/Inputs.cpp

    r22518 r22519  
    254254}
    255255/*}}}*/
    256 IssmDouble Inputs::InfinityNorm(int enumtype){/*{{{*/
    257 
    258         /*Output*/
    259         IssmDouble norm;
    260 
    261         /*Get input*/
    262         Input* input=xDynamicCast<Input*>(this->GetInput(enumtype));
    263 
    264         /*Apply ContrainMin: */
    265         if (input){
    266                 norm=input->InfinityNorm();
    267         }
    268         else{
    269                 norm=0;
    270         }
    271 
    272         /*Return output*/
    273         return norm;
    274 }
    275 /*}}}*/
    276256IssmDouble Inputs::Max(int enumtype){/*{{{*/
    277257

  • issm/trunk-jpl/src/c/classes/Inputs/Inputs.h

    r22518 r22519  
    3333                void        GetInputValue(int* pvalue,int enum_type);
    3434                void        GetInputValue(IssmDouble* pvalue,int enum_type);
    35                 IssmDouble  InfinityNorm(int enumtype);
    3635                IssmDouble  Max(int enumtype);
    3736                IssmDouble  MaxAbs(int enumtype);

  • issm/trunk-jpl/src/c/classes/Inputs/IntInput.h

    r21974 r22519  
    6161                int  GetInputInterpolationType(){_error_("not implemented yet!");};
    6262                void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist);
    63                 IssmDouble InfinityNorm(void){_error_("InfinityNorm not implemented for integers");};
    6463                IssmDouble Max(void){_error_("Max not implemented for integers");};
    6564                IssmDouble MaxAbs(void){_error_("Max not implemented for integers");};

  • issm/trunk-jpl/src/c/classes/Inputs/PentaInput.cpp

    r22075 r22519  
    275275        vector->SetValues(numvertices,doflist,this->values,INS_VAL);
    276276} /*}}}*/
    277 IssmDouble PentaInput::InfinityNorm(void){/*{{{*/
    278 
    279         /*Output*/
    280         IssmDouble norm=0.;
    281         int numnodes=this->NumberofNodes(this->interpolation_type);
    282 
    283         for(int i=0;i<numnodes;i++) if(fabs(values[i])>norm) norm=fabs(values[i]);
    284         return norm;
    285 }
    286 /*}}}*/
    287277IssmDouble PentaInput::Max(void){/*{{{*/
    288278

  • issm/trunk-jpl/src/c/classes/Inputs/PentaInput.h

    r21974 r22519  
    5959                void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist);
    6060                int  GetInputInterpolationType(){_error_("not implemented yet!");};
    61                 IssmDouble InfinityNorm(void);
    6261                IssmDouble Max(void);
    6362                IssmDouble MaxAbs(void);

  • issm/trunk-jpl/src/c/classes/Inputs/SegInput.h

    r21974 r22519  
    6262                void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist){_error_("not implemented yet");};
    6363                int  GetInputInterpolationType(){_error_("not implemented yet!");};
    64                 IssmDouble InfinityNorm(void){_error_("not implemented yet");};
    6564                IssmDouble Max(void);
    6665                IssmDouble MaxAbs(void){_error_("not implemented yet");};

  • issm/trunk-jpl/src/c/classes/Inputs/TetraInput.cpp

    r21974 r22519  
    242242        vector->SetValues(numvertices,doflist,this->values,INS_VAL);
    243243} /*}}}*/
    244 IssmDouble TetraInput::InfinityNorm(void){/*{{{*/
    245 
    246         /*Output*/
    247         IssmDouble norm=0.;
    248         int numnodes=this->NumberofNodes(this->interpolation_type);
    249 
    250         for(int i=0;i<numnodes;i++) if(fabs(values[i])>norm) norm=fabs(values[i]);
    251         return norm;
    252 }
    253 /*}}}*/
    254244IssmDouble TetraInput::MinAbs(void){/*{{{*/
    255245

  • issm/trunk-jpl/src/c/classes/Inputs/TetraInput.h

    r21974 r22519  
    6262                void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist);
    6363                int  GetInputInterpolationType(){_error_("not implemented yet!");};
    64                 IssmDouble InfinityNorm(void);
    6564                IssmDouble Max(void);
    6665                IssmDouble MaxAbs(void);

  • issm/trunk-jpl/src/c/classes/Inputs/TransientInput.cpp

    r22285 r22519  
    528528
    529529} /*}}}*/
    530 IssmDouble TransientInput::InfinityNorm(void){/*{{{*/
    531 
    532         IssmDouble time;
    533         IssmDouble infnorm;
     530IssmDouble TransientInput::Max(void){/*{{{*/
     531
     532        IssmDouble time;
     533        IssmDouble max;
    534534
    535535        /*First, recover current time from parameters: */
    … …  
    540540
    541541        /*Call input function*/
    542         infnorm=input->InfinityNorm();
     542        max=input->Max();
     543
     544        delete input;
     545
     546        return max;
     547}
     548/*}}}*/
     549IssmDouble TransientInput::MaxAbs(void){/*{{{*/
     550
     551        IssmDouble time;
     552        IssmDouble maxabs;
     553
     554        /*First, recover current time from parameters: */
     555        parameters->FindParam(&time,TimeEnum);
     556
     557        /*Retrieve interpolated values for this time step: */
     558        Input* input=GetTimeInput(time);
     559
     560        /*Call input function*/
     561        maxabs=input->MaxAbs();
    543562
    544563        /*Clean-up and return*/
    545564        delete input;
    546         return infnorm;
    547 }
    548 /*}}}*/
    549 IssmDouble TransientInput::Max(void){/*{{{*/
    550 
    551         IssmDouble time;
    552         IssmDouble max;
     565        return maxabs;
     566
     567}
     568/*}}}*/
     569IssmDouble TransientInput::Min(void){/*{{{*/
     570
     571        IssmDouble time;
     572        IssmDouble min;
    553573
    554574        /*First, recover current time from parameters: */
    … …  
    559579
    560580        /*Call input function*/
    561         max=input->Max();
    562 
    563         delete input;
    564 
    565         return max;
    566 }
    567 /*}}}*/
    568 IssmDouble TransientInput::MaxAbs(void){/*{{{*/
    569 
    570         IssmDouble time;
    571         IssmDouble maxabs;
     581        min=input->Min();
     582
     583        /*Clean-up and return*/
     584        delete input;
     585        return min;
     586
     587}
     588/*}}}*/
     589IssmDouble TransientInput::MinAbs(void){/*{{{*/
     590
     591        IssmDouble time;
     592        IssmDouble minabs;
    572593
    573594        /*First, recover current time from parameters: */
    … …  
    578599
    579600        /*Call input function*/
    580         maxabs=input->MaxAbs();
     601        minabs=input->MinAbs();
    581602
    582603        /*Clean-up and return*/
    583604        delete input;
    584         return maxabs;
    585 
    586 }
    587 /*}}}*/
    588 IssmDouble TransientInput::Min(void){/*{{{*/
    589 
    590         IssmDouble time;
    591         IssmDouble min;
    592 
    593         /*First, recover current time from parameters: */
    594         parameters->FindParam(&time,TimeEnum);
    595 
    596    /*Retrieve interpolated values for this time step: */
    597         Input* input=GetTimeInput(time);
    598 
    599         /*Call input function*/
    600         min=input->Min();
    601 
    602         /*Clean-up and return*/
    603         delete input;
    604         return min;
    605 
    606 }
    607 /*}}}*/
    608 IssmDouble TransientInput::MinAbs(void){/*{{{*/
    609 
    610         IssmDouble time;
    611         IssmDouble minabs;
    612 
    613         /*First, recover current time from parameters: */
    614         parameters->FindParam(&time,TimeEnum);
    615 
    616         /*Retrieve interpolated values for this time step: */
    617         Input* input=GetTimeInput(time);
    618 
    619         /*Call input function*/
    620         minabs=input->MinAbs();
    621 
    622         /*Clean-up and return*/
    623         delete input;
    624605        return minabs;
    625606}

  • issm/trunk-jpl/src/c/classes/Inputs/TransientInput.h

    r22277 r22519  
    7171                void GetTimeValues(IssmDouble* values,IssmDouble time){_error_("not implemented yet");};
    7272                void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist);
    73                 IssmDouble InfinityNorm(void);
    7473                IssmDouble Max(void);
    7574                IssmDouble MaxAbs(void);

  • issm/trunk-jpl/src/c/classes/Inputs/TriaInput.cpp

    r22277 r22519  
    276276        vector->SetValues(numvertices,doflist,this->values,INS_VAL);
    277277} /*}}}*/
    278 IssmDouble TriaInput::InfinityNorm(void){/*{{{*/
    279 
    280         /*Output*/
    281         IssmDouble norm=0.;
    282         int numnodes=this->NumberofNodes(this->interpolation_type);
    283 
    284         for(int i=0;i<numnodes;i++) if(fabs(values[i])>norm) norm=fabs(values[i]);
    285         return norm;
    286 }
    287 /*}}}*/
    288278IssmDouble TriaInput::Max(void){/*{{{*/
    289279

  • issm/trunk-jpl/src/c/classes/Inputs/TriaInput.h

    r21974 r22519  
    6262                int  GetInputInterpolationType(){return interpolation_type;};
    6363                void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist);
    64                 IssmDouble InfinityNorm(void);
    6564                IssmDouble Max(void);
    6665                IssmDouble MaxAbs(void);
Note: See TracChangeset for help on using the changeset viewer.