Changeset 8577

Timestamp:

06/09/11 07:14:05 (14 years ago)

Author:

Mathieu Morlighem

Message:

try and use feature('GetPid') instead of our own mex GetPId

Location:

issm/trunk/src/m/model

Files:

• loadresultsfromcluster.m (modified) (2 diffs)
• parameterization/parameterize.m (modified) (1 diff)
• plot/processdata.m (modified) (1 diff)
• process_solve_options.m (modified) (2 diffs)
• solve.m (modified) (1 diff)
• solveparallel.m (modified) (2 diffs)

issm/trunk/src/m/model/loadresultsfromcluster.m

@@ -37 +37 @@
 %erase the log and output files
 if md.qmu_analysis,
-        delete([['qmu' num2str(GetPId) '/'] md.name '.outlog']);
-        delete([['qmu' num2str(GetPId) '/']  md.name '.errlog']);
+        delete([['qmu' num2str(feature('GetPid')) '/'] md.name '.outlog']);
+        delete([['qmu' num2str(feature('GetPid')) '/']  md.name '.errlog']);
 else
         delete([md.name '.outlog']);
@@ -50 +50 @@
 if strcmpi(hostname,cluster.name),
         if md.qmu_analysis,
-                delete([['qmu' num2str(GetPId) '/'] md.name '.bin']);
-                delete([['qmu' num2str(GetPId) '/'] md.name '.queue']);
+                delete([['qmu' num2str(feature('GetPid')) '/'] md.name '.bin']);
+                delete([['qmu' num2str(feature('GetPid')) '/'] md.name '.queue']);
         else
                 delete([md.name '.bin']);

issm/trunk/src/m/model/parameterization/parameterize.m

@@ -33 +33 @@
 
 %Try and run parameter file.
-temporaryname=['TemporaryParameterFile' num2str(GetPId()) ];
+temporaryname=['TemporaryParameterFile' num2str(feature('GetPid')) ];
 copyfile(parametername,[temporaryname '.m']);
 

issm/trunk/src/m/model/plot/processdata.m

@@ -183 +183 @@
         clear databak
 end
+
+%OK, if datatype=0 error out
+if datatype==0,
+        error(['data provided not recognized or not supported']);
+end

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

@@ -22 +22 @@
 
 %  process qmu arguments
-outoptions.qmudir=getfieldvalue(options,'qmudir',['qmu' num2str(GetPId)]);  % qmudir =['qmu_' datestr(now,'yyyymmdd_HHMMSS')];
+outoptions.qmudir=getfieldvalue(options,'qmudir',['qmu' num2str(feature('GetPid'))]);  % qmudir =['qmu_' datestr(now,'yyyymmdd_HHMMSS')];
 outoptions.qmufile=getfieldvalue(options,'qmufile','qmu');% qmufile cannot be changed unless ????script.sh is also changed
 outoptions.overwrite=getfieldvalue(options,'overwrite','n');
@@ -33 +33 @@
 
 %  process flaim arguments
-outoptions.fmdir=getfieldvalue(options,'fmdir',['fm' num2str(GetPId)]);
+outoptions.fmdir=getfieldvalue(options,'fmdir',['fm' num2str(feature('GetPid'))]);
 outoptions.fmfile=getfieldvalue(options,'fmfile','fm_targets');
 outoptions.overwrite=getfieldvalue(options,'overwrite','n');

issm/trunk/src/m/model/solve.m

@@ -82 +82 @@
         cd ..
         if ~strncmpi(options.keep,'y',1)
-                system(['rm -rf qmu' num2str(GetPId)]);
+                system(['rm -rf qmu' num2str(feature('GetPid'))]);
         end
 end

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

@@ -12 +12 @@
         %First, build a runtime name that is unique, that we will use to create 
         %directories, name jobs, etc ...
-        c=clock; md.runtimename=sprintf('%s-%i-%i-%i-%i-%i-%i-%i',md.name,c(2),c(3),c(1),c(4),c(5),floor(c(6)),GetPId());
+        c=clock; md.runtimename=sprintf('%s-%i-%i-%i-%i-%i-%i-%i',md.name,c(2),c(3),c(1),c(4),c(5),floor(c(6)),feature('GetPid'));
 
         %Now, we need to build the queuing script, used by the cluster to launch the job.
@@ -39 +39 @@
                 if md.qmu_analysis,
                         if ~strncmpi(options.keep,'y',1)
-                                system(['rm -rf qmu' num2str(GetPId)]);
+                                system(['rm -rf qmu' num2str(feature('GetPid'))]);
                         end
                 end