Ignore:
Timestamp:
07/24/12 10:36:19 (13 years ago)
Author:
Mathieu Morlighem
Message:

merged trunk-jpl and trunk for revision 12703

File:
1 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/objects/ElementResults/TriaP1ElementResult.cpp

    r12330 r12706  
    1919
    2020/*TriaP1ElementResult constructors and destructor*/
    21 /*FUNCTION TriaP1ElementResult::TriaP1ElementResult(){{{1*/
     21/*FUNCTION TriaP1ElementResult::TriaP1ElementResult(){{{*/
    2222TriaP1ElementResult::TriaP1ElementResult(){
    2323        return;
    2424}
    2525/*}}}*/
    26 /*FUNCTION TriaP1ElementResult::TriaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){{{1*/
    27 TriaP1ElementResult::TriaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){
     26/*FUNCTION TriaP1ElementResult::TriaP1ElementResult(int in_enum_type,IssmDouble* in_values,int in_step, IssmDouble in_time){{{*/
     27TriaP1ElementResult::TriaP1ElementResult(int in_enum_type,IssmDouble* in_values,int in_step, IssmDouble in_time){
    2828
    2929        enum_type=in_enum_type;
    … …  
    3535}
    3636/*}}}*/
    37 /*FUNCTION TriaP1ElementResult::~TriaP1ElementResult(){{{1*/
     37/*FUNCTION TriaP1ElementResult::~TriaP1ElementResult(){{{*/
    3838TriaP1ElementResult::~TriaP1ElementResult(){
    3939        return;
    … …  
    4242
    4343/*Object virtual functions definitions:*/
    44 /*FUNCTION TriaP1ElementResult::Echo {{{1*/
     44/*FUNCTION TriaP1ElementResult::Echo {{{*/
    4545void TriaP1ElementResult::Echo(void){
    4646        this->DeepEcho();
    4747}
    4848/*}}}*/
    49 /*FUNCTION TriaP1ElementResult::DeepEcho{{{1*/
     49/*FUNCTION TriaP1ElementResult::DeepEcho{{{*/
    5050void TriaP1ElementResult::DeepEcho(void){
    5151               
    52         printf("TriaP1ElementResult:\n");
    53         printf("   enum: %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
    54         printf("   values: [%g %g %g]\n",this->values[0],this->values[1],this->values[2]);
    55         printf("   step: %i\n",this->step);
    56         printf("   time: %g\n",this->time);
     52        _printLine_("TriaP1ElementResult:");
     53        _printLine_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
     54        _printLine_("   values: [" << this->values[0] << " " << this->values[1] << " " << this->values[2] << "]");
     55        _printLine_("   step: " << this->step);
     56        _printLine_("   time: " << this->time);
    5757}
    5858/*}}}*/
    59 /*FUNCTION TriaP1ElementResult::Id{{{1*/
     59/*FUNCTION TriaP1ElementResult::Id{{{*/
    6060int    TriaP1ElementResult::Id(void){ return -1; }
    6161/*}}}*/
    62 /*FUNCTION TriaP1ElementResult::MyRank{{{1*/
     62/*FUNCTION TriaP1ElementResult::MyRank{{{*/
    6363int    TriaP1ElementResult::MyRank(void){
    6464        extern int my_rank;
    … …  
    6666}
    6767/*}}}*/
    68 /*FUNCTION TriaP1ElementResult::ObjectEnum{{{1*/
     68/*FUNCTION TriaP1ElementResult::ObjectEnum{{{*/
    6969int TriaP1ElementResult::ObjectEnum(void){
    7070
    … …  
    7373}
    7474/*}}}*/
    75 /*FUNCTION TriaP1ElementResult::copy{{{1*/
     75/*FUNCTION TriaP1ElementResult::copy{{{*/
    7676Object* TriaP1ElementResult::copy() {
    7777       
    … …  
    8282
    8383/*ElementResult management*/
    84 /*FUNCTION TriaP1ElementResult::InstanceEnum{{{1*/
     84/*FUNCTION TriaP1ElementResult::InstanceEnum{{{*/
    8585int TriaP1ElementResult::InstanceEnum(void){
    8686
    … …  
    8989}
    9090/*}}}*/
    91 /*FUNCTION TriaP1ElementResult::SpawnTriaElementResult{{{1*/
     91/*FUNCTION TriaP1ElementResult::SpawnTriaElementResult{{{*/
    9292ElementResult* TriaP1ElementResult::SpawnTriaElementResult(int* indices){
    9393
    … …  
    103103}
    104104/*}}}*/
    105 /*FUNCTION TriaP1ElementResult::ProcessUnits{{{1*/
     105/*FUNCTION TriaP1ElementResult::ProcessUnits{{{*/
    106106void TriaP1ElementResult::ProcessUnits(Parameters* parameters){
    107107       
    … …  
    110110}
    111111/*}}}*/
    112 /*FUNCTION TriaP1ElementResult::NumberOfNodalValues{{{1*/
     112/*FUNCTION TriaP1ElementResult::NumberOfNodalValues{{{*/
    113113int TriaP1ElementResult::NumberOfNodalValues(void){
    114114        return 3;
    115115}
    116116/*}}}*/
    117 /*FUNCTION TriaP1ElementResult::PatchFill{{{1*/
     117/*FUNCTION TriaP1ElementResult::PatchFill{{{*/
    118118void TriaP1ElementResult::PatchFill(int row, Patch* patch){
    119119       
    … …  
    125125}
    126126/*}}}*/
    127 /*FUNCTION TriaP1ElementResult::GetVectorFromResults{{{1*/
     127/*FUNCTION TriaP1ElementResult::GetVectorFromResults{{{*/
    128128void TriaP1ElementResult::GetVectorFromResults(Vector* vector,int* doflist,int* connectivitylist,int numdofs){
    129129
    130         double data[3];
     130        IssmDouble data[3];
    131131
    132         if(numdofs!=3)_error_("Result %s is a TriaP1ElementResult and cannot write vector of %i dofs",numdofs);
    133         for(int i=0;i<3;i++) data[i]=this->values[i]/(double)connectivitylist[i];
     132        if(numdofs!=3)_error2_("Result " << EnumToStringx(this->enum_type) << " is a TriaP1ElementResult and cannot write vector of " << numdofs << " dofs");
     133        for(int i=0;i<3;i++) data[i]=this->values[i]/(IssmDouble)connectivitylist[i];
    134134        vector->SetValues(numdofs,doflist,&data[0],ADD_VAL);
    135135
    136136} /*}}}*/
    137 /*FUNCTION TriaP1ElementResult::GetElementVectorFromResults{{{1*/
     137/*FUNCTION TriaP1ElementResult::GetElementVectorFromResults{{{*/
    138138void TriaP1ElementResult::GetElementVectorFromResults(Vector* vector,int dof){
    139         _error_("Result %s is a TriaP1ElementResult and should not write vector of size numberofelemenrs",EnumToStringx(enum_type));
     139        _error2_("Result " << EnumToStringx(enum_type) << " is a TriaP1ElementResult and should not write vector of size numberofelemenrs");
    140140} /*}}}*/
Note: See TracChangeset for help on using the changeset viewer.