Changeset 12878 for issm/branches/trunk-jpl-damage/src/m/model/solve.m

Timestamp:

08/02/12 17:13:12 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 12877

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/m/model/solve.m (modified) (3 diffs)

issm/branches/trunk-jpl-damage/src/m/model/solve.m

@@ -24 +24 @@
 %      md=solve(md,DiagnosticSolutionEnum);
 
-%recover options
+%recover and process solve options
 options=pairoptions(varargin{:},'solution_type',solutionenum);
-
-%add default options
 options=process_solve_options(options);
 
 %recover some fields
 md.private.solution=options.solution_type;
+cluster=md.cluster;
 
 %check model consistency
 disp('checking model consistency');
 if (solutionenum == FlaimSolutionEnum)
-        modelconsistency(true);
-        md.mesh.checkconsistency(md,solutionenum);
-        md.flaim.checkconsistency(md,solutionenum);
-        if ~modelconsistency()
-                error(' ');
+        md.private.isconsistent=true;
+        md=checkconsistency(md.mesh,md,solutionenum);
+        md=checkconsistency(md.flaim,md,solutionenum);
+        if md.private.isconsistent==false,
+                error('Model not consistent, see messages above');
         end
 else
@@ -46 +45 @@
 end
 
-%if running qmu analysis, some preprocessing of dakota files using 
-%models fields needs to be carried out. 
+%First, build a runtime name that is unique
+c=clock;
+md.private.runtimename=sprintf('%s-%02i-%02i-%04i-%02i-%02i-%02i-%i',md.miscellaneous.name,c(2),c(3),c(1),c(4),c(5),floor(c(6)),feature('GetPid'));
+
+%if running qmu analysis, some preprocessing of dakota files using models
+%fields needs to be carried out. 
 if md.qmu.isdakota,
         md=preqmu(md,options);
 end
 
-%Save model as is (in case of a crash)
-assignin('base',inputname(1),md);
-
 %flaim analysis
-if (md.private.solution == FlaimSolutionEnum)
+if (options.solution_type == FlaimSolutionEnum)
         md=flaim_sol(md,options);
         md.private.solution=EnumToString(options.solution_type);
@@ -62 +62 @@
 end
 
-%Marshall model data into a binary file.
-marshall(md);
-
-%write a template file for issm to use, in parallel
-PetscFile(md.solver,[md.miscellaneous.name '.petsc']);
-
-%If running in parallel, we have a different way of launching the solution
-%sequences. 
-if ~strcmpi(md.cluster.name,'none'),
-        md=solveparallel(md,options);
+%Do we load results only?
+if options.loadonly,  
+        md=loadresultsfromcluster(md);
         return;
 end
 
-%Launch correct solution sequence
-md=issm(md,md.private.solution);
+%Wite all input files
+marshall(md);                                          % bin file
+PetscFile(md.solver,[md.miscellaneous.name '.petsc']); % petsc file
+BuildQueueScript(cluster,md.private.runtimename,md.miscellaneous.name,md.private.solution,md.settings.io_gather,md.debug.valgrind,md.debug.gprof); % queue file
+
+%we need to make sure we have PETSC support, otherwise, we run with only one cpu: 
+if ~ispetsc,
+        disp('PETSC support not included, running on 1 cpu only!');
+        cluster.np=1;
+end
+
+%Stop here if batch mode
+if strcmpi(options.batch,'yes')
+        disp('batch mode requested: not launching job interactively');
+        disp('launch solution sequence on remote cluster by hand');
+        return;
+end
+
+%Launch job
+modelname = md.miscellaneous.name;
+filelist  = {[modelname '.bin '] [modelname '.petsc '] [modelname '.queue ']};
+if md.qmu.isdakota,
+        filelist{end+1} = [modelname '.qmu.in'];
+end
+LaunchQueueJob(cluster,md.miscellaneous.name,md.private.runtimename,filelist);
+
+%did we even try to run? if so, wait on lock
+if strcmpi(options.upload,'on'),
+        disp('solve done uploading test decks');
+        return;
+end
+
+%wait on lock
+if md.settings.waitonlock>0,
+        %we wait for the done file
+        islock=waitonlock(md);
+        if islock==0, %no results to be loaded
+                disp('The results must be loaded manually with md=loadresultsfromcluster(md).');
+        else          %load results
+                disp('loading results from cluster');
+                md=loadresultsfromcluster(md);
+        end
+end
 
 %post processes qmu results if necessary
 if md.qmu.isdakota,
-        md=postqmu(md);
-        cd ..
         if ~strncmpi(options.keep,'y',1)
                 system(['rm -rf qmu' num2str(feature('GetPid'))]);
         end
 end
-
-%convert analysis type to string finally
-md.private.solution=EnumToString(options.solution_type);