Index: /issm/trunk-jpl/examples/ISMIP/CheatyIsmipA.par =================================================================== --- /issm/trunk-jpl/examples/ISMIP/CheatyIsmipA.par (revision 18202) +++ /issm/trunk-jpl/examples/ISMIP/CheatyIsmipA.par (revision 18203) Index: /issm/trunk-jpl/examples/ISMIP/CheatyIsmipF.par =================================================================== --- /issm/trunk-jpl/examples/ISMIP/CheatyIsmipF.par (revision 18202) +++ /issm/trunk-jpl/examples/ISMIP/CheatyIsmipF.par (revision 18203) Index: /issm/trunk-jpl/examples/ISMIP/CheatyRunme.m =================================================================== --- /issm/trunk-jpl/examples/ISMIP/CheatyRunme.m (revision 18202) +++ /issm/trunk-jpl/examples/ISMIP/CheatyRunme.m (revision 18203) @@ -3,15 +3,13 @@ %step 8 is specific to ISMIPF -steps=[1 2 3 4 5 6 8]; +steps=[1:7]; % parameter file to be used, choose between CheatyIsmipA.par or CheatyIsmipF.par ParamFile='CheatyIsmipF.par' -name_prefix='ISMIP'; %Run Steps -org=organizer('repository','./Models','prefix',name_prefix,'steps',steps); % {{{ Mesh Generation #1 -if perform(org,'Mesh_Generation') +if any(steps==1) %initialize md as a new model #help model @@ -31,15 +29,15 @@ % save the given model %-> - savemodel(org,md); + save ./Models/ISMIP.Mesh_generation md; end % }}} % {{{ Masks #2 -if perform(org,'SetMask'), - - % load the preceding step #help loadmodel - % path is given by the organizer with the name of the given step - %-> - md=loadmodel(org,'Mesh_Generation'); +if any(steps==2) + + % load the preceding step #help loadmodel + % path is given by the organizer with the name of the given step + %-> + md = loadmodel('./Models/ISMIP.Mesh_generation'); % set the mask #help setmask % all MISMIP nodes are grounded @@ -51,33 +49,33 @@ % save the given model %-> - savemodel(org,md); + save ./Models/ISMIP.SetMask md; end % }}} % {{{ Parameterization #3 -if perform(org,'Parameterization') - - % load the preceding step #help loadmodel - % path is given by the organizer with the name of the given step - %-> - md=loadmodel(org,'SetMask'); +if any(steps==3) + + % load the preceding step #help loadmodel + % path is given by the organizer with the name of the given step + %-> + md = loadmodel('./Models/ISMIP.SetMask'); % parametrize the model # help parameterize % you will need to fil-up the parameter file defined by the - % ParamFile variable + % ParamFile variable %-> md=parameterize(md,ParamFile); % save the given model %-> - savemodel(org,md); + save ./Models/ISMIP.Parameterization md; end % }}} % {{{ Extrusion #4 -if perform(org,'Extrusion') +if any(steps==4) % load the preceding step #help loadmodel % path is given by the organizer with the name of the given step %-> - md=loadmodel(org,'Parameterization'); + md = loadmodel('./Models/ISMIP.Parameterization'); % vertically extrude the preceding mesh #help extrude % only 5 layers exponent 1 @@ -89,16 +87,15 @@ % save the given model %-> - savemodel(org,md); + save ./Models/ISMIP.Extrusion md; end % }}} % {{{ Set the flow computing method #5 - -if perform(org,'SetFlow') - - % load the preceding step #help loadmodel - % path is given by the organizer with the name of the given step - %-> - md=loadmodel(org,'Extrusion'); +if any(steps==5) + + % load the preceding step #help loadmodel + % path is given by the organizer with the name of the given step + %-> + md = loadmodel('./Models/ISMIP.Extrusion'); % set the approximation for the flow computation #help setflowequation % We will be using the Higher Order Model (HO) @@ -107,15 +104,15 @@ % save the given model %-> - savemodel(org,md); + save ./Models/ISMIP.SetFlow md; end % }}} % {{{ Set Boundary Conditions #6 -if perform(org,'BoundaryCondition') - - % load the preceding step #help loadmodel - % path is given by the organizer with the name of the given step - %-> - md=loadmodel(org,'SetFlow'); +if any(steps==6) + + % load the preceding step #help loadmodel + % path is given by the organizer with the name of the given step + %-> + md = loadmodel('./Models/ISMIP.SetFlow'); % dirichlet boundary condition are known as SPCs % ice frozen to the base, no velocity #md.stressbalance @@ -130,5 +127,5 @@ %-> basalnodes=find(md.mesh.vertexonbase); - % set the sliding to zero on the bed + % set the sliding to zero on the bed %-> md.stressbalance.spcvx(basalnodes)=0.0; @@ -162,14 +159,14 @@ % save the given model %-> - savemodel(org,md); + save ./Models/ISMIP.BoundaryCondition md; end % }}} % {{{ Solving #7 -if perform(org,'SolvingISMIPA') - % load the preceding step #help loadmodel - % path is given by the organizer with the name of the given step - %-> - md=loadmodel(org,'BoundaryCondition'); +if any(steps==7) + % load the preceding step #help loadmodel + % path is given by the organizer with the name of the given step + %-> + md = loadmodel('./Models/ISMIP.BoundaryCondition'); % Set cluster #md.cluster % generic parameters #help generic @@ -186,5 +183,5 @@ % save the given model %-> - savemodel(org,md); + save ./Models/ISMIP.StressBalance md; % plot the surface velocities #plotdoc %-> @@ -194,9 +191,9 @@ % {{{ Solving #8 -if perform(org,'SolvingISMIPF') - % load the preceding step #help loadmodel - % path is given by the organizer with the name of the given step - %-> - md=loadmodel(org,'BoundaryCondition'); +if any(steps==8) + % load the preceding step #help loadmodel + % path is given by the organizer with the name of the given step + %-> + md = loadmodel('./Models/ISMIP.BoundaryCondition'); % Set cluster #md.cluster % generic parameters #help generic @@ -225,5 +222,5 @@ % save the given model %-> - savemodel(org,md); + save ./Models/ISMIP.Transient md; % plot the surface velocities #plotdoc %-> Index: /issm/trunk-jpl/examples/ISMIP/runme.m =================================================================== --- /issm/trunk-jpl/examples/ISMIP/runme.m (revision 18202) +++ /issm/trunk-jpl/examples/ISMIP/runme.m (revision 18203) @@ -8,10 +8,8 @@ ParamFile='IsmipA.par' -name_prefix='ISMIP'; %Run Steps -org=organizer('repository','./Models','prefix',name_prefix,'steps',steps); % {{{ Mesh Generation #1 -if perform(org,'Mesh_Generation') +if any(steps==1) %initialize md as a new model #help model @@ -32,5 +30,5 @@ % {{{ Masks #2 -if perform(org,'SetMask'), +if any(steps==2) % load the preceding step #help loadmodel @@ -52,5 +50,5 @@ % {{{ Parameterization #3 -if perform(org,'Parameterization') +if any(steps==3) % load the preceding step #help loadmodel @@ -70,5 +68,5 @@ % {{{ Extrusion #4 -if perform(org,'Extrusion') +if any(steps==4) % load the preceding step #help loadmodel @@ -91,5 +89,5 @@ % {{{ Set the flow computing method #5 -if perform(org,'SetFlow') +if any(steps==5) % load the preceding step #help loadmodel @@ -108,5 +106,5 @@ % {{{ Set Boundary Conditions #6 -if perform(org,'BoundaryCondition') +if any(steps==6) % load the preceding step #help loadmodel @@ -162,5 +160,5 @@ % {{{ Solving #7 -if perform(org,'SolvingISMIPA') +if any(steps==7) % load the preceding step #help loadmodel % path is given by the organizer with the name of the given step @@ -188,5 +186,5 @@ % {{{ Solving #8 -if perform(org,'SolvingISMIPF') +if any(steps==8) % load the preceding step #help loadmodel % path is given by the organizer with the name of the given step Index: /issm/trunk-jpl/examples/Inversion/runme.m =================================================================== --- /issm/trunk-jpl/examples/Inversion/runme.m (revision 18202) +++ /issm/trunk-jpl/examples/Inversion/runme.m (revision 18203) @@ -1,3 +1,3 @@ -step=1; +step=3; if step==1 %Generate observation @@ -47,8 +47,8 @@ md.inversion.control_parameters = {'FrictionCoefficient'}; md.inversion.maxsteps = maxsteps; - md.inversion.dxmin=10^-6; + md.inversion.dxmin=10^-6; md.inversion.cost_functions = [103 501]; md.inversion.cost_functions_coefficients = ones(md.mesh.numberofvertices,2); - md.inversion.cost_functions_coefficients(:,2)=0; + md.inversion.cost_functions_coefficients(:,2)=0; md.inversion.min_parameters = 10^-5*ones(md.mesh.numberofvertices,1); md.inversion.max_parameters = 100*ones(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/examples/UncertaintyQuantification/runme.m =================================================================== --- /issm/trunk-jpl/examples/UncertaintyQuantification/runme.m (revision 18202) +++ /issm/trunk-jpl/examples/UncertaintyQuantification/runme.m (revision 18203) @@ -1,9 +1,9 @@ %PIG Uncertainty Quantification Application -steps=[3]; eval(['addpath ' pwd]); +steps=[3]; if any(steps==1) disp(' Step 1: plot flux gates'); - md = loadmodel('../Data/PIG.Control_drag_default'); + md = loadmodel('../Pig/Models/PIG.Control_drag'); texts=cell(1,13); @@ -11,16 +11,16 @@ for i=1:13, - contour=expread(['./Exp_Par/MassFluxes/MassFlux' num2str(i) '.exp']); + contour=expread(['./MassFluxes/MassFlux' num2str(i) '.exp']); textpositions{i}=[contour.x(end) contour.y(end)]; end plotmodel(md,'data',md.results.StressbalanceSolution.Vel,'log',10,'expdisp',... - {'Exp_Par/MassFluxes/MassFlux1.exp','Exp_Par/MassFluxes/MassFlux2.exp',... - 'Exp_Par/MassFluxes/MassFlux3.exp','Exp_Par/MassFluxes/MassFlux4.exp',... - 'Exp_Par/MassFluxes/MassFlux5.exp','Exp_Par/MassFluxes/MassFlux6.exp',... - 'Exp_Par/MassFluxes/MassFlux7.exp','Exp_Par/MassFluxes/MassFlux8.exp',... - 'Exp_Par/MassFluxes/MassFlux9.exp','Exp_Par/MassFluxes/MassFlux10.exp',... - 'Exp_Par/MassFluxes/MassFlux11.exp','Exp_Par/MassFluxes/MassFlux12.exp',... - 'Exp_Par/MassFluxes/MassFlux13.exp'},... + {'MassFluxes/MassFlux1.exp','MassFluxes/MassFlux2.exp',... + 'MassFluxes/MassFlux3.exp','MassFluxes/MassFlux4.exp',... + 'MassFluxes/MassFlux5.exp','MassFluxes/MassFlux6.exp',... + 'MassFluxes/MassFlux7.exp','MassFluxes/MassFlux8.exp',... + 'MassFluxes/MassFlux9.exp','MassFluxes/MassFlux10.exp',... + 'MassFluxes/MassFlux11.exp','MassFluxes/MassFlux12.exp',... + 'MassFluxes/MassFlux13.exp'},... 'expstyle',{'k-','k-','k-','k-','k-','k-','k-',... 'k-','k-','k-','k-','k-','k-'},'linewidth',2,... @@ -33,5 +33,5 @@ disp(' Step 2: compute cross overs from CRESIS'); - md = loadmodel('../Data/PIG.Control_drag_default'); + md = loadmodel('../Pig/Models/PIG.Control_drag'); %load cross overs: CRESIS McCord Antarctica, 2009 (courtesy of John Paden) @@ -45,5 +45,5 @@ %filter out unrealistic error ranges - flags=ContourToNodes(md.mesh.x,md.mesh.y,'Exp_Par/ErrorContour.exp',1); + flags=ContourToNodes(md.mesh.x,md.mesh.y,'ErrorContour.exp',1); pos=find(~flags); DeltaHH(pos)=0; @@ -64,5 +64,5 @@ %load model and cross over errors - md = loadmodel('../Data/PIG.Control_drag_default'); + md = loadmodel('../Pig/Models/PIG.Control_drag'); load -mat Models/PIG.CrossOvers @@ -123,5 +123,5 @@ 'MassFlux12.exp',... 'MassFlux13.exp'}; - md.qmu.mass_flux_profile_directory='../Exp_Par/MassFluxes/'; + md.qmu.mass_flux_profile_directory='../MassFluxes/'; %% sampling analysis @@ -152,5 +152,5 @@ %load model - md = loadmodel('../Data/PIG.Control_drag_default'); + md = loadmodel('../Pig/Models/PIG.Control_drag'); %partition the mesh @@ -197,5 +197,5 @@ 'MassFlux12.exp',... 'MassFlux13.exp'}; - md.qmu.mass_flux_profile_directory='../Exp_Par/MassFluxes/'; + md.qmu.mass_flux_profile_directory='../MassFluxes/'; %method: local reliability @@ -268,5 +268,5 @@ plotmodel(md,'data',sh,'data',sa,'data',sb,'expdisp#all',... - ['Exp_Par/MassFluxes/MassFlux' num2str(index) '.exp'],... + ['MassFluxes/MassFlux' num2str(index) '.exp'],... 'expstyle#all','b-','linewidth#all',2,... 'nlines',3,'ncols',1, 'axis#all','image',... @@ -281,5 +281,5 @@ plotmodel(md,'data',ifh,'data',ifa,'data',ifb,'expdisp#all',... - ['Exp_Par/MassFluxes/MassFlux' num2str(index) '.exp'],... + ['MassFluxes/MassFlux' num2str(index) '.exp'],... 'expstyle#all','b-','linewidth#all',2,'log#all',10,... 'nlines',3,'ncols',1, 'axis#all','image','caxis#all',[1e-10 1],...