source: issm/oecreview/Archive/14312-15392/ISSM-14616-14617.diff@ 15393

Last change on this file since 15393 was 15393, checked in by Mathieu Morlighem, 12 years ago

NEW: adding Archive/14312-15392 for oecreview

File size: 2.6 KB
  • ../trunk-jpl/src/c/classes/objects/IndependentObject.cpp

     
    131131                IssmPDouble* buffer=NULL; //a buffer to read the data from disk
    132132                IssmDouble* matrix=NULL; //our independent variable
    133133                int code=0;
    134                 int vector_type=0;
    135134
    136135                /*Set file pointer to beginning of the data: */
    137                 fid=iomodel->SetFilePointerToData(&code,&vector_type,name);
     136                fid=iomodel->SetFilePointerToData(&code,NULL,name);
    138137                if((code!=5) && (code!=6) && (code!=7))_error_("expecting a IssmDouble, integer or boolean matrix for enum " << EnumToStringx(name));
    139138
    140139                /*We have to read a matrix from disk. First read the dimensions of the matrix, then the whole matrix: */
  • ../trunk-jpl/src/c/classes/objects/Elements/Tria.cpp

     
    19931993                        else _error_("could not recognize nature of vector from code " << code);
    19941994                }
    19951995                else {
    1996                         _error_("transient elementary inputs not supported yet!");
     1996                        _error_("transient element inputs not supported yet!");
    19971997                }
    19981998        }
    19991999        else{
  • ../trunk-jpl/src/c/classes/IoModel.cpp

     
    683683        IssmPDouble* matrix=NULL;
    684684        int*    integer_matrix=NULL;
    685685        int code=0;
    686         int vector_type=0;
    687686
    688687        /*recover my_rank:*/
    689688        my_rank=IssmComm::GetRank();
    690689
    691690        /*Set file pointer to beginning of the data: */
    692         fid=this->SetFilePointerToData(&code,&vector_type,data_enum);
     691        fid=this->SetFilePointerToData(&code,NULL,data_enum);
    693692
    694693        if((code!=5) && (code!=6) && (code!=7))_error_("expecting a IssmDouble, integer or boolean matrix for enum " << EnumToStringx(data_enum));
    695694
     
    757756        int M,N;
    758757        IssmPDouble* matrix=NULL;
    759758        int code=0;
    760         int vector_type=0;
    761759
    762760        /*recover my_rank:*/
    763761        my_rank=IssmComm::GetRank();
    764762
    765763        /*Set file pointer to beginning of the data: */
    766         fid=this->SetFilePointerToData(&code,&vector_type,data_enum);
     764        fid=this->SetFilePointerToData(&code,NULL,data_enum);
    767765        if((code!=5) && (code!=6) && (code!=7))_error_("expecting a IssmDouble, integer or boolean matrix for enum " << EnumToStringx(data_enum));
    768766
    769767        /*Now fetch: */
Note: See TracBrowser for help on using the repository browser.