Changeset 8577


Ignore:
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:
6 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/m/model/loadresultsfromcluster.m

    r6130 r8577  
    3737%erase the log and output files
    3838if md.qmu_analysis,
    39         delete([['qmu' num2str(GetPId) '/'] md.name '.outlog']);
    40         delete([['qmu' num2str(GetPId) '/']  md.name '.errlog']);
     39        delete([['qmu' num2str(feature('GetPid')) '/'] md.name '.outlog']);
     40        delete([['qmu' num2str(feature('GetPid')) '/']  md.name '.errlog']);
    4141else
    4242        delete([md.name '.outlog']);
     
    5050if strcmpi(hostname,cluster.name),
    5151        if md.qmu_analysis,
    52                 delete([['qmu' num2str(GetPId) '/'] md.name '.bin']);
    53                 delete([['qmu' num2str(GetPId) '/'] md.name '.queue']);
     52                delete([['qmu' num2str(feature('GetPid')) '/'] md.name '.bin']);
     53                delete([['qmu' num2str(feature('GetPid')) '/'] md.name '.queue']);
    5454        else
    5555                delete([md.name '.bin']);
  • issm/trunk/src/m/model/parameterization/parameterize.m

    r5972 r8577  
    3333
    3434%Try and run parameter file.
    35 temporaryname=['TemporaryParameterFile' num2str(GetPId()) ];
     35temporaryname=['TemporaryParameterFile' num2str(feature('GetPid')) ];
    3636copyfile(parametername,[temporaryname '.m']);
    3737
  • issm/trunk/src/m/model/plot/processdata.m

    r8298 r8577  
    183183        clear databak
    184184end
     185
     186%OK, if datatype=0 error out
     187if datatype==0,
     188        error(['data provided not recognized or not supported']);
     189end
  • issm/trunk/src/m/model/process_solve_options.m

    r8495 r8577  
    2222
    2323%  process qmu arguments
    24 outoptions.qmudir=getfieldvalue(options,'qmudir',['qmu' num2str(GetPId)]);  % qmudir =['qmu_' datestr(now,'yyyymmdd_HHMMSS')];
     24outoptions.qmudir=getfieldvalue(options,'qmudir',['qmu' num2str(feature('GetPid'))]);  % qmudir =['qmu_' datestr(now,'yyyymmdd_HHMMSS')];
    2525outoptions.qmufile=getfieldvalue(options,'qmufile','qmu');% qmufile cannot be changed unless ????script.sh is also changed
    2626outoptions.overwrite=getfieldvalue(options,'overwrite','n');
     
    3333
    3434%  process flaim arguments
    35 outoptions.fmdir=getfieldvalue(options,'fmdir',['fm' num2str(GetPId)]);
     35outoptions.fmdir=getfieldvalue(options,'fmdir',['fm' num2str(feature('GetPid'))]);
    3636outoptions.fmfile=getfieldvalue(options,'fmfile','fm_targets');
    3737outoptions.overwrite=getfieldvalue(options,'overwrite','n');
  • issm/trunk/src/m/model/solve.m

    r8430 r8577  
    8282        cd ..
    8383        if ~strncmpi(options.keep,'y',1)
    84                 system(['rm -rf qmu' num2str(GetPId)]);
     84                system(['rm -rf qmu' num2str(feature('GetPid'))]);
    8585        end
    8686end
  • issm/trunk/src/m/model/solveparallel.m

    r8330 r8577  
    1212        %First, build a runtime name that is unique, that we will use to create
    1313        %directories, name jobs, etc ...
    14         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());
     14        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'));
    1515
    1616        %Now, we need to build the queuing script, used by the cluster to launch the job.
     
    3939                if md.qmu_analysis,
    4040                        if ~strncmpi(options.keep,'y',1)
    41                                 system(['rm -rf qmu' num2str(GetPId)]);
     41                                system(['rm -rf qmu' num2str(feature('GetPid'))]);
    4242                        end
    4343                end
Note: See TracChangeset for help on using the changeset viewer.