Changeset 21845

Timestamp:

07/24/17 13:08:55 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing AD (no need to have a specialization for int*

File:

• issm/trunk-jpl/src/c/classes/ExternalResults/GenericExternalResult.h (modified) (1 diff)

issm/trunk-jpl/src/c/classes/ExternalResults/GenericExternalResult.h

@@ -462 +462 @@
 
 }  /*}}}*/
-/*Specific instantiations for int*: */
-#if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_)  //We hook off this specific specialization when not running ADOLC, otherwise we get a redeclaration with the next specialization. 
-template <> inline void GenericExternalResult<int*>::WriteData(FILE* fid,bool io_gather){ /*{{{*/
-
-        int     i;
-        int     my_rank;
-        int     type;
-        int     rows,cols;
-        char   *name    = NULL;
-        IssmPDouble passiveDouble;
-        int* passiveInts;
-
-        /*recover my_rank:*/
-        my_rank=IssmComm::GetRank();
-
-        if(io_gather){
-                /*we are gathering the data on cpu 0, don't write on other cpus: */
-                if(my_rank) return;
-        }
-
-        /*First write enum: */
-        int length=(strlen(this->result_name)+1)*sizeof(char);
-        fwrite(&length,sizeof(int),1,fid);
-        fwrite(this->result_name,length,1,fid);
-
-        /*Now write time and step: */
-        passiveDouble=reCast<IssmPDouble>(time);
-        fwrite(&passiveDouble,sizeof(IssmPDouble),1,fid);
-        fwrite(&step,sizeof(int),1,fid);
-
-        /*writing a int array, type is 4 (see parseresultsfromdisk.m):*/
-        type=4;
-        fwrite(&type,sizeof(int),1,fid);
-        rows=this->M;
-        fwrite(&rows,sizeof(int),1,fid);
-        cols=this->N;
-        fwrite(&cols,sizeof(int),1,fid);
-
-        passiveInts=xNew<int>(this->M*this->N);
-        for (i=0;i<this->M*this->N;i++)passiveInts[i]=reCast<int>(value[i]);
-        fwrite(passiveInts,cols*rows*sizeof(int),1,fid);
-        xDelete<int>(int);
-
-}
-/*}}}*/
-#endif
 
 /*Specific instantiations for IssmPDouble*: */