Index: /issm/trunk/src/m/classes/clusters/castor.m =================================================================== --- /issm/trunk/src/m/classes/clusters/castor.m (revision 9613) +++ /issm/trunk/src/m/classes/clusters/castor.m (revision 9614) @@ -59,5 +59,5 @@ %retrieve parameters modelname=md.name; - solution_type=md.solution_type; + solution_type=md.private.solution; %open file for writing: @@ -87,11 +87,11 @@ %lauch command, to be executed via ssh - launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' md.runtimename ' && mkdir ' md.runtimename ... - ' && cd ' md.runtimename ' && mv ../' md.runtimename '.tar.gz ./ && tar -zxf ' md.runtimename '.tar.gz && qsub ' modelname '.queue ']; + launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' md.private.runtimename ' && mkdir ' md.private.runtimename ... + ' && cd ' md.private.runtimename ' && mv ../' md.private.runtimename '.tar.gz ./ && tar -zxf ' md.private.runtimename '.tar.gz && qsub ' modelname '.queue ']; if ~strcmpi(options.batch,'yes'), %compress the files into one zip. - compressstring=['tar -zcf ' md.runtimename '.tar.gz ' md.name '.bin ' md.name '.queue ' md.name '.petsc ']; + compressstring=['tar -zcf ' md.private.runtimename '.tar.gz ' md.name '.bin ' md.name '.queue ' md.name '.petsc ']; if md.dakota_analysis, compressstring=[compressstring md.name '.qmu.in']; @@ -100,5 +100,5 @@ disp('uploading input file and queueing script'); - issmscpout(md.cluster.name,md.cluster.executionpath,md.cluster.login,md.cluster.port,{[md.runtimename '.tar.gz']}); + issmscpout(md.cluster.name,md.cluster.executionpath,md.cluster.login,md.cluster.port,{[md.private.runtimename '.tar.gz']}); disp('launching solution sequence on remote cluster'); @@ -115,10 +115,10 @@ %some check - if isempty(md.runtimename), + if isempty(md.private.runtimename), error('pfe Download error message: supply runtime name for results to be loaded!'); end %Figure out the directory where all the files are in: - directory=[cluster.executionpath '/' md.runtimename '/']; + directory=[cluster.executionpath '/' md.private.runtimename '/']; %What packages are we picking up from remote cluster Index: /issm/trunk/src/m/classes/clusters/cosmos.m =================================================================== --- /issm/trunk/src/m/classes/clusters/cosmos.m (revision 9613) +++ /issm/trunk/src/m/classes/clusters/cosmos.m (revision 9614) @@ -59,5 +59,5 @@ %retrieve parameters modelname=md.name; - solution_type=md.solution_type; + solution_type=md.private.solution; %open file for writing: @@ -86,11 +86,11 @@ %lauch command, to be executed via ssh - launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' md.runtimename ' && mkdir ' md.runtimename ... - ' && cd ' md.runtimename ' && mv ../' md.runtimename '.tar.gz ./ && tar -zxf ' md.runtimename '.tar.gz && qsub -S/bin/sh ' modelname '.queue ']; + launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' md.private.runtimename ' && mkdir ' md.private.runtimename ... + ' && cd ' md.private.runtimename ' && mv ../' md.private.runtimename '.tar.gz ./ && tar -zxf ' md.private.runtimename '.tar.gz && qsub -S/bin/sh ' modelname '.queue ']; if ~strcmpi(options.batch,'yes'), %compress the files into one zip. - compressstring=['tar -zcf ' md.runtimename '.tar.gz ' md.name '.bin ' md.name '.queue ' md.name '.petsc ']; + compressstring=['tar -zcf ' md.private.runtimename '.tar.gz ' md.name '.bin ' md.name '.queue ' md.name '.petsc ']; if md.dakota_analysis, compressstring=[compressstring md.name '.qmu.in']; @@ -99,5 +99,5 @@ disp('uploading input file and queueing script'); - issmscpout(md.cluster.name,md.cluster.executionpath,md.cluster.login,md.cluster.port,{[md.runtimename '.tar.gz']}); + issmscpout(md.cluster.name,md.cluster.executionpath,md.cluster.login,md.cluster.port,{[md.private.runtimename '.tar.gz']}); disp('launching solution sequence on remote cluster'); @@ -114,10 +114,10 @@ %some check - if isempty(md.runtimename), + if isempty(md.private.runtimename), error('pfe Download error message: supply runtime name for results to be loaded!'); end %Figure out the directory where all the files are in: - directory=[cluster.executionpath '/' md.runtimename '/']; + directory=[cluster.executionpath '/' md.private.runtimename '/']; %What packages are we picking up from remote cluster Index: /issm/trunk/src/m/classes/clusters/gemini.m =================================================================== --- /issm/trunk/src/m/classes/clusters/gemini.m (revision 9613) +++ /issm/trunk/src/m/classes/clusters/gemini.m (revision 9614) @@ -59,5 +59,5 @@ %retrieve parameters modelname=md.name; - solution_type=md.solution_type; + solution_type=md.private.solution; %open file for writing: @@ -87,11 +87,11 @@ %lauch command, to be executed via ssh - launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' md.runtimename ' && mkdir ' md.runtimename ... - ' && cd ' md.runtimename ' && mv ../' md.runtimename '.tar.gz ./ && tar -zxf ' md.runtimename '.tar.gz && qsub ' modelname '.queue ']; + launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' md.private.runtimename ' && mkdir ' md.private.runtimename ... + ' && cd ' md.private.runtimename ' && mv ../' md.private.runtimename '.tar.gz ./ && tar -zxf ' md.private.runtimename '.tar.gz && qsub ' modelname '.queue ']; if ~strcmpi(options.batch,'yes'), %compress the files into one zip. - compressstring=['tar -zcf ' md.runtimename '.tar.gz ' md.name '.bin ' md.name '.queue ' md.name '.petsc ']; + compressstring=['tar -zcf ' md.private.runtimename '.tar.gz ' md.name '.bin ' md.name '.queue ' md.name '.petsc ']; if md.dakota_analysis, compressstring=[compressstring md.name '.qmu.in']; @@ -100,5 +100,5 @@ disp('uploading input file and queueing script'); - issmscpout(md.cluster.name,md.cluster.executionpath,md.cluster.login,md.cluster.port,{[md.runtimename '.tar.gz']}); + issmscpout(md.cluster.name,md.cluster.executionpath,md.cluster.login,md.cluster.port,{[md.private.runtimename '.tar.gz']}); disp('launching solution sequence on remote cluster'); @@ -115,10 +115,10 @@ %some check - if isempty(md.runtimename), + if isempty(md.private.runtimename), error('pfe Download error message: supply runtime name for results to be loaded!'); end %Figure out the directory where all the files are in: - directory=[cluster.executionpath '/' md.runtimename '/']; + directory=[cluster.executionpath '/' md.private.runtimename '/']; %What packages are we picking up from remote cluster Index: /issm/trunk/src/m/classes/clusters/generic.m =================================================================== --- /issm/trunk/src/m/classes/clusters/generic.m (revision 9613) +++ /issm/trunk/src/m/classes/clusters/generic.m (revision 9614) @@ -73,5 +73,5 @@ %retrieve parameters modelname=md.name; - solution_type=md.solution_type; + solution_type=md.private.solution; isvalgrind=md.debug.valgrind; isgprof=md.debug.gprof; @@ -116,11 +116,11 @@ %lauch command, to be executed via ssh - launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' md.runtimename ' && mkdir ' md.runtimename ... - ' && cd ' md.runtimename ' && mv ../' md.runtimename '.tar.gz ./ && tar -zxf ' md.runtimename '.tar.gz && source ' md.name '.queue ']; + launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' md.private.runtimename ' && mkdir ' md.private.runtimename ... + ' && cd ' md.private.runtimename ' && mv ../' md.private.runtimename '.tar.gz ./ && tar -zxf ' md.private.runtimename '.tar.gz && source ' md.name '.queue ']; if ~strcmpi(options.batch,'yes'), %compress the files into one zip. - compressstring=['tar -zcf ' md.runtimename '.tar.gz ' md.name '.bin ' md.name '.queue ' md.name '.petsc ']; + compressstring=['tar -zcf ' md.private.runtimename '.tar.gz ' md.name '.bin ' md.name '.queue ' md.name '.petsc ']; if md.dakota_analysis, compressstring=[compressstring md.name '.qmu.in']; @@ -132,5 +132,5 @@ disp('uploading input file and queueing script'); - issmscpout(cluster.name,cluster.executionpath,cluster.login,cluster.port,{[md.runtimename '.tar.gz']}); + issmscpout(cluster.name,cluster.executionpath,cluster.login,cluster.port,{[md.private.runtimename '.tar.gz']}); disp('launching solution sequence on remote cluster'); @@ -145,10 +145,10 @@ %some check - if isempty(md.runtimename), + if isempty(md.private.runtimename), error('supply runtime name for results to be loaded!'); end %Figure out the directory where all the files are in: - directory=[cluster.executionpath '/' md.runtimename '/']; + directory=[cluster.executionpath '/' md.private.runtimename '/']; %What packages are we picking up from remote cluster Index: /issm/trunk/src/m/classes/clusters/pfe.m =================================================================== --- /issm/trunk/src/m/classes/clusters/pfe.m (revision 9613) +++ /issm/trunk/src/m/classes/clusters/pfe.m (revision 9614) @@ -109,5 +109,5 @@ %retrieve parameters modelname=md.name; - solution_type=md.solution_type; + solution_type=md.private.solution; isvalgrind=md.debug.valgrind; @@ -172,8 +172,8 @@ %lauch command, to be executed via ssh if ~cluster.interactive, - launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' md.runtimename ' && mkdir ' md.runtimename ... - ' && cd ' md.runtimename ' && mv ../' md.runtimename '.tar.gz ./ && tar -zxf ' md.runtimename '.tar.gz && qsub ' md.name '.queue ']; - else - launchcommand=['cd ' cluster.executionpath '/Interactive' num2str(cluster.interactive) ' && tar -zxf ' md.runtimename '.tar.gz']; + launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' md.private.runtimename ' && mkdir ' md.private.runtimename ... + ' && cd ' md.private.runtimename ' && mv ../' md.private.runtimename '.tar.gz ./ && tar -zxf ' md.private.runtimename '.tar.gz && qsub ' md.name '.queue ']; + else + launchcommand=['cd ' cluster.executionpath '/Interactive' num2str(cluster.interactive) ' && tar -zxf ' md.private.runtimename '.tar.gz']; end @@ -181,5 +181,5 @@ %compress the files into one zip. - compressstring=['tar -zcf ' md.runtimename '.tar.gz ' md.name '.bin ' md.name '.queue ' md.name '.petsc ']; + compressstring=['tar -zcf ' md.private.runtimename '.tar.gz ' md.name '.bin ' md.name '.queue ' md.name '.petsc ']; if md.dakota_analysis, compressstring=[compressstring md.name '.qmu.in ']; @@ -198,7 +198,7 @@ if ~cluster.bbftp, - issmscpout(cluster.name,directory,cluster.login,cluster.port,{[md.runtimename '.tar.gz']}); + issmscpout(cluster.name,directory,cluster.login,cluster.port,{[md.private.runtimename '.tar.gz']}); else - issmbbftpout(cluster.name,directory,cluster.login,cluster.port,cluster.numstreams,{[md.runtimename '.tar.gz']}); + issmbbftpout(cluster.name,directory,cluster.login,cluster.port,cluster.numstreams,{[md.private.runtimename '.tar.gz']}); end @@ -215,5 +215,5 @@ %some check - if isempty(md.runtimename), + if isempty(md.private.runtimename), if ~cluster.interactive, error('pfe Download error message: supply runtime name for results to be loaded!'); @@ -223,5 +223,5 @@ %Figure out the directory where all the files are in: if ~cluster.interactive, - directory=[cluster.executionpath '/' md.runtimename '/']; + directory=[cluster.executionpath '/' md.private.runtimename '/']; else directory=[cluster.executionpath '/Interactive' num2str(cluster.interactive) '/']; Index: /issm/trunk/src/m/classes/clusters/pollux.m =================================================================== --- /issm/trunk/src/m/classes/clusters/pollux.m (revision 9613) +++ /issm/trunk/src/m/classes/clusters/pollux.m (revision 9614) @@ -59,5 +59,5 @@ %retrieve parameters modelname=md.name; - solution_type=md.solution_type; + solution_type=md.private.solution; %open file for writing: @@ -87,11 +87,11 @@ %lauch command, to be executed via ssh - launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' md.runtimename ' && mkdir ' md.runtimename ... - ' && cd ' md.runtimename ' && mv ../' md.runtimename '.tar.gz ./ && tar -zxf ' md.runtimename '.tar.gz && qsub ' modelname '.queue ']; + launchcommand=['cd ' cluster.executionpath ' && rm -rf ./' md.private.runtimename ' && mkdir ' md.private.runtimename ... + ' && cd ' md.private.runtimename ' && mv ../' md.private.runtimename '.tar.gz ./ && tar -zxf ' md.private.runtimename '.tar.gz && qsub ' modelname '.queue ']; if ~strcmpi(options.batch,'yes'), %compress the files into one zip. - compressstring=['tar -zcf ' md.runtimename '.tar.gz ' md.name '.bin ' md.name '.queue ' md.name '.petsc ']; + compressstring=['tar -zcf ' md.private.runtimename '.tar.gz ' md.name '.bin ' md.name '.queue ' md.name '.petsc ']; if md.dakota_analysis, compressstring=[compressstring md.name '.qmu.in']; @@ -100,5 +100,5 @@ disp('uploading input file and queueing script'); - issmscpout(md.cluster.name,md.cluster.executionpath,md.cluster.login,md.cluster.port,{[md.runtimename '.tar.gz']}); + issmscpout(md.cluster.name,md.cluster.executionpath,md.cluster.login,md.cluster.port,{[md.private.runtimename '.tar.gz']}); disp('launching solution sequence on remote cluster'); @@ -115,10 +115,10 @@ %some check - if isempty(md.runtimename), + if isempty(md.private.runtimename), error('pfe Download error message: supply runtime name for results to be loaded!'); end %Figure out the directory where all the files are in: - directory=[cluster.executionpath '/' md.runtimename '/']; + directory=[cluster.executionpath '/' md.private.runtimename '/']; %What packages are we picking up from remote cluster Index: /issm/trunk/src/m/classes/model/model.m =================================================================== --- /issm/trunk/src/m/classes/model/model.m (revision 9613) +++ /issm/trunk/src/m/classes/model/model.m (revision 9614) @@ -18,4 +18,5 @@ basalforcings = modelfield('default',0,'marshall',true); friction = modelfield('default',0,'marshall',true); + private = modelfield('default',0,'marshall',false); %FIXME: all other fields should belong to other classes @@ -24,8 +25,6 @@ notes = modelfield('default','','marshall',false); name = modelfield('default','','marshall',true,'format','String'); - runtimename = modelfield('default','','marshall',false); %name used when running a parallel job %Mesh - bamg = modelfield('default',struct(),'marshall',false); dim = modelfield('default',0,'marshall',true,'format','Integer'); numberofelements = modelfield('default',0,'marshall',true,'format','Integer'); @@ -224,7 +223,4 @@ dummy = modelfield('default',NaN,'marshall',false); - %Analysis - solution_type = modelfield('default','','marshall',false); - %radar power images sarpwr = modelfield('default',NaN,'marshall',false); @@ -549,4 +545,5 @@ md.basalforcings=basalforcings; md.friction=friction; + md.private=private; %Materials parameters Index: /issm/trunk/src/m/classes/private.m =================================================================== --- /issm/trunk/src/m/classes/private.m (revision 9614) +++ /issm/trunk/src/m/classes/private.m (revision 9614) @@ -0,0 +1,39 @@ +%PRIVATE class definition +% +% Usage: +% private=private(); + +classdef private + properties (SetAccess=public) + runtimename = modelfield('default','','marshall',false); + bamg = modelfield('default',0,'marshall',false); + solution = modelfield('default','','marshall',false); + end + methods + function obj = private(varargin) % {{{ + switch nargin + case 0 + obj=setdefaultparameters(obj); + case 1 + in=varargin{1}; + if (isa(in,'numeric') & in==0), + % requesting templates do nothing + else + error('constructor not supported'); + end + otherwise + error('constructor not supported'); + end + end % }}} + function obj = setdefaultparameters(obj) % {{{ + + %first, use the defaults provided by the properties definition above. + fieldnames=fields(obj); + for i=1:length(fieldnames), + fieldname=fieldnames{i}; + obj.(fieldname)=obj.(fieldname).default; + end + + end % }}} + end +end Index: /issm/trunk/src/m/model/bamg.m =================================================================== --- /issm/trunk/src/m/model/bamg.m (revision 9613) +++ /issm/trunk/src/m/model/bamg.m (revision 9614) @@ -253,7 +253,7 @@ %bamg_geometry=processgeometry(bamg_geometry,getfieldvalue(options,'tol',NaN),domain(1)); -elseif isstruct(md.bamg), - - bamg_geometry=bamggeom(md.bamg.geometry); %TEST +elseif isstruct(md.private.bamg), + + bamg_geometry=bamggeom(md.private.bamg.geometry); %TEST else @@ -267,6 +267,6 @@ if (~exist(options,'domain') & md.numberofnodes~=0 & md.dim==2), - if isstruct(md.bamg), - bamg_mesh=bamgmesh(md.bamg.mesh); + if isstruct(md.private.bamg), + bamg_mesh=bamgmesh(md.private.bamg.mesh); else bamg_mesh.Vertices=[md.x md.y ones(md.numberofnodes,1)]; @@ -314,7 +314,7 @@ % plug results onto model -md.bamg=struct(); -md.bamg.mesh=bamgmesh(bamgmesh_out); -md.bamg.geometry=bamggeom(bamggeom_out); +md.private.bamg=struct(); +md.private.bamg.mesh=bamgmesh(bamgmesh_out); +md.private.bamg.geometry=bamggeom(bamggeom_out); md.x=bamgmesh_out.Vertices(:,1); md.y=bamgmesh_out.Vertices(:,2); @@ -335,5 +335,5 @@ md.elementonsurface=ones(md.numberofelements,1); md.nodeonboundary=zeros(md.numberofnodes,1); md.nodeonboundary(md.segments(:,1:2))=1; -md.elementconnectivity=md.bamg.mesh.ElementConnectivity; +md.elementconnectivity=md.private.bamg.mesh.ElementConnectivity; md.elementconnectivity(find(isnan(md.elementconnectivity)))=0; Index: /issm/trunk/src/m/model/ismodelselfconsistent.m =================================================================== --- /issm/trunk/src/m/model/ismodelselfconsistent.m (revision 9613) +++ /issm/trunk/src/m/model/ismodelselfconsistent.m (revision 9614) @@ -19,5 +19,5 @@ % Flaim doesn't need the entire model, so take an early return %FLAIM {{{1 -if (md.solution_type == FlaimSolutionEnum), +if (md.private.solution == FlaimSolutionEnum), if ~exist(md.flaim.tracks,'file') message(['model not consistent: flaim.tracks file ''' md.flaim.tracks ''' must exist.']); @@ -229,5 +229,5 @@ %OBSERVED VELOCITIES - if md.solution_type==BalancethicknessSolutionEnum + if md.private.solution==BalancethicknessSolutionEnum fields={'thickness_obs'}; checksize(md,fields,[md.numberofnodes 1]); @@ -278,5 +278,5 @@ end -if strcmpi(md.solution_type,'qmu'), +if strcmpi(md.private.solution,'qmu'), if ~strcmpi(md.cluster.name,'none'), if md.waitonlock==0, @@ -289,5 +289,5 @@ %Solution specific check %TRANSIENT {{{1 -if (md.solution_type==TransientSolutionEnum), +if (md.private.solution==TransientSolutionEnum), if md.dt<=0, @@ -312,5 +312,5 @@ %}}} %STEADYSTATE{{{1 -if md.solution_type==SteadystateSolutionEnum, +if md.private.solution==SteadystateSolutionEnum, %NDT @@ -326,7 +326,7 @@ %}}} %GROUNDINGLINEMIGRATION2D{{{1 -if md.solution_type==GroundinglineMigration2DSolutionEnum, +if md.private.solution==GroundinglineMigration2DSolutionEnum, if strcmpi(md.cluster.name,'none'), - message(['model not consistent: ' md.solution_type ' is only implemented in parallel mode !']) + message(['model not consistent: ' md.private.solution ' is only implemented in parallel mode !']) end @@ -336,5 +336,5 @@ if (md.dim~=2), - message(['model not consistent: for a ' md.solution_type ' computation, the grounding line module is only implemented in 2d !']) + message(['model not consistent: for a ' md.private.solution ' computation, the grounding line module is only implemented in 2d !']) end @@ -347,5 +347,5 @@ %Now check all analyses called for a given solution %ANALYSESCHECKS {{{1 -[analyses,numanalyses]=AnalysisConfiguration(md.solution_type); +[analyses,numanalyses]=AnalysisConfiguration(md.private.solution); for i=1:numanalyses, checkforanalysis(md,analyses(i)); @@ -480,8 +480,8 @@ %EXTRUSION if (md.dim==2), - if md.solution_type==TransientSolutionEnum, + if md.private.solution==TransientSolutionEnum, return; else - message(['model not consistent: for a ' EnumToString(md.solution_type) ' computation, the model must be 3d, extrude it first!']) + message(['model not consistent: for a ' EnumToString(md.private.solution) ' computation, the model must be 3d, extrude it first!']) end end @@ -528,8 +528,8 @@ %EXTRUSION if (md.dim==2), - if md.solution_type==TransientSolutionEnum, + if md.private.solution==TransientSolutionEnum, return; else - message(['model not consistent: for a ' EnumToString(md.solution_type) ' computation, the model must be 3d, extrude it first!']) + message(['model not consistent: for a ' EnumToString(md.private.solution) ' computation, the model must be 3d, extrude it first!']) end end Index: /issm/trunk/src/m/model/loadresultsfromcluster.m =================================================================== --- /issm/trunk/src/m/model/loadresultsfromcluster.m (revision 9613) +++ /issm/trunk/src/m/model/loadresultsfromcluster.m (revision 9614) @@ -9,5 +9,5 @@ if nargin==2, - md.runtimename=runtimename; + md.private.runtimename=runtimename; end @@ -43,5 +43,5 @@ delete([md.name '.errlog']); delete([md.name '.outbin']); - delete([md.runtimename '.tar.gz']); + delete([md.private.runtimename '.tar.gz']); end Index: /issm/trunk/src/m/model/loadresultsfromdisk.m =================================================================== --- /issm/trunk/src/m/model/loadresultsfromdisk.m (revision 9613) +++ /issm/trunk/src/m/model/loadresultsfromdisk.m (revision 9614) @@ -23,11 +23,11 @@ %recover solution_type from results - md.solution_type=structure(1).SolutionType; + md.private.solution=structure(1).SolutionType; %post processes qmu results if necessary else - if isscalar(md.solution_type), - md.solution_type =EnumToString(md.solution_type); + if isscalar(md.private.solution), + md.private.solution=EnumToString(md.private.solution); end md=postqmu(md); Index: /issm/trunk/src/m/model/mesh/meshconvert.m =================================================================== --- /issm/trunk/src/m/model/mesh/meshconvert.m (revision 9613) +++ /issm/trunk/src/m/model/mesh/meshconvert.m (revision 9614) @@ -25,7 +25,7 @@ % plug results onto model -md.bamg=struct(); -md.bamg.mesh=bamgmesh(bamgmesh_out); -md.bamg.geometry=bamggeom(bamggeom_out); +md.private.bamg=struct(); +md.private.bamg.mesh=bamgmesh(bamgmesh_out); +md.private.bamg.geometry=bamggeom(bamggeom_out); md.x=bamgmesh_out.Vertices(:,1); md.y=bamgmesh_out.Vertices(:,2); Index: /issm/trunk/src/m/model/solve.m =================================================================== --- /issm/trunk/src/m/model/solve.m (revision 9613) +++ /issm/trunk/src/m/model/solve.m (revision 9614) @@ -32,5 +32,5 @@ %recover some fields -md.solution_type=options.solution_type; +md.private.solution=options.solution_type; %check model consistency @@ -51,7 +51,7 @@ %flaim analysis -if (md.solution_type == FlaimSolutionEnum) +if (md.private.solution == FlaimSolutionEnum) md=flaim(md,options); - md.solution_type=EnumToString(options.solution_type); + md.private.solution=EnumToString(options.solution_type); return; end @@ -71,5 +71,5 @@ %Launch correct solution sequence -md=issm(md,md.solution_type); +md=issm(md,md.private.solution); %post processes qmu results if necessary @@ -82,10 +82,4 @@ end -%Check result is consistent -%disp('checking result consistency'); -%if ~isresultconsistent(md,options.solution_type), -% disp('!! results not consistent correct the model !!') %it would be very cruel to put an error, it would kill the computed results (even if not consistent...) -%end - %convert analysis type to string finally -md.solution_type=EnumToString(options.solution_type); +md.private.solution=EnumToString(options.solution_type); Index: /issm/trunk/src/m/model/solveparallel.m =================================================================== --- /issm/trunk/src/m/model/solveparallel.m (revision 9613) +++ /issm/trunk/src/m/model/solveparallel.m (revision 9614) @@ -14,5 +14,5 @@ %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)),feature('GetPid')); + c=clock; md.private.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. Index: /issm/trunk/src/m/model/waitonlock.m =================================================================== --- /issm/trunk/src/m/model/waitonlock.m (revision 9613) +++ /issm/trunk/src/m/model/waitonlock.m (revision 9614) @@ -14,5 +14,5 @@ port=md.cluster.port; timelimit=md.waitonlock; -filename=[executionpath '/' md.runtimename '/' md.name '.lock']; +filename=[executionpath '/' md.private.runtimename '/' md.name '.lock']; %waitonlock will work if the lock is on the same machine only: