Changeset 12384

Timestamp:

06/07/12 10:35:20 (13 years ago)

Author:

Mathieu Morlighem

Message:

minor

File:

• issm/trunk-jpl/src/m/utils/DataProcessing/pkriging.m (modified) (4 diffs)

issm/trunk-jpl/src/m/utils/DataProcessing/pkriging.m

@@ -7 +7 @@
 options=pairoptions(varargin{:});
 cluster=getfieldvalue(options,'cluster',generic('np',10));
+options=removefield(options,'cluster',0);
 name   = 'krig';
 
@@ -25 +26 @@
 WriteData(fid,'enum',3,'data',x_interp,'format','DoubleMat');
 WriteData(fid,'enum',4,'data',y_interp,'format','DoubleMat');
-options.marshall(fid);
+options.marshall(fid,5);
 st=fclose(fid);
 if st==-1,
@@ -34 +35 @@
 %Launch job on remote cluster
 BuildKrigingQueueScript(cluster,name,'',1,0,0); %gather, valgrind, gprof
+tic
 LaunchQueueJob(cluster,name,name,{[name '.bin'] [name '.queue']});
+toc
 Download(cluster,name,{[name '.outbin']});
 
@@ -40 +43 @@
 structure=parseresultsfromdisk([name '.outbin'],0);
 B=structure.AutodiffForward;
-B=reshape(B,size(x_interp,1),size(x_interp,2));
+B=reshape(B,size(x_interp,1),size(x_interp,2))';
 E=structure.AutodiffIsautodiff;
-E=reshape(E,size(x_interp,1),size(x_interp,2));
+E=reshape(E,size(x_interp,1),size(x_interp,2))';