source:
issm/oecreview/Archive/14312-15392/ISSM-14616-14617.diff@
15393
Last change on this file since 15393 was 15393, checked in by , 12 years ago | |
---|---|
File size: 2.6 KB |
-
../trunk-jpl/src/c/classes/objects/IndependentObject.cpp
131 131 IssmPDouble* buffer=NULL; //a buffer to read the data from disk 132 132 IssmDouble* matrix=NULL; //our independent variable 133 133 int code=0; 134 int vector_type=0;135 134 136 135 /*Set file pointer to beginning of the data: */ 137 fid=iomodel->SetFilePointerToData(&code, &vector_type,name);136 fid=iomodel->SetFilePointerToData(&code,NULL,name); 138 137 if((code!=5) && (code!=6) && (code!=7))_error_("expecting a IssmDouble, integer or boolean matrix for enum " << EnumToStringx(name)); 139 138 140 139 /*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
1993 1993 else _error_("could not recognize nature of vector from code " << code); 1994 1994 } 1995 1995 else { 1996 _error_("transient element aryinputs not supported yet!");1996 _error_("transient element inputs not supported yet!"); 1997 1997 } 1998 1998 } 1999 1999 else{ -
../trunk-jpl/src/c/classes/IoModel.cpp
683 683 IssmPDouble* matrix=NULL; 684 684 int* integer_matrix=NULL; 685 685 int code=0; 686 int vector_type=0;687 686 688 687 /*recover my_rank:*/ 689 688 my_rank=IssmComm::GetRank(); 690 689 691 690 /*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); 693 692 694 693 if((code!=5) && (code!=6) && (code!=7))_error_("expecting a IssmDouble, integer or boolean matrix for enum " << EnumToStringx(data_enum)); 695 694 … … 757 756 int M,N; 758 757 IssmPDouble* matrix=NULL; 759 758 int code=0; 760 int vector_type=0;761 759 762 760 /*recover my_rank:*/ 763 761 my_rank=IssmComm::GetRank(); 764 762 765 763 /*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); 767 765 if((code!=5) && (code!=6) && (code!=7))_error_("expecting a IssmDouble, integer or boolean matrix for enum " << EnumToStringx(data_enum)); 768 766 769 767 /*Now fetch: */
Note:
See TracBrowser
for help on using the repository browser.