Changeset 20690 for issm/trunk-jpl/src/c/main/kriging.cpp

Timestamp:

06/03/16 10:05:11 (9 years ago)

Author:

Mathieu Morlighem

Message:

NEW: marhsall strings instead of enums

File:

• issm/trunk-jpl/src/c/main/kriging.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/main/kriging.cpp

@@ -144 +144 @@
         IoModel* iomodel = new IoModel();
         iomodel->fid=fid;
-        iomodel->CheckEnumSync();
-        iomodel->FetchData(&x,&M,&N,0);        nobs=M*N;
-        iomodel->FetchData(&y,&M,&N,1);        _assert_(M*N==nobs);
-        iomodel->FetchData(&data,&M,&N,2);     _assert_(M*N==nobs);
-        iomodel->FetchData(&x_interp,&M,&N,3); ninterp=M*N;
-        iomodel->FetchData(&y_interp,&M,&N,4); _assert_(M*N==ninterp);
+        iomodel->CheckFile();
+        iomodel->FetchData(&x,&M,&N,"md.0");        nobs=M*N;
+        iomodel->FetchData(&y,&M,&N,"md.1");        _assert_(M*N==nobs);
+        iomodel->FetchData(&data,&M,&N,"md.2");     _assert_(M*N==nobs);
+        iomodel->FetchData(&x_interp,&M,&N,"md.3"); ninterp=M*N;
+        iomodel->FetchData(&y_interp,&M,&N,"md.4"); _assert_(M*N==ninterp);
 
         /*Read options*/