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
RevLine 
[15393]1Index: ../trunk-jpl/src/c/classes/objects/IndependentObject.cpp
2===================================================================
3--- ../trunk-jpl/src/c/classes/objects/IndependentObject.cpp (revision 14616)
4+++ ../trunk-jpl/src/c/classes/objects/IndependentObject.cpp (revision 14617)
5@@ -131,10 +131,9 @@
6 IssmPDouble* buffer=NULL; //a buffer to read the data from disk
7 IssmDouble* matrix=NULL; //our independent variable
8 int code=0;
9- int vector_type=0;
10
11 /*Set file pointer to beginning of the data: */
12- fid=iomodel->SetFilePointerToData(&code,&vector_type,name);
13+ fid=iomodel->SetFilePointerToData(&code,NULL,name);
14 if((code!=5) && (code!=6) && (code!=7))_error_("expecting a IssmDouble, integer or boolean matrix for enum " << EnumToStringx(name));
15
16 /*We have to read a matrix from disk. First read the dimensions of the matrix, then the whole matrix: */
17Index: ../trunk-jpl/src/c/classes/objects/Elements/Tria.cpp
18===================================================================
19--- ../trunk-jpl/src/c/classes/objects/Elements/Tria.cpp (revision 14616)
20+++ ../trunk-jpl/src/c/classes/objects/Elements/Tria.cpp (revision 14617)
21@@ -1993,7 +1993,7 @@
22 else _error_("could not recognize nature of vector from code " << code);
23 }
24 else {
25- _error_("transient elementary inputs not supported yet!");
26+ _error_("transient element inputs not supported yet!");
27 }
28 }
29 else{
30Index: ../trunk-jpl/src/c/classes/IoModel.cpp
31===================================================================
32--- ../trunk-jpl/src/c/classes/IoModel.cpp (revision 14616)
33+++ ../trunk-jpl/src/c/classes/IoModel.cpp (revision 14617)
34@@ -683,13 +683,12 @@
35 IssmPDouble* matrix=NULL;
36 int* integer_matrix=NULL;
37 int code=0;
38- int vector_type=0;
39
40 /*recover my_rank:*/
41 my_rank=IssmComm::GetRank();
42
43 /*Set file pointer to beginning of the data: */
44- fid=this->SetFilePointerToData(&code,&vector_type,data_enum);
45+ fid=this->SetFilePointerToData(&code,NULL,data_enum);
46
47 if((code!=5) && (code!=6) && (code!=7))_error_("expecting a IssmDouble, integer or boolean matrix for enum " << EnumToStringx(data_enum));
48
49@@ -757,13 +756,12 @@
50 int M,N;
51 IssmPDouble* matrix=NULL;
52 int code=0;
53- int vector_type=0;
54
55 /*recover my_rank:*/
56 my_rank=IssmComm::GetRank();
57
58 /*Set file pointer to beginning of the data: */
59- fid=this->SetFilePointerToData(&code,&vector_type,data_enum);
60+ fid=this->SetFilePointerToData(&code,NULL,data_enum);
61 if((code!=5) && (code!=6) && (code!=7))_error_("expecting a IssmDouble, integer or boolean matrix for enum " << EnumToStringx(data_enum));
62
63 /*Now fetch: */
Note: See TracBrowser for help on using the repository browser.