Changeset 15229

Timestamp:

06/10/13 13:48:39 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: improved parallel kriging

File:

• issm/trunk-jpl/src/m/contrib/gslib/pkriging.m (modified) (3 diffs)

issm/trunk-jpl/src/m/contrib/gslib/pkriging.m

@@ -6 +6 @@
 
 options=pairoptions(varargin{:});
-cluster=getfieldvalue(options,'cluster',generic('np',10));
+cluster=getfieldvalue(options,'cluster',generic('np',1));
 options=removefield(options,'cluster',0);
 name   = ['krig' num2str(feature('GetPid'))];
@@ -35 +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
-choice=input('Is the job successfully completed? (y/n)','s');
+
+%Call waitonlock
+md=model; md.cluster=cluster; md.settings.waitonlock=Inf;
+waitonlock(md)
+
+%Download
 Download(cluster,name,{[name '.outbin']});
 structure=parseresultsfromdisk([name '.outbin'],0);
@@ -50 +53 @@
 
 %Process results
-B=structure.AutodiffForward;
+B=structure.(EnumToString(0));
 B=reshape(B,size(x_interp,2),size(x_interp,1))';
-E=structure.AutodiffIsautodiff;
+E=structure.(EnumToString(1));
 E=reshape(E,size(x_interp,2),size(x_interp,1))';