Ignore:
Timestamp:
05/26/14 21:40:16 (11 years ago)
Author:
Mathieu Morlighem
Message:

DEL: removed all FUNCTIONs

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r18039 r18064  
    1313
    1414/*TriaInput constructors and destructor*/
    15 /*FUNCTION TriaInput::TriaInput(){{{*/
    16 TriaInput::TriaInput(){
     15TriaInput::TriaInput(){/*{{{*/
    1716        values = NULL;
    1817}
    1918/*}}}*/
    20 /*FUNCTION TriaInput::TriaInput(int in_enum_type,IssmDouble* invalues,element_type_in){{{*/
    21 TriaInput::TriaInput(int in_enum_type,IssmDouble* in_values,int element_type_in)
     19TriaInput::TriaInput(int in_enum_type,IssmDouble* in_values,int element_type_in)/*{{{*/
    2220        :TriaRef(1)
    2321{
    … …  
    3533}
    3634/*}}}*/
    37 /*FUNCTION TriaInput::~TriaInput(){{{*/
    38 TriaInput::~TriaInput(){
     35TriaInput::~TriaInput(){/*{{{*/
    3936        xDelete<IssmDouble>(this->values);
    4037}
    … …  
    4239
    4340/*Object virtual functions definitions:*/
    44 /*FUNCTION TriaInput::Echo {{{*/
    45 void TriaInput::Echo(void){
     41void TriaInput::Echo(void){/*{{{*/
    4642        this->DeepEcho();
    4743}
    4844/*}}}*/
    49 /*FUNCTION TriaInput::DeepEcho{{{*/
    50 void TriaInput::DeepEcho(void){
     45void TriaInput::DeepEcho(void){/*{{{*/
    5146
    5247        _printf_(setw(15)<<"   TriaInput "<<setw(25)<<left<<EnumToStringx(this->enum_type)<<" [");
    … …  
    5550}
    5651/*}}}*/
    57 /*FUNCTION TriaInput::Id{{{*/
    58 int    TriaInput::Id(void){ return -1; }
    59 /*}}}*/
    60 /*FUNCTION TriaInput::ObjectEnum{{{*/
    61 int TriaInput::ObjectEnum(void){
     52int    TriaInput::Id(void){ return -1; }/*{{{*/
     53/*}}}*/
     54int TriaInput::ObjectEnum(void){/*{{{*/
    6255
    6356        return TriaInputEnum;
    … …  
    6558}
    6659/*}}}*/
    67 /*FUNCTION TriaInput::copy{{{*/
    68 Object* TriaInput::copy() {
     60Object* TriaInput::copy() {/*{{{*/
    6961
    7062        return new TriaInput(this->enum_type,this->values,this->element_type);
    … …  
    7466
    7567/*TriaInput management*/
    76 /*FUNCTION TriaInput::InstanceEnum{{{*/
    77 int TriaInput::InstanceEnum(void){
     68int TriaInput::InstanceEnum(void){/*{{{*/
    7869
    7970        return this->enum_type;
    … …  
    8172}
    8273/*}}}*/
    83 /*FUNCTION TriaInput::SpawnTriaInput{{{*/
    84 Input* TriaInput::SpawnTriaInput(int index1,int index2,int index3){
     74Input* TriaInput::SpawnTriaInput(int index1,int index2,int index3){/*{{{*/
    8575
    8676        /*output*/
    … …  
    9585}
    9686/*}}}*/
    97 /*FUNCTION TriaInput::SpawnSegInput{{{*/
    98 Input* TriaInput::SpawnSegInput(int index1,int index2){
     87Input* TriaInput::SpawnSegInput(int index1,int index2){/*{{{*/
    9988
    10089        /*output*/
    … …  
    121110}
    122111/*}}}*/
    123 /*FUNCTION TriaInput::GetResultInterpolation{{{*/
    124 int  TriaInput::GetResultInterpolation(void){
     112int  TriaInput::GetResultInterpolation(void){/*{{{*/
    125113
    126114        if(this->element_type==P0Enum){
    … …  
    131119}
    132120/*}}}*/
    133 /*FUNCTION TriaInput::GetResultNumberOfNodes{{{*/
    134 int  TriaInput::GetResultNumberOfNodes(void){
     121int  TriaInput::GetResultNumberOfNodes(void){/*{{{*/
    135122
    136123        return this->NumberofNodes();
    … …  
    138125}
    139126/*}}}*/
    140 /*FUNCTION TriaInput::ResultToPatch{{{*/
    141 void TriaInput::ResultToPatch(IssmDouble* values,int nodesperelement,int sid){
     127void TriaInput::ResultToPatch(IssmDouble* values,int nodesperelement,int sid){/*{{{*/
    142128
    143129        int numnodes = this->NumberofNodes();
    … …  
    153139
    154140/*Object functions*/
    155 /*FUNCTION TriaInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss){{{*/
    156 void TriaInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss){
     141void TriaInput::GetInputValue(IssmDouble* pvalue,Gauss* gauss){/*{{{*/
    157142
    158143        /*Call TriaRef function*/
    … …  
    162147}
    163148/*}}}*/
    164 /*FUNCTION TriaInput::GetInputDerivativeValue(IssmDouble* p, IssmDouble* xyz_list, Gauss* gauss){{{*/
    165 void TriaInput::GetInputDerivativeValue(IssmDouble* p, IssmDouble* xyz_list, Gauss* gauss){
     149void TriaInput::GetInputDerivativeValue(IssmDouble* p, IssmDouble* xyz_list, Gauss* gauss){/*{{{*/
    166150
    167151        /*Call TriaRef function*/
    … …  
    170154}
    171155/*}}}*/
    172 /*FUNCTION TriaInput::ChangeEnum{{{*/
    173 void TriaInput::ChangeEnum(int newenumtype){
     156void TriaInput::ChangeEnum(int newenumtype){/*{{{*/
    174157        this->enum_type=newenumtype;
    175158}
    176159/*}}}*/
    177 /*FUNCTION TriaInput::GetInputAverage{{{*/
    178 void TriaInput::GetInputAverage(IssmDouble* pvalue){
     160void TriaInput::GetInputAverage(IssmDouble* pvalue){/*{{{*/
    179161
    180162        int        numnodes  = this->NumberofNodes();
    … …  
    188170}
    189171/*}}}*/
    190 /*FUNCTION TriaInput::GetInputAllTimeAverages{{{*/
    191 void TriaInput::GetInputAllTimeAverages(IssmDouble** pvalues,IssmDouble** ptimes, int* pnumtimes){
     172void TriaInput::GetInputAllTimeAverages(IssmDouble** pvalues,IssmDouble** ptimes, int* pnumtimes){/*{{{*/
    192173
    193174        IssmDouble* outvalues=NULL;
    … …  
    208189}
    209190/*}}}*/
    210 /*FUNCTION TriaInput::GetInputUpToCurrentTimeAverages{{{*/
    211 void TriaInput::GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime){
     191void TriaInput::GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime){/*{{{*/
    212192
    213193        IssmDouble* outvalues=NULL;
    … …  
    230210
    231211/*Intermediary*/
    232 /*FUNCTION TriaInput::SquareMin{{{*/
    233 void TriaInput::SquareMin(IssmDouble* psquaremin,Parameters* parameters){
     212void TriaInput::SquareMin(IssmDouble* psquaremin,Parameters* parameters){/*{{{*/
    234213
    235214        int        numnodes=this->NumberofNodes();
    … …  
    245224}
    246225/*}}}*/
    247 /*FUNCTION TriaInput::ContrainMin{{{*/
    248 void TriaInput::ConstrainMin(IssmDouble minimum){
     226void TriaInput::ConstrainMin(IssmDouble minimum){/*{{{*/
    249227
    250228        int numnodes = this->NumberofNodes();
    … …  
    252230}
    253231/*}}}*/
    254 /*FUNCTION TriaInput::InfinityNorm{{{*/
    255 IssmDouble TriaInput::InfinityNorm(void){
     232IssmDouble TriaInput::InfinityNorm(void){/*{{{*/
    256233
    257234        /*Output*/
    … …  
    263240}
    264241/*}}}*/
    265 /*FUNCTION TriaInput::Max{{{*/
    266 IssmDouble TriaInput::Max(void){
     242IssmDouble TriaInput::Max(void){/*{{{*/
    267243
    268244        int  numnodes=this->NumberofNodes();
    … …  
    275251}
    276252/*}}}*/
    277 /*FUNCTION TriaInput::MaxAbs{{{*/
    278 IssmDouble TriaInput::MaxAbs(void){
     253IssmDouble TriaInput::MaxAbs(void){/*{{{*/
    279254
    280255        int  numnodes=this->NumberofNodes();
    … …  
    287262}
    288263/*}}}*/
    289 /*FUNCTION TriaInput::Min{{{*/
    290 IssmDouble TriaInput::Min(void){
     264IssmDouble TriaInput::Min(void){/*{{{*/
    291265
    292266        const int  numnodes=this->NumberofNodes();
    … …  
    299273}
    300274/*}}}*/
    301 /*FUNCTION TriaInput::MinAbs{{{*/
    302 IssmDouble TriaInput::MinAbs(void){
     275IssmDouble TriaInput::MinAbs(void){/*{{{*/
    303276
    304277        const int  numnodes=this->NumberofNodes();
    … …  
    311284}
    312285/*}}}*/
    313 /*FUNCTION TriaInput::Scale{{{*/
    314 void TriaInput::Scale(IssmDouble scale_factor){
     286void TriaInput::Scale(IssmDouble scale_factor){/*{{{*/
    315287
    316288        const int numnodes=this->NumberofNodes();
    … …  
    318290}
    319291/*}}}*/
    320 /*FUNCTION TriaInput::Set{{{*/
    321 void TriaInput::Set(IssmDouble setvalue){
     292void TriaInput::Set(IssmDouble setvalue){/*{{{*/
    322293
    323294        const int numnodes=this->NumberofNodes();
    … …  
    325296}
    326297/*}}}*/
    327 /*FUNCTION TriaInput::AXPY{{{*/
    328 void TriaInput::AXPY(Input* xinput,IssmDouble scalar){
     298void TriaInput::AXPY(Input* xinput,IssmDouble scalar){/*{{{*/
    329299
    330300        const int numnodes=this->NumberofNodes();
    … …  
    341311}
    342312/*}}}*/
    343 /*FUNCTION TriaInput::Constrain{{{*/
    344 void TriaInput::Constrain(IssmDouble cm_min, IssmDouble cm_max){
     313void TriaInput::Constrain(IssmDouble cm_min, IssmDouble cm_max){/*{{{*/
    345314
    346315        int i;
    … …  
    352321}
    353322/*}}}*/
    354 /*FUNCTION TriaInput::GetVectorFromInputs{{{*/
    355 void TriaInput::GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist){
     323void TriaInput::GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist){/*{{{*/
    356324        const int numvertices=3;
    357325        vector->SetValues(numvertices,doflist,this->values,INS_VAL);
    358326} /*}}}*/
    359 /*FUNCTION TriaInput::PointwiseMin{{{*/
    360 Input* TriaInput::PointwiseMin(Input* inputB){
     327Input* TriaInput::PointwiseMin(Input* inputB){/*{{{*/
    361328
    362329        /*Ouput*/
    … …  
    389356}
    390357/*}}}*/
    391 /*FUNCTION TriaInput::PointwiseMax{{{*/
    392 Input* TriaInput::PointwiseMax(Input* inputB){
     358Input* TriaInput::PointwiseMax(Input* inputB){/*{{{*/
    393359
    394360        /*Ouput*/
    … …  
    421387}
    422388/*}}}*/
    423 /*FUNCTION TriaInput::PointwiseDivide{{{*/
    424 Input* TriaInput::PointwiseDivide(Input* inputB){
     389Input* TriaInput::PointwiseDivide(Input* inputB){/*{{{*/
    425390
    426391        /*Ouput*/
    … …  
    454419}
    455420/*}}}*/
    456 /*FUNCTION TriaInput::Configure{{{*/
    457 void TriaInput::Configure(Parameters* parameters){
     421void TriaInput::Configure(Parameters* parameters){/*{{{*/
    458422        /*do nothing: */
    459423}
Note: See TracChangeset for help on using the changeset viewer.