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/BoolExternalResult.cpp

    r12330 r12706  
    44
    55/*header files: */
    6 /*{{{1*/
     6/*{{{*/
    77#ifdef HAVE_CONFIG_H
    88        #include <config.h>
    … …  
    2121
    2222/*BoolExternalResult constructors and destructor*/
    23 /*FUNCTION BoolExternalResult::BoolExternalResult(){{{1*/
     23/*FUNCTION BoolExternalResult::BoolExternalResult(){{{*/
    2424BoolExternalResult::BoolExternalResult(){
    2525        return;
    2626}
    2727/*}}}*/
    28 /*FUNCTION BoolExternalResult::BoolExternalResult(int enum_type,bool value){{{1*/
    29 BoolExternalResult::BoolExternalResult(int in_id, int in_enum_type,bool in_value,int in_step, double in_time){
     28/*FUNCTION BoolExternalResult::BoolExternalResult(int enum_type,bool value){{{*/
     29BoolExternalResult::BoolExternalResult(int in_id, int in_enum_type,bool in_value,int in_step, IssmDouble in_time){
    3030
    3131        id=in_id;
    … …  
    3636}
    3737/*}}}*/
    38 /*FUNCTION BoolExternalResult::~BoolExternalResult(){{{1*/
     38/*FUNCTION BoolExternalResult::~BoolExternalResult(){{{*/
    3939BoolExternalResult::~BoolExternalResult(){
    4040        return;
    … …  
    4343
    4444/*Object virtual functions definitions:*/
    45 /*FUNCTION BoolExternalResult::Echo {{{1*/
     45/*FUNCTION BoolExternalResult::Echo {{{*/
    4646void BoolExternalResult::Echo(void){
    4747        this->DeepEcho();
    4848}
    4949/*}}}*/
    50 /*FUNCTION BoolExternalResult::DeepEcho{{{1*/
     50/*FUNCTION BoolExternalResult::DeepEcho{{{*/
    5151void BoolExternalResult::DeepEcho(void){
    5252
    53         printf("BoolExternalResult:\n");
    54         printf("   id: %i\n",this->id);
    55         printf("   enum:  %i (%s)\n",this->enum_type,EnumToStringx(this->enum_type));
    56         printf("   value: %s\n",this->value?"true":"false");
    57         printf("   step: %i\n",this->step);
    58         printf("   time: %g\n",this->time);
     53        _printLine_("BoolExternalResult:");
     54        _printLine_("   id: " << this->id);
     55        _printLine_("   enum:  " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")");
     56        _printLine_("   value: " <<(this->value?"true":"false"));
     57        _printLine_("   step: " << this->step);
     58        _printLine_("   time: " << this->time);
    5959}
    6060/*}}}*/
    61 /*FUNCTION BoolExternalResult::Id{{{1*/
     61/*FUNCTION BoolExternalResult::Id{{{*/
    6262int    BoolExternalResult::Id(void){ return -1; }
    6363/*}}}*/
    64 /*FUNCTION BoolExternalResult::MyRank{{{1*/
     64/*FUNCTION BoolExternalResult::MyRank{{{*/
    6565int    BoolExternalResult::MyRank(void){
    6666        extern int my_rank;
    … …  
    6868}
    6969/*}}}*/
    70 /*FUNCTION BoolExternalResult::ObjectEnum{{{1*/
     70/*FUNCTION BoolExternalResult::ObjectEnum{{{*/
    7171int BoolExternalResult::ObjectEnum(void){
    7272
    … …  
    7575}
    7676/*}}}*/
    77 /*FUNCTION BoolExternalResult::copy{{{1*/
     77/*FUNCTION BoolExternalResult::copy{{{*/
    7878Object* BoolExternalResult::copy() {
    7979       
    … …  
    8484
    8585/*BoolExternalResult management: */
    86 /*FUNCTION BoolExternalResult::WriteData{{{1*/
     86/*FUNCTION BoolExternalResult::WriteData{{{*/
    8787void   BoolExternalResult::WriteData(FILE* fid,bool io_gather){
    8888
    … …  
    9090        int     type;
    9191        int     size;
    92         double  boolean;
     92        IssmPDouble  passiveDouble;
    9393        extern  int my_rank;
    9494        char*   name = NULL;
    … …  
    102102        fwrite(&length,sizeof(int),1,fid);
    103103        fwrite(name,length,1,fid);
    104         xfree((void**)&name);
     104        xDelete<char>(name);
    105105
    106106        /*Now write time and step: */
    107         fwrite(&time,sizeof(double),1,fid);
     107        passiveDouble=reCast<IssmPDouble>(time);
     108        fwrite(&passiveDouble,sizeof(IssmPDouble),1,fid);
    108109        fwrite(&step,sizeof(int),1,fid);
    109110
    110         /*Now write bool, after casting it: */
    111         boolean=(double)this->value;
    112 
    113         /*writing a double, type is 1, size is 1: */
     111        /*writing a IssmDouble, type is 1, size is 1: */
    114112        type=1;
    115113        size=1;
    116114        fwrite(&type,sizeof(int),1,fid);
    117115        fwrite(&size,sizeof(int),1,fid);
    118         fwrite(&boolean,size*sizeof(double),1,fid);
     116        /*Now write bool, after casting it: */
     117        passiveDouble=reCast<IssmPDouble>(this->value);
     118        fwrite(&passiveDouble,size*sizeof(IssmPDouble),1,fid);
    119119
    120120}
    121 /*}}}1*/
    122 /*FUNCTION BoolExternalResult::GetResultName{{{1*/
     121/*}}}*/
     122/*FUNCTION BoolExternalResult::GetResultName{{{*/
    123123void BoolExternalResult::GetResultName(char** pname){
    124124        EnumToStringx(pname,this->enum_type);
    125125}
    126126/*}}}*/
    127 /*FUNCTION BoolExternalResult::GetStep{{{1*/
     127/*FUNCTION BoolExternalResult::GetStep{{{*/
    128128int BoolExternalResult::GetStep(void){
    129129
Note: See TracChangeset for help on using the changeset viewer.