Index: /issm/trunk/src/m/clusters/QueueRequirements.m =================================================================== --- /issm/trunk/src/m/clusters/QueueRequirements.m (revision 5955) +++ /issm/trunk/src/m/clusters/QueueRequirements.m (revision 5956) @@ -5,5 +5,4 @@ % Usage: QueueRequirements(available_queues,queue_requirements_time,queue_requirements_np,np,time) % - %Ok, go through requirements for current queue: @@ -25,9 +24,7 @@ %check on time requirements rtime=queue_requirements_time(index); - if time<=0, error('QueueRequirements: time should be a positive number'); end - if time>rtime, error(['QueueRequirements: time should be < ' num2str(rtime) ' for queue: ' queue]); @@ -37,9 +34,7 @@ rnp=queue_requirements_np(index); rmod=queue_requirements_modulo(index); - if np<=0, error('QueueRequirements: np should be a positive number'); end - if np>rnp, error(['QueueRequirements: np should be < ' num2str(rnp) ' for queue: ' queue]); Index: /issm/trunk/src/m/clusters/README =================================================================== --- /issm/trunk/src/m/clusters/README (revision 5955) +++ /issm/trunk/src/m/clusters/README (revision 5956) @@ -8,5 +8,4 @@ is much more manageable and powerful. - How to add your cluster? use an existing cluster script, such as pleiades.m, and rename it to your cluster name. Index: /issm/trunk/src/m/clusters/astrid.m =================================================================== --- /issm/trunk/src/m/clusters/astrid.m (revision 5955) +++ /issm/trunk/src/m/clusters/astrid.m (revision 5956) @@ -6,12 +6,12 @@ classdef astrid properties (SetAccess=public) - %{{{1 + % {{{1 name='astrid' np =15; %number of processors - codepath=[issmdir '/bin']; - executionpath=[issmdir '../execution']; - valgrind=[issmdir '/externalpackages/valgrind/install/bin/valgrind']; - valgrindlib=[issmdir '/externalpackages/valgrind/install/lib/libmpidebug.so']; - valgrindsup=[issmdir 'externalpackages/valgrind/issm.supp']; + codepath=[issmdir() '/bin']; + executionpath=[issmdir() '/../execution']; + valgrind=[issmdir() '/externalpackages/valgrind/install/bin/valgrind']; + valgrindlib=[issmdir() '/externalpackages/valgrind/install/lib/libmpidebug.so']; + valgrindsup=[issmdir() '/externalpackages/valgrind/issm.supp']; login='larour'; port=0; @@ -19,5 +19,5 @@ end methods - function []=disp(md) %{{{1 + function []=disp(md) % {{{1 % display the object disp(sprintf('class ''%s'' object ''%s'' = ',class(md),inputname(1))); @@ -31,5 +31,5 @@ end %}}} - function IsConsistent(md) %{{{1 + function IsConsistent(md) % {{{1 if md.np>16, error('IsConsistent error message: number of processors should be lest than 16!'); @@ -40,5 +40,5 @@ end %}}} - function BuildQueueScript(md,modelname,analysis_type,mem_debug) %{{{1 + function BuildQueueScript(md,modelname,analysis_type,mem_debug) % {{{1 %open file for writing: @@ -59,5 +59,5 @@ end %}}} - function command=LaunchCommand(md,modelruntimename,modelname)%{{{1 + function command=LaunchCommand(md,modelruntimename,modelname)% {{{1 command=['cd ' md.executionpath ' && rm -rf ./' modelruntimename ' && mkdir ' modelruntimename ' && cd ' modelruntimename ' && mv ../' modelruntimename '.tar.gz ./ && tar -zxf ' modelruntimename '.tar.gz && source ' modelname '.queue ']; end Index: /issm/trunk/src/m/clusters/castor.m =================================================================== --- /issm/trunk/src/m/clusters/castor.m (revision 5955) +++ /issm/trunk/src/m/clusters/castor.m (revision 5956) @@ -6,11 +6,11 @@ classdef castor properties (SetAccess=public) - %{{{1 + % {{{1 name='castor' - np =128; %number of processors + np =128; %number of processors queue='shortc'; time=180; - codepath=/workp/edw/larour/issm-2.0/bin - executionpath=/workp/edw/larour/Testing/Execution + codepath='/workp/edw/larour/issm-2.0/bin' + executionpath='/workp/edw/larour/Testing/Execution' login='larour'; port=0; @@ -18,5 +18,5 @@ end methods - function []=disp(md) %{{{1 + function []=disp(md) % {{{1 % display the object disp(sprintf('class ''%s'' object ''%s'' = ',class(md),inputname(1))); @@ -29,5 +29,5 @@ end %}}} - function IsConsistent(md) %{{{1 + function IsConsistent(md) % {{{1 available_queues={'shortc','longc'}; @@ -38,5 +38,5 @@ end %}}} - function BuildQueueScript(md,modelname,analysis_type,mem_debug) %{{{1 + function BuildQueueScript(md,modelname,analysis_type,mem_debug) % {{{1 %open file for writing: @@ -63,5 +63,5 @@ end %}}} - function command=LaunchCommand(md,modelruntimename,modelname)%{{{1 + function command=LaunchCommand(md,modelruntimename,modelname)% {{{1 command=['cd ' md.executionpath ' && rm -rf ./' modelruntimename ' && mkdir ' modelruntimename ' && cd ' modelruntimename ' && mv ../' modelruntimename '.tar.gz ./ && tar -zxf ' modelruntimename '.tar.gz && qsub ' modelname '.queue ']; end Index: /issm/trunk/src/m/clusters/cosmos.m =================================================================== --- /issm/trunk/src/m/clusters/cosmos.m (revision 5955) +++ /issm/trunk/src/m/clusters/cosmos.m (revision 5956) @@ -6,11 +6,11 @@ classdef cosmos properties (SetAccess=public) - %{{{1 + % {{{1 name='cosmos' - np =128; %number of processors + np =128; %number of processors queue='shortq'; time=3*60; codepath='/work00/edw/larour/issm-2.0/bin'; - executionpath='/work00/edw/larour/Execution'; + executionpath='/work00/edw/larour/Execution'; login='larour'; port=0; @@ -18,5 +18,5 @@ end methods - function []=disp(md) %{{{1 + function []=disp(md) % {{{1 % display the object disp(sprintf('class ''%s'' object ''%s'' = ',class(md),inputname(1))); @@ -29,5 +29,5 @@ end %}}} - function IsConsistent(md) %{{{1 + function IsConsistent(md) % {{{1 available_queues={'debug','shortq','longq'}; @@ -38,5 +38,5 @@ end %}}} - function BuildQueueScript(md,modelname,analysis_type,mem_debug) %{{{1 + function BuildQueueScript(md,modelname,analysis_type,mem_debug) % {{{1 %open file for writing: @@ -62,5 +62,5 @@ end %}}} - function command=LaunchCommand(md,modelruntimename,modelname)%{{{1 + function command=LaunchCommand(md,modelruntimename,modelname)% {{{1 command=['cd ' md.executionpath ' && rm -rf ./' modelruntimename ' && mkdir ' modelruntimename ' && cd ' modelruntimename ' && mv ../' modelruntimename '.tar.gz ./ && tar -zxf ' modelruntimename '.tar.gz && qsub -S/bin/sh ' modelname '.queue ']; end Index: /issm/trunk/src/m/clusters/eric-mac.m =================================================================== --- /issm/trunk/src/m/clusters/eric-mac.m (revision 5955) +++ /issm/trunk/src/m/clusters/eric-mac.m (revision 5956) @@ -6,12 +6,12 @@ classdef astrid properties (SetAccess=public) - %{{{1 + % {{{1 name='eric-mac' np =3; %number of processors - codepath=[issmdir '/bin']; - executionpath=[issmdir '../execution']; - valgrind=[issmdir '/externalpackages/valgrind/install/bin/valgrind']; - valgrindlib=[issmdir '/externalpackages/valgrind/install/lib/libmpidebug.so']; - valgrindsup=[issmdir 'externalpackages/valgrind/issm.supp']; + codepath=[issmdir() '/bin']; + executionpath=[issmdir() '/../execution']; + valgrind=[issmdir() '/externalpackages/valgrind/install/bin/valgrind']; + valgrindlib=[issmdir() '/externalpackages/valgrind/install/lib/libmpidebug.so']; + valgrindsup=[issmdir() '/externalpackages/valgrind/issm.supp']; login='larour'; port=0; @@ -19,5 +19,5 @@ end methods - function []=disp(md) %{{{1 + function []=disp(md) % {{{1 % display the object disp(sprintf('class ''%s'' object ''%s'' = ',class(md),inputname(1))); @@ -31,5 +31,5 @@ end %}}} - function IsConsistent(md) %{{{1 + function IsConsistent(md) % {{{1 if md.np>4, error('IsConsistent error message: number of processors should be lest than 16!'); @@ -40,5 +40,5 @@ end %}}} - function BuildQueueScript(md,modelname,analysis_type,mem_debug) %{{{1 + function BuildQueueScript(md,modelname,analysis_type,mem_debug) % {{{1 %open file for writing: @@ -59,5 +59,5 @@ end %}}} - function command=LaunchCommand(md,modelruntimename,modelname)%{{{1 + function command=LaunchCommand(md,modelruntimename,modelname)% {{{1 command=['cd ' md.executionpath ' && rm -rf ./' modelruntimename ' && mkdir ' modelruntimename ' && cd ' modelruntimename ' && mv ../' modelruntimename '.tar.gz ./ && tar -zxf ' modelruntimename '.tar.gz && source ' modelname '.queue ']; end Index: /issm/trunk/src/m/clusters/gemini.m =================================================================== --- /issm/trunk/src/m/clusters/gemini.m (revision 5955) +++ /issm/trunk/src/m/clusters/gemini.m (revision 5956) @@ -6,11 +6,11 @@ classdef gemini properties (SetAccess=public) - %{{{1 + % {{{1 name='gemini' - np =50; %number of processors + np =50; %number of processors queue='debug'; time=60; - codepath=/workg/edw/larour/issm-2.0/bin - executionpath=/workg/edw/larour/Testing/Execution + codepath='/workg/edw/larour/issm-2.0/bin' + executionpath='/workg/edw/larour/Testing/Execution' login='larour'; port=0; @@ -18,5 +18,5 @@ end methods - function []=disp(md) %{{{1 + function []=disp(md) % {{{1 % display the object disp(sprintf('class ''%s'' object ''%s'' = ',class(md),inputname(1))); @@ -29,5 +29,5 @@ end %}}} - function IsConsistent(md) %{{{1 + function IsConsistent(md) % {{{1 available_queues={'debug','shortg','longg'}; @@ -38,5 +38,5 @@ end %}}} - function BuildQueueScript(md,modelname,analysis_type,mem_debug) %{{{1 + function BuildQueueScript(md,modelname,analysis_type,mem_debug) % {{{1 %open file for writing: @@ -63,5 +63,5 @@ end %}}} - function command=LaunchCommand(md,modelruntimename,modelname)%{{{1 + function command=LaunchCommand(md,modelruntimename,modelname)% {{{1 command=['cd ' md.executionpath ' && rm -rf ./' modelruntimename ' && mkdir ' modelruntimename ' && cd ' modelruntimename ' && mv ../' modelruntimename '.tar.gz ./ && tar -zxf ' modelruntimename '.tar.gz && qsub ' modelname '.queue ']; end @@ -69,5 +69,2 @@ end end - - - Index: /issm/trunk/src/m/clusters/larsen.m =================================================================== --- /issm/trunk/src/m/clusters/larsen.m (revision 5955) +++ /issm/trunk/src/m/clusters/larsen.m (revision 5956) @@ -6,12 +6,12 @@ classdef larsen properties (SetAccess=public) - %{{{1 + % {{{1 name='larsen' - np =7; %number of processors - codepath=[issmdir '/bin']; - executionpath=[issmdir '../execution']; - valgrind=[issmdir '/externalpackages/valgrind/install/bin/valgrind']; - valgrindlib=[issmdir '/externalpackages/valgrind/install/lib/libmpidebug.so']; - valgrindsup=[issmdir 'externalpackages/valgrind/issm.supp']; + np=7; + codepath=[issmdir() '/bin']; + executionpath=[issmdir() '/../execution']; + valgrind=[issmdir() '/externalpackages/valgrind/install/bin/valgrind']; + valgrindlib=[issmdir() '/externalpackages/valgrind/install/lib/libmpidebug.so']; + valgrindsup=[issmdir() '/externalpackages/valgrind/issm.supp']; login='larour'; port=0; @@ -19,5 +19,5 @@ end methods - function []=disp(md) %{{{1 + function []=disp(md) % {{{1 % display the object disp(sprintf('class ''%s'' object ''%s'' = ',class(md),inputname(1))); @@ -31,5 +31,5 @@ end %}}} - function IsConsistent(md) %{{{1 + function IsConsistent(md) % {{{1 if md.np>8, error('IsConsistent error message: number of processors should be lest than 16!'); @@ -40,5 +40,5 @@ end %}}} - function BuildQueueScript(md,modelname,analysis_type,mem_debug) %{{{1 + function BuildQueueScript(md,modelname,analysis_type,mem_debug) % {{{1 %open file for writing: @@ -59,5 +59,5 @@ end %}}} - function command=LaunchCommand(md,modelruntimename,modelname)%{{{1 + function command=LaunchCommand(md,modelruntimename,modelname)% {{{1 command=['cd ' md.executionpath ' && rm -rf ./' modelruntimename ' && mkdir ' modelruntimename ' && cd ' modelruntimename ' && mv ../' modelruntimename '.tar.gz ./ && tar -zxf ' modelruntimename '.tar.gz && source ' modelname '.queue ']; end Index: /issm/trunk/src/m/clusters/none.m =================================================================== --- /issm/trunk/src/m/clusters/none.m (revision 5955) +++ /issm/trunk/src/m/clusters/none.m (revision 5956) @@ -8,7 +8,6 @@ name='none' end - methods - function []=disp(md) %{{{1 + function []=disp(md) % {{{1 % display the object disp(sprintf('cluster class ''%s'' object ''%s'' = ',class(md),inputname(1))); @@ -16,8 +15,8 @@ end %}}} - function IsConsistent(md) %{{{1 + function IsConsistent(md) % {{{1 end %}}} - function BuildQueueScript(md,modelname,analysis_type,mem_debug) %{{{1 + function BuildQueueScript(md,modelname,analysis_type,mem_debug) % {{{1 error('none.BuildQueueScript error message: serial cluster cannot build queue script'); end Index: /issm/trunk/src/m/clusters/pfe.m =================================================================== --- /issm/trunk/src/m/clusters/pfe.m (revision 5955) +++ /issm/trunk/src/m/clusters/pfe.m (revision 5956) @@ -6,8 +6,8 @@ classdef pfe properties (SetAccess=public) - %{{{1 + % {{{1 name='pfe' numnodes=20; - cpuspernode=8; + cpuspernode=8; queue='long'; time=12*60; @@ -23,5 +23,5 @@ end methods - function []=disp(md) %{{{1 + function []=disp(md) % {{{1 % display the object disp(sprintf('class ''%s'' object ''%s'' = ',class(md),inputname(1))); @@ -37,5 +37,5 @@ end %}}} - function IsConsistent(md) %{{{1 + function IsConsistent(md) % {{{1 available_queues={'long'}; @@ -60,5 +60,5 @@ end %}}} - function BuildQueueScript(md,modelname,analysis_type,mem_debug) %{{{1 + function BuildQueueScript(md,modelname,analysis_type,mem_debug) % {{{1 md.np=md.numnodes*md.cpuspernode; @@ -93,5 +93,5 @@ end %}}} - function command=LaunchCommand(md,modelruntimename,modelname)%{{{1 + function command=LaunchCommand(md,modelruntimename,modelname)% {{{1 command=['cd ' md.executionpath ' && rm -rf ./' modelruntimename ' && mkdir ' modelruntimename ' && cd ' modelruntimename ' && mv ../' modelruntimename '.tar.gz ./ && tar -zxf ' modelruntimename '.tar.gz && qsub ' modelname '.queue ']; end Index: /issm/trunk/src/m/clusters/pollux.m =================================================================== --- /issm/trunk/src/m/clusters/pollux.m (revision 5955) +++ /issm/trunk/src/m/clusters/pollux.m (revision 5956) @@ -6,11 +6,11 @@ classdef pollux properties (SetAccess=public) - %{{{1 + % {{{1 name='pollux' - np =128; %number of processors + np =128; %number of processors queue='shortp'; time=180; - codepath=/workc/edw/larour/issm-2.0/bin - executionpath=/workc/edw/larour/Testing/Execution + codepath='/workc/edw/larour/issm-2.0/bin' + executionpath='/workc/edw/larour/Testing/Execution' login='larour'; port=0; @@ -18,5 +18,5 @@ end methods - function []=disp(md) %{{{1 + function []=disp(md) % {{{1 % display the object disp(sprintf('class ''%s'' object ''%s'' = ',class(md),inputname(1))); @@ -29,5 +29,5 @@ end %}}} - function IsConsistent(md) %{{{1 + function IsConsistent(md) % {{{1 available_queues={'shortp','longp'}; @@ -38,5 +38,5 @@ end %}}} - function BuildQueueScript(md,modelname,analysis_type,mem_debug) %{{{1 + function BuildQueueScript(md,modelname,analysis_type,mem_debug) % {{{1 %open file for writing: @@ -63,5 +63,5 @@ end %}}} - function command=LaunchCommand(md,modelruntimename,modelname)%{{{1 + function command=LaunchCommand(md,modelruntimename,modelname)% {{{1 command=['cd ' md.executionpath ' && rm -rf ./' modelruntimename ' && mkdir ' modelruntimename ' && cd ' modelruntimename ' && mv ../' modelruntimename '.tar.gz ./ && tar -zxf ' modelruntimename '.tar.gz && qsub ' modelname '.queue ']; end @@ -69,5 +69,2 @@ end end - - - Index: /issm/trunk/src/m/clusters/wilkes.m =================================================================== --- /issm/trunk/src/m/clusters/wilkes.m (revision 5955) +++ /issm/trunk/src/m/clusters/wilkes.m (revision 5956) @@ -6,12 +6,12 @@ classdef wilkes properties (SetAccess=public) - %{{{1 + % {{{1 name='wilkes' np =7; %number of processors - codepath=[issmdir '/bin']; - executionpath=[issmdir '../execution']; - valgrind=[issmdir '/externalpackages/valgrind/install/bin/valgrind']; - valgrindlib=[issmdir '/externalpackages/valgrind/install/lib/libmpidebug.so']; - valgrindsup=[issmdir 'externalpackages/valgrind/issm.supp']; + codepath=[issmdir() '/bin']; + executionpath=[issmdir() '/../execution']; + valgrind=[issmdir() '/externalpackages/valgrind/install/bin/valgrind']; + valgrindlib=[issmdir() '/externalpackages/valgrind/install/lib/libmpidebug.so']; + valgrindsup=[issmdir() '/externalpackages/valgrind/issm.supp']; login='larour'; port=0; @@ -19,5 +19,5 @@ end methods - function []=disp(md) %{{{1 + function []=disp(md) % {{{1 % display the object disp(sprintf('class ''%s'' object ''%s'' = ',class(md),inputname(1))); @@ -31,5 +31,5 @@ end %}}} - function IsConsistent(md) %{{{1 + function IsConsistent(md) % {{{1 if md.np>8, error('IsConsistent error message: number of processors should be lest than 16!'); @@ -40,5 +40,5 @@ end %}}} - function BuildQueueScript(md,modelname,analysis_type,mem_debug) %{{{1 + function BuildQueueScript(md,modelname,analysis_type,mem_debug) % {{{1 %open file for writing: @@ -59,5 +59,5 @@ end %}}} - function command=LaunchCommand(md,modelruntimename,modelname)%{{{1 + function command=LaunchCommand(md,modelruntimename,modelname)% {{{1 command=['cd ' md.executionpath ' && rm -rf ./' modelruntimename ' && mkdir ' modelruntimename ' && cd ' modelruntimename ' && mv ../' modelruntimename '.tar.gz ./ && tar -zxf ' modelruntimename '.tar.gz && source ' modelname '.queue ']; end Index: /issm/trunk/src/m/model/ismodelselfconsistent.m =================================================================== --- /issm/trunk/src/m/model/ismodelselfconsistent.m (revision 5955) +++ /issm/trunk/src/m/model/ismodelselfconsistent.m (revision 5956) @@ -190,5 +190,5 @@ %}}} %PARALLEL{{{1 -md.cluster.IsConsistent; +IsConsistent(md.cluster); %}}}