Changeset 22943

Timestamp:

07/13/18 14:23:46 (7 years ago)

Author:

Eric.Larour

Message:

CHG: some minor mods on solveslm + loading of results from cluster.

Location:

issm/trunk-jpl/src/m/solve

Files:

• loadresultsfromclusterslm.m (added)
• solveslm.m (modified) (4 diffs)

issm/trunk-jpl/src/m/solve/solveslm.m

@@ -24 +24 @@
 end
 
+%Default settings for debugging
+valgrind=0;
+%slm.cluster.interactive=0; valgrind=1;
+
 %check consistency: 
 slm.checkconsistency(solutionstring);
@@ -30 +34 @@
 options=pairoptions(varargin{:},'solutionstring',solutionstring);
 
-%figure out if the sum of cluster processors requested sums up correctly: 
+%make sure we request sum of cluster processors 
 totalnp=0;
 for i=1:length(slm.icecaps), totalnp=totalnp+slm.icecaps{i}.cluster.np; end
@@ -42 +46 @@
 cluster=slm.cluster;
 batch=0;
-
 %now, go through icecaps, glacies and earth, and upload all the data independently: 
+disp('solving ice caps first');
 for i=1:length(slm.icecaps),
         slm.icecaps{i}=solve(slm.icecaps{i},solutionstringi,'batch','yes');
 end
+disp('solving earth now');
 slm.earth=solve(slm.earth,solutionstringi,'batch','yes');
 
@@ -66 +71 @@
 nps{end+1}=slm.earth.cluster.np;
 
-BuildQueueScriptMultipleModels(cluster,slm.private.runtimename,slm.miscellaneous.name,slm.private.solution,privateruntimenames,miscellaneousnames,nps);
+BuildQueueScriptMultipleModels(cluster,slm.private.runtimename,slm.miscellaneous.name,slm.private.solution,valgrind,privateruntimenames,miscellaneousnames,nps);
 
 %Upload all required files, given that each individual solution for icecaps and earth model already did: