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/ExternalResults/DoubleExternalResult.cpp

    r12330 r12706  
    44
    55/*header files: */
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*DoubleExternalResult constructors and destructor*/
    23 /*FUNCTION DoubleExternalResult::DoubleExternalResult(){{{1*/
     23/*FUNCTION DoubleExternalResult::DoubleExternalResult(){{{*/
    2424DoubleExternalResult::DoubleExternalResult(){
    2525        return;
    2626}
    2727/*}}}*/
    28 /*FUNCTION DoubleExternalResult::DoubleExternalResult(int enum_type,double value){{{1*/
    29 DoubleExternalResult::DoubleExternalResult(int in_id, int in_enum_type,double in_value,int in_step, double in_time){
     28/*FUNCTION DoubleExternalResult::DoubleExternalResult(int enum_type,IssmDouble value){{{*/
     29DoubleExternalResult::DoubleExternalResult(int in_id, int in_enum_type,IssmDouble in_value,int in_step, IssmDouble in_time){
    3030
    3131        id=in_id;
    … …  
    3636}
    3737/*}}}*/
    38 /*FUNCTION DoubleExternalResult::~DoubleExternalResult(){{{1*/
     38/*FUNCTION DoubleExternalResult::~DoubleExternalResult(){{{*/
    3939DoubleExternalResult::~DoubleExternalResult(){
    4040        return;
    … …  
    4343
    4444/*Object virtual functions definitions:*/
    45 /*FUNCTION DoubleExternalResult::Echo {{{1*/
     45/*FUNCTION DoubleExternalResult::Echo {{{*/
    4646void DoubleExternalResult::Echo(void){
    4747        this->DeepEcho();
    4848}
    4949/*}}}*/
    50 /*FUNCTION DoubleExternalResult::DeepEcho{{{1*/
     50/*FUNCTION DoubleExternalResult::DeepEcho{{{*/
    5151void DoubleExternalResult::DeepEcho(void){
    5252
    53         printf("DoubleExternalResult:\n");
    54         printf("   id: %i\n",this->id);
    55         printf("   enum:  %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
    56         printf("   value: %g\n",this->value);
    57         printf("   step: %i\n",this->step);
    58         printf("   time: %g\n",this->time);
     53        _printLine_("DoubleExternalResult:");
     54        _printLine_("   id: " << this->id);
     55        _printLine_("   enum:  " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
     56        _printLine_("   value: " << this->value);
     57        _printLine_("   step: " << this->step);
     58        _printLine_("   time: " << this->time);
    5959}
    6060/*}}}*/
    61 /*FUNCTION DoubleExternalResult::Id{{{1*/
     61/*FUNCTION DoubleExternalResult::Id{{{*/
    6262int    DoubleExternalResult::Id(void){ return -1; }
    6363/*}}}*/
    64 /*FUNCTION DoubleExternalResult::MyRank{{{1*/
     64/*FUNCTION DoubleExternalResult::MyRank{{{*/
    6565int    DoubleExternalResult::MyRank(void){
    6666        extern int my_rank;
    … …  
    6868}
    6969/*}}}*/
    70 /*FUNCTION DoubleExternalResult::ObjectEnum{{{1*/
     70/*FUNCTION DoubleExternalResult::ObjectEnum{{{*/
    7171int DoubleExternalResult::ObjectEnum(void){
    7272
    … …  
    7575}
    7676/*}}}*/
    77 /*FUNCTION DoubleExternalResult::copy{{{1*/
     77/*FUNCTION DoubleExternalResult::copy{{{*/
    7878Object* DoubleExternalResult::copy() {
    7979       
    … …  
    8484
    8585/*DoubleExternalResult management: */
    86 /*FUNCTION DoubleExternalResult::WriteData{{{1*/
     86/*FUNCTION DoubleExternalResult::WriteData{{{*/
    8787void   DoubleExternalResult::WriteData(FILE* fid,bool io_gather){
    8888
    … …  
    9292        char   *name    = NULL;
    9393        extern  int my_rank;
     94        IssmPDouble passiveDouble;
    9495
    9596        /*return if now on cpu 0: */
    … …  
    101102        fwrite(&length,sizeof(int),1,fid);
    102103        fwrite(name,length,1,fid);
    103         xfree((void**)&name);
     104        xDelete<char>(name);
    104105
    105106        /*Now write time and step: */
    106         fwrite(&time,sizeof(double),1,fid);
     107        passiveDouble=reCast<IssmPDouble>(time);
     108        fwrite(&passiveDouble,sizeof(IssmPDouble),1,fid);
    107109        fwrite(&step,sizeof(int),1,fid);
    108110
    109         /*writing a double, type is 1, size is 1: */
     111        /*writing a IssmDouble, type is 1, size is 1: */
    110112        type=1;
    111113        size=1;
    112114        fwrite(&type,sizeof(int),1,fid);
    113115        fwrite(&size,sizeof(int),1,fid);
    114         fwrite(&this->value,size*sizeof(double),1,fid);
     116        passiveDouble=reCast<IssmPDouble>(this->value);
     117        fwrite(&passiveDouble,size*sizeof(IssmPDouble),1,fid);
    115118
    116119}
    117 /*}}}1*/
    118 /*FUNCTION DoubleExternalResult::GetResultName{{{1*/
     120/*}}}*/
     121/*FUNCTION DoubleExternalResult::GetResultName{{{*/
    119122void DoubleExternalResult::GetResultName(char** pname){
    120123        EnumToStringx(pname,this->enum_type);
    121124}
    122125/*}}}*/
    123 /*FUNCTION DoubleExternalResult::GetStep{{{1*/
     126/*FUNCTION DoubleExternalResult::GetStep{{{*/
    124127int DoubleExternalResult::GetStep(void){
    125128
Note: See TracChangeset for help on using the changeset viewer.