Ignore:
Timestamp:
02/01/12 13:47:42 (13 years ago)
Author:
Mathieu Morlighem
Message:

moved TriaVertexInput to TriaP1Input and same for Penta

File:
1 moved

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/objects/Inputs/TriaP1Input.cpp

    r11288 r11291  
    1 /*!\file TriaVertexInput.c
    2  * \brief: implementation of the TriaVertexInput object
     1/*!\file TriaP1Input.c
     2 * \brief: implementation of the TriaP1Input object
    33 */
    44
    … …  
    1717#include "../../include/include.h"
    1818
    19 /*TriaVertexInput constructors and destructor*/
    20 /*FUNCTION TriaVertexInput::TriaVertexInput(){{{1*/
    21 TriaVertexInput::TriaVertexInput(){
     19/*TriaP1Input constructors and destructor*/
     20/*FUNCTION TriaP1Input::TriaP1Input(){{{1*/
     21TriaP1Input::TriaP1Input(){
    2222        return;
    2323}
    2424/*}}}*/
    25 /*FUNCTION TriaVertexInput::TriaVertexInput(int in_enum_type,double* values){{{1*/
    26 TriaVertexInput::TriaVertexInput(int in_enum_type,double* in_values)
     25/*FUNCTION TriaP1Input::TriaP1Input(int in_enum_type,double* values){{{1*/
     26TriaP1Input::TriaP1Input(int in_enum_type,double* in_values)
    2727        :TriaRef(1)
    2828{
    … …  
    4141}
    4242/*}}}*/
    43 /*FUNCTION TriaVertexInput::~TriaVertexInput(){{{1*/
    44 TriaVertexInput::~TriaVertexInput(){
     43/*FUNCTION TriaP1Input::~TriaP1Input(){{{1*/
     44TriaP1Input::~TriaP1Input(){
    4545        return;
    4646}
    … …  
    4848
    4949/*Object virtual functions definitions:*/
    50 /*FUNCTION TriaVertexInput::Echo {{{1*/
    51 void TriaVertexInput::Echo(void){
     50/*FUNCTION TriaP1Input::Echo {{{1*/
     51void TriaP1Input::Echo(void){
    5252        this->DeepEcho();
    5353}
    5454/*}}}*/
    55 /*FUNCTION TriaVertexInput::DeepEcho{{{1*/
    56 void TriaVertexInput::DeepEcho(void){
    57 
    58         printf("TriaVertexInput:\n");
     55/*FUNCTION TriaP1Input::DeepEcho{{{1*/
     56void TriaP1Input::DeepEcho(void){
     57
     58        printf("TriaP1Input:\n");
    5959        printf("   enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
    6060        printf("   values: [%g %g %g]\n",this->values[0],this->values[1],this->values[2]);
    6161}
    6262/*}}}*/
    63 /*FUNCTION TriaVertexInput::Id{{{1*/
    64 int    TriaVertexInput::Id(void){ return -1; }
    65 /*}}}*/
    66 /*FUNCTION TriaVertexInput::MyRank{{{1*/
    67 int    TriaVertexInput::MyRank(void){
     63/*FUNCTION TriaP1Input::Id{{{1*/
     64int    TriaP1Input::Id(void){ return -1; }
     65/*}}}*/
     66/*FUNCTION TriaP1Input::MyRank{{{1*/
     67int    TriaP1Input::MyRank(void){
    6868        extern int my_rank;
    6969        return my_rank;
    … …  
    7171/*}}}*/
    7272#ifdef _SERIAL_
    73 /*FUNCTION TriaVertexInput::Marshall{{{1*/
    74 void  TriaVertexInput::Marshall(char** pmarshalled_dataset){
     73/*FUNCTION TriaP1Input::Marshall{{{1*/
     74void  TriaP1Input::Marshall(char** pmarshalled_dataset){
    7575
    7676        char* marshalled_dataset=NULL;
    … …  
    8080        marshalled_dataset=*pmarshalled_dataset;
    8181
    82         /*get enum value of TriaVertexInput: */
    83         enum_value=TriaVertexInputEnum;
     82        /*get enum value of TriaP1Input: */
     83        enum_value=TriaP1InputEnum;
    8484       
    8585        /*marshall enum: */
    8686        memcpy(marshalled_dataset,&enum_value,sizeof(enum_value));marshalled_dataset+=sizeof(enum_value);
    8787       
    88         /*marshall TriaVertexInput data: */
     88        /*marshall TriaP1Input data: */
    8989        memcpy(marshalled_dataset,&enum_type,sizeof(enum_type));marshalled_dataset+=sizeof(enum_type);
    9090        memcpy(marshalled_dataset,&values,sizeof(values));marshalled_dataset+=sizeof(values);
    … …  
    9393}
    9494/*}}}*/
    95 /*FUNCTION TriaVertexInput::MarshallSize{{{1*/
    96 int   TriaVertexInput::MarshallSize(){
     95/*FUNCTION TriaP1Input::MarshallSize{{{1*/
     96int   TriaP1Input::MarshallSize(){
    9797       
    9898        return sizeof(values)+
    … …  
    101101}
    102102/*}}}*/
    103 /*FUNCTION TriaVertexInput::Demarshall{{{1*/
    104 void  TriaVertexInput::Demarshall(char** pmarshalled_dataset){
     103/*FUNCTION TriaP1Input::Demarshall{{{1*/
     104void  TriaP1Input::Demarshall(char** pmarshalled_dataset){
    105105
    106106        char* marshalled_dataset=NULL;
    … …  
    121121/*}}}*/
    122122#endif
    123 /*FUNCTION TriaVertexInput::ObjectEnum{{{1*/
    124 int TriaVertexInput::ObjectEnum(void){
    125 
    126         return TriaVertexInputEnum;
    127 
    128 }
    129 /*}}}*/
    130 /*FUNCTION TriaVertexInput::copy{{{1*/
    131 Object* TriaVertexInput::copy() {
    132        
    133         return new TriaVertexInput(this->enum_type,this->values);
    134 
    135 }
    136 /*}}}*/
    137        
    138 /*TriaVertexInput management*/
    139 /*FUNCTION TriaVertexInput::InstanceEnum{{{1*/
    140 int TriaVertexInput::InstanceEnum(void){
     123/*FUNCTION TriaP1Input::ObjectEnum{{{1*/
     124int TriaP1Input::ObjectEnum(void){
     125
     126        return TriaP1InputEnum;
     127
     128}
     129/*}}}*/
     130/*FUNCTION TriaP1Input::copy{{{1*/
     131Object* TriaP1Input::copy() {
     132       
     133        return new TriaP1Input(this->enum_type,this->values);
     134
     135}
     136/*}}}*/
     137       
     138/*TriaP1Input management*/
     139/*FUNCTION TriaP1Input::InstanceEnum{{{1*/
     140int TriaP1Input::InstanceEnum(void){
    141141
    142142        return this->enum_type;
    … …  
    144144}
    145145/*}}}*/
    146 /*FUNCTION TriaVertexInput::SpawnTriaInput{{{1*/
    147 Input* TriaVertexInput::SpawnTriaInput(int* indices){
     146/*FUNCTION TriaP1Input::SpawnTriaInput{{{1*/
     147Input* TriaP1Input::SpawnTriaInput(int* indices){
    148148
    149149        /*output*/
    150         TriaVertexInput* outinput=NULL;
     150        TriaP1Input* outinput=NULL;
    151151
    152152        /*Create new Tria input (copy of current input)*/
    153         outinput=new TriaVertexInput(this->enum_type,&this->values[0]);
     153        outinput=new TriaP1Input(this->enum_type,&this->values[0]);
    154154
    155155        /*Assign output*/
    … …  
    158158}
    159159/*}}}*/
    160 /*FUNCTION TriaVertexInput::SpawnResult{{{1*/
    161 ElementResult* TriaVertexInput::SpawnResult(int step, double time){
     160/*FUNCTION TriaP1Input::SpawnResult{{{1*/
     161ElementResult* TriaP1Input::SpawnResult(int step, double time){
    162162
    163163        return new TriaVertexElementResult(this->enum_type,this->values,step,time);
    … …  
    167167
    168168/*Object functions*/
    169 /*FUNCTION TriaVertexInput::GetInputValue(double* pvalue,GaussTria* gauss){{{1*/
    170 void TriaVertexInput::GetInputValue(double* pvalue,GaussTria* gauss){
     169/*FUNCTION TriaP1Input::GetInputValue(double* pvalue,GaussTria* gauss){{{1*/
     170void TriaP1Input::GetInputValue(double* pvalue,GaussTria* gauss){
    171171
    172172        /*Call TriaRef function*/
    … …  
    175175}
    176176/*}}}*/
    177 /*FUNCTION TriaVertexInput::GetInputDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){{{1*/
    178 void TriaVertexInput::GetInputDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){
     177/*FUNCTION TriaP1Input::GetInputDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){{{1*/
     178void TriaP1Input::GetInputDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){
    179179
    180180        /*Call TriaRef function*/
    … …  
    182182}
    183183/*}}}*/
    184 /*FUNCTION TriaVertexInput::GetVxStrainRate2d{{{1*/
    185 void TriaVertexInput::GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){
     184/*FUNCTION TriaP1Input::GetVxStrainRate2d{{{1*/
     185void TriaP1Input::GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){
    186186
    187187        /*Intermediary*/
    … …  
    205205}
    206206/*}}}*/
    207 /*FUNCTION TriaVertexInput::GetVyStrainRate2d{{{1*/
    208 void TriaVertexInput::GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){
     207/*FUNCTION TriaP1Input::GetVyStrainRate2d{{{1*/
     208void TriaP1Input::GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){
    209209
    210210        /*Intermediary*/
    … …  
    228228}
    229229/*}}}*/
    230 /*FUNCTION TriaVertexInput::ChangeEnum{{{1*/
    231 void TriaVertexInput::ChangeEnum(int newenumtype){
     230/*FUNCTION TriaP1Input::ChangeEnum{{{1*/
     231void TriaP1Input::ChangeEnum(int newenumtype){
    232232        this->enum_type=newenumtype;
    233233}
    234234/*}}}*/
    235 /*FUNCTION TriaVertexInput::GetInputAverage{{{1*/
    236 void TriaVertexInput::GetInputAverage(double* pvalue){
     235/*FUNCTION TriaP1Input::GetInputAverage{{{1*/
     236void TriaP1Input::GetInputAverage(double* pvalue){
    237237        *pvalue=1./3.*(values[0]+values[1]+values[2]);
    238238}
    … …  
    240240
    241241/*Intermediary*/
    242 /*FUNCTION TriaVertexInput::SquareMin{{{1*/
    243 void TriaVertexInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){
     242/*FUNCTION TriaP1Input::SquareMin{{{1*/
     243void TriaP1Input::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){
    244244
    245245        int i;
    … …  
    263263}
    264264/*}}}*/
    265 /*FUNCTION TriaVertexInput::ContrainMin{{{1*/
    266 void TriaVertexInput::ConstrainMin(double minimum){
     265/*FUNCTION TriaP1Input::ContrainMin{{{1*/
     266void TriaP1Input::ConstrainMin(double minimum){
    267267       
    268268        int i;
    … …  
    272272}
    273273/*}}}*/
    274 /*FUNCTION TriaVertexInput::InfinityNorm{{{1*/
    275 double TriaVertexInput::InfinityNorm(void){
     274/*FUNCTION TriaP1Input::InfinityNorm{{{1*/
     275double TriaP1Input::InfinityNorm(void){
    276276
    277277        /*Output*/
    … …  
    283283}
    284284/*}}}*/
    285 /*FUNCTION TriaVertexInput::Max{{{1*/
    286 double TriaVertexInput::Max(void){
     285/*FUNCTION TriaP1Input::Max{{{1*/
     286double TriaP1Input::Max(void){
    287287
    288288        const int numnodes=3;
    … …  
    295295}
    296296/*}}}*/
    297 /*FUNCTION TriaVertexInput::MaxAbs{{{1*/
    298 double TriaVertexInput::MaxAbs(void){
     297/*FUNCTION TriaP1Input::MaxAbs{{{1*/
     298double TriaP1Input::MaxAbs(void){
    299299
    300300        const int numnodes=3;
    … …  
    307307}
    308308/*}}}*/
    309 /*FUNCTION TriaVertexInput::Min{{{1*/
    310 double TriaVertexInput::Min(void){
     309/*FUNCTION TriaP1Input::Min{{{1*/
     310double TriaP1Input::Min(void){
    311311
    312312        const int numnodes=3;
    … …  
    319319}
    320320/*}}}*/
    321 /*FUNCTION TriaVertexInput::MinAbs{{{1*/
    322 double TriaVertexInput::MinAbs(void){
     321/*FUNCTION TriaP1Input::MinAbs{{{1*/
     322double TriaP1Input::MinAbs(void){
    323323
    324324        const int numnodes=3;
    … …  
    331331}
    332332/*}}}*/
    333 /*FUNCTION TriaVertexInput::Scale{{{1*/
    334 void TriaVertexInput::Scale(double scale_factor){
     333/*FUNCTION TriaP1Input::Scale{{{1*/
     334void TriaP1Input::Scale(double scale_factor){
    335335       
    336336        int i;
    … …  
    340340}
    341341/*}}}*/
    342 /*FUNCTION TriaVertexInput::ArtificialNoise{{{1*/
    343 void TriaVertexInput::ArtificialNoise(double min,double max){
     342/*FUNCTION TriaP1Input::ArtificialNoise{{{1*/
     343void TriaP1Input::ArtificialNoise(double min,double max){
    344344
    345345        int i;
    … …  
    356356}
    357357/*}}}*/
    358 /*FUNCTION TriaVertexInput::AXPY{{{1*/
    359 void TriaVertexInput::AXPY(Input* xinput,double scalar){
    360 
    361         int i;
    362         const int numnodes=3;
    363         TriaVertexInput*  xtriavertexinput=NULL;
     358/*FUNCTION TriaP1Input::AXPY{{{1*/
     359void TriaP1Input::AXPY(Input* xinput,double scalar){
     360
     361        int i;
     362        const int numnodes=3;
     363        TriaP1Input*  xtriavertexinput=NULL;
    364364
    365365        /*xinput is of the same type, so cast it: */
    366         xtriavertexinput=(TriaVertexInput*)xinput;
     366        xtriavertexinput=(TriaP1Input*)xinput;
    367367
    368368        /*Carry out the AXPY operation depending on type:*/
    369369        switch(xinput->ObjectEnum()){
    370370
    371                 case TriaVertexInputEnum :
     371                case TriaP1InputEnum :
    372372                        for(i=0;i<numnodes;i++)this->values[i]=this->values[i]+scalar*xtriavertexinput->values[i];
    373373                        return;
    … …  
    379379}
    380380/*}}}*/
    381 /*FUNCTION TriaVertexInput::Constrain{{{1*/
    382 void TriaVertexInput::Constrain(double cm_min, double cm_max){
     381/*FUNCTION TriaP1Input::Constrain{{{1*/
     382void TriaP1Input::Constrain(double cm_min, double cm_max){
    383383
    384384        int i;
    … …  
    390390}
    391391/*}}}*/
    392 /*FUNCTION TriaVertexInput::GetVectorFromInputs{{{1*/
    393 void TriaVertexInput::GetVectorFromInputs(Vec vector,int* doflist){
     392/*FUNCTION TriaP1Input::GetVectorFromInputs{{{1*/
     393void TriaP1Input::GetVectorFromInputs(Vec vector,int* doflist){
    394394
    395395        const int numvertices=3;
    … …  
    397397
    398398} /*}}}*/
    399 /*FUNCTION TriaVertexInput::GetValuesPtr{{{1*/
    400 void TriaVertexInput::GetValuesPtr(double** pvalues,int* pnum_values){
     399/*FUNCTION TriaP1Input::GetValuesPtr{{{1*/
     400void TriaP1Input::GetValuesPtr(double** pvalues,int* pnum_values){
    401401
    402402        *pvalues=this->values;
    … …  
    405405}
    406406/*}}}*/
    407 /*FUNCTION TriaVertexInput::PointwiseMin{{{1*/
    408 Input* TriaVertexInput::PointwiseMin(Input* inputB){
     407/*FUNCTION TriaP1Input::PointwiseMin{{{1*/
     408Input* TriaP1Input::PointwiseMin(Input* inputB){
    409409
    410410        /*Ouput*/
    411         TriaVertexInput* outinput=NULL;
     411        TriaP1Input* outinput=NULL;
    412412
    413413        /*Intermediaries*/
    414414        int               i;
    415         TriaVertexInput *xinputB     = NULL;
     415        TriaP1Input *xinputB     = NULL;
    416416        int               B_numvalues;
    417417        const int         numnodes    = 3;
    … …  
    419419
    420420        /*Check that inputB is of the same type*/
    421         if (inputB->ObjectEnum()!=TriaVertexInputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->ObjectEnum()));
    422         xinputB=(TriaVertexInput*)inputB;
     421        if (inputB->ObjectEnum()!=TriaP1InputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->ObjectEnum()));
     422        xinputB=(TriaP1Input*)inputB;
    423423
    424424        /*Create point wise min*/
    … …  
    429429
    430430        /*Create new Tria vertex input (copy of current input)*/
    431         outinput=new TriaVertexInput(this->enum_type,&minvalues[0]);
     431        outinput=new TriaP1Input(this->enum_type,&minvalues[0]);
    432432
    433433        /*Return output pointer*/
    … …  
    436436}
    437437/*}}}*/
    438 /*FUNCTION TriaVertexInput::PointwiseMax{{{1*/
    439 Input* TriaVertexInput::PointwiseMax(Input* inputB){
     438/*FUNCTION TriaP1Input::PointwiseMax{{{1*/
     439Input* TriaP1Input::PointwiseMax(Input* inputB){
    440440
    441441        /*Ouput*/
    442         TriaVertexInput* outinput=NULL;
     442        TriaP1Input* outinput=NULL;
    443443
    444444        /*Intermediaries*/
    445445        int               i;
    446         TriaVertexInput *xinputB     = NULL;
     446        TriaP1Input *xinputB     = NULL;
    447447        int               B_numvalues;
    448448        const int         numnodes    = 3;
    … …  
    450450
    451451        /*Check that inputB is of the same type*/
    452         if (inputB->ObjectEnum()!=TriaVertexInputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->ObjectEnum()));
    453         xinputB=(TriaVertexInput*)inputB;
     452        if (inputB->ObjectEnum()!=TriaP1InputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->ObjectEnum()));
     453        xinputB=(TriaP1Input*)inputB;
    454454
    455455        /*Create point wise max*/
    … …  
    460460
    461461        /*Create new Tria vertex input (copy of current input)*/
    462         outinput=new TriaVertexInput(this->enum_type,&maxvalues[0]);
     462        outinput=new TriaP1Input(this->enum_type,&maxvalues[0]);
    463463
    464464        /*Return output pointer*/
    … …  
    467467}
    468468/*}}}*/
    469 /*FUNCTION TriaVertexInput::Configure{{{1*/
    470 void TriaVertexInput::Configure(Parameters* parameters){
     469/*FUNCTION TriaP1Input::Configure{{{1*/
     470void TriaP1Input::Configure(Parameters* parameters){
    471471        /*do nothing: */
    472472}
Note: See TracChangeset for help on using the changeset viewer.