Changeset 20176

Timestamp:

02/16/16 14:39:57 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moving stuff around

Location:

issm/trunk-jpl/src/m/contrib

Files:

• buzzi (added)
• buzzi/gravity (moved) (moved from issm/trunk-jpl/src/m/contrib/gravity )
• defleurian (added)
• defleurian/netCDF (moved) (moved from issm/trunk-jpl/src/m/contrib/netCDF )
• defleurian/paraview (moved) (moved from issm/trunk-jpl/src/m/contrib/paraview )
• hack (deleted)
• hydrology (deleted)
• larour (added)
• larour/ecco (moved) (moved from issm/trunk-jpl/src/m/contrib/ecco )
• larour/morphological (moved) (moved from issm/trunk-jpl/src/m/contrib/morphological )
• larour/resultstomatrix.m (copied) (copied from issm/trunk-jpl/src/m/contrib/hack/resultstomatrix.m )
• larour/tres.m (copied) (copied from issm/trunk-jpl/src/m/contrib/hack/tres.m )
• morlighem (added)
• morlighem/bamg (moved) (moved from issm/trunk-jpl/src/m/contrib/bamg )
• morlighem/dassflow (moved) (moved from issm/trunk-jpl/src/m/contrib/dassflow )
• morlighem/gslib (moved) (moved from issm/trunk-jpl/src/m/contrib/gslib )
• morlighem/gslib/pkriging.m (modified) (3 diffs)
• morlighem/massbalance (moved) (moved from issm/trunk-jpl/src/m/contrib/massbalance )
• morlighem/sia.m (copied) (copied from issm/trunk-jpl/src/m/contrib/hack/sia.m )
• morlighem/thicknessevolution.m (copied) (copied from issm/trunk-jpl/src/m/contrib/hack/thicknessevolution.m )
• seroussi (added)
• seroussi/oasis (moved) (moved from issm/trunk-jpl/src/m/contrib/oasis )
• uci (deleted)

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

@@ -10 +10 @@
 name   = ['krig' num2str(feature('GetPid'))];
 
+if 1,
 % =========================================   MARSHALL.m =================================================
 disp(['marshalling file ' name '.bin']);
@@ -40 +41 @@
 %Launch job on remote cluster
 BuildKrigingQueueScript(cluster,name,'',1,0,0); %gather, valgrind, gprof
-LaunchQueueJob(cluster,name,name,{[name '.bin'] [name '.queue']});
+UploadQueueJob(cluster,name,name,{[name '.bin'] [name '.queue']})
+LaunchQueueJob(cluster,name,name,{[name '.bin'] [name '.queue']},'');
 
 %Call waitonlock
@@ -47 +49 @@
 
 %Download
+end
 Download(cluster,name,{[name '.outbin']});
 structure=parseresultsfromdisk([name '.outbin'],0);