Changeset 5979

Timestamp:

09/23/10 08:44:02 (14 years ago)

Author:

Eric.Larour

Message:

Fixed missing petscrc retrieval in serial model in Solverx.
Added upload capability to solver.

Location:

issm/trunk/src

Files:

• c/modules/Solverx/Solverx.cpp (modified) (1 diff)
• m/model/LaunchQueueJob.m (modified) (1 diff)
• m/model/process_solve_options.m (modified) (1 diff)
• m/model/solveparallel.m (modified) (1 diff)

issm/trunk/src/c/modules/Solverx/Solverx.cpp

@@ -56 +56 @@
          * using the petscrc string recover in the parameters: */
         #ifdef _SERIAL_
+                
+                parameters->FindParam(&petscrc,PetscRcEnum);
                 PetscOptionsInsertMultipleString(petscrc);
 

issm/trunk/src/m/model/LaunchQueueJob.m

@@ -30 +30 @@
         issmscpout(md.cluster.name,md.cluster.executionpath,md.cluster.login,md.cluster.port,{[md.runtimename '.tar.gz']});
 
-        disp('launching solution sequence on remote cluster');
-        issmssh(md.cluster.name,md.cluster.login,md.cluster.port,LaunchCommand(md.cluster,md.runtimename,md.name));
+        if strcmpi(options.upload,'off'),
+                disp('launching solution sequence on remote cluster');
+                issmssh(md.cluster.name,md.cluster.login,md.cluster.port,LaunchCommand(md.cluster,md.runtimename,md.name));
+        end
 
 else

issm/trunk/src/m/model/process_solve_options.m

@@ -34 +34 @@
 outoptions.analysis_type=analysis_type;
 outoptions.sub_analysis_type=sub_analysis_type;
+outoptions.upload=getfieldvalue(options,'upload','off');
 
 %  process qmu arguments

issm/trunk/src/m/model/solveparallel.m

@@ -24 +24 @@
 LaunchQueueJob(md,options);
 
-%Do we return, or just wait for results?
-if (md.waitonlock~=0 &  ~strcmpi(options.batch,'yes')),
-        %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
-                displaystring(md.verbose,'loading results from cluster');
-                md=loadresultsfromcluster(md);
+if ~strcmpi(options.upload,'on'), %did we even try to run? if so, wait on lock
+
+        %Do we return, or just wait for results?
+        if (md.waitonlock~=0 &  ~strcmpi(options.batch,'yes')),
+                %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
+                        displaystring(md.verbose,'loading results from cluster');
+                        md=loadresultsfromcluster(md);
+                end
+        end
+
+        %post processes qmu results if necessary
+        if md.qmu_analysis,
+                system(['rm -rf qmu' num2str(GetPId)]);
         end
 end
 
-%post processes qmu results if necessary
-if md.qmu_analysis,
-        system(['rm -rf qmu' num2str(GetPId)]);
-end
 
-