Index: /issm/trunk-jpl/test/NightlyRun/test101.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test101.m (revision 25004) +++ /issm/trunk-jpl/test/NightlyRun/test101.m (revision 25005) @@ -1,8 +1,8 @@ %Test Name: SquareShelfConstrainedStressSSA2d -md=triangle(model(),'../Exp/Square.exp',50000.); +md=triangle(model(),'../Exp/Square.exp',1000.); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=setflowequation(md,'SSA','all'); -md.cluster=generic('name',oshostname(),'np',2); +md.cluster=generic('name',oshostname(),'np',3); %output Index: /issm/trunk-jpl/test/NightlyRun/test218.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test218.m (revision 25004) +++ /issm/trunk-jpl/test/NightlyRun/test218.m (revision 25005) @@ -50,7 +50,6 @@ %partitioning -md.qmu.numberofpartitions=md.mesh.numberofvertices; -md=partitioner(md,'package','linear','npart',md.qmu.numberofpartitions); -md.qmu.vpartition=md.qmu.vpartition-1; +npart=md.mesh.numberofvertices; +partition=partitioner(md,'package','linear','npart',npart)-1; %Dakota options @@ -63,5 +62,5 @@ 'mean',ones(md.mesh.numberofvertices,1),... 'stddev',.05*ones(md.mesh.numberofvertices,1),... - 'partition',md.qmu.vpartition); + 'partition',partition); %responses Index: /issm/trunk-jpl/test/NightlyRun/test234.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test234.m (revision 25004) +++ /issm/trunk-jpl/test/NightlyRun/test234.m (revision 25005) @@ -22,13 +22,12 @@ %partitioning -md.qmu.numberofpartitions=20; -md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on'); -md.qmu.vpartition=md.qmu.vpartition-1; +npart=20; +partition=partitioner(md,'package','chaco','npart',npart,'weighting','on')-1; %variables md.qmu.variables.surface_mass_balance=normal_uncertain('descriptor','scaled_SmbMassBalance',... - 'mean',ones(md.qmu.numberofpartitions,1),... - 'stddev',.1*ones(md.qmu.numberofpartitions,1),... - 'partition',md.qmu.vpartition); + 'mean',ones(npart,1),... + 'stddev',.1*ones(npart,1),... + 'partition',partition); %responses Index: /issm/trunk-jpl/test/NightlyRun/test235.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test235.m (revision 25004) +++ /issm/trunk-jpl/test/NightlyRun/test235.m (revision 25005) @@ -22,13 +22,12 @@ %partitioning -md.qmu.numberofpartitions=20; -md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on'); -md.qmu.vpartition=md.qmu.vpartition-1; +npart=20; +partition=partitioner(md,'package','chaco','npart',npart,'weighting','on')-1; %variables md.qmu.variables.surface_mass_balance=normal_uncertain('descriptor','scaled_SmbMassBalance',... - 'mean',ones(md.qmu.numberofpartitions,1),... - 'stddev',100*ones(md.qmu.numberofpartitions,1),... - 'partition',md.qmu.vpartition); + 'mean',ones(npart,1),... + 'stddev',100*ones(npart,1),... + 'partition',partition); %responses Index: /issm/trunk-jpl/test/NightlyRun/test244.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test244.m (revision 25004) +++ /issm/trunk-jpl/test/NightlyRun/test244.m (revision 25005) @@ -46,7 +46,5 @@ %partitioning -md.qmu.numberofpartitions=md.mesh.numberofelements; -md=partitioner(md,'package','linear','type','element'); -md.qmu.epartition=md.qmu.epartition-1; +partition=partitioner(md,'package','linear','type','element','npart',md.mesh.numberofelements)-1; %variables @@ -54,5 +52,5 @@ 'mean',1*ones(md.mesh.numberofelements,1),... 'stddev',.5*ones(md.mesh.numberofelements,1),... - 'partition',md.qmu.epartition); + 'partition',partition); Tmin=273; @@ -60,5 +58,5 @@ mint_on_partition=telms; for pa=1:length(mint_on_partition) - vi=find(md.qmu.epartition+1 == pa); + vi=find(partition+1 == pa); mint=telms(vi).*1.05; pos=find(mint < Tmin); @@ -70,5 +68,5 @@ 'lower',.95*ones(md.mesh.numberofelements,1),... 'upper',max(min(max(1.05,mint_on_partition),0.9999),0.0001),... - 'partition',md.qmu.epartition); + 'partition',partition); %responses Index: /issm/trunk-jpl/test/NightlyRun/test250.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test250.m (revision 25004) +++ /issm/trunk-jpl/test/NightlyRun/test250.m (revision 25005) @@ -22,13 +22,11 @@ %partitioning -md.qmu.numberofpartitions=md.mesh.numberofvertices; -md=partitioner(md,'package','linear'); -md.qmu.vpartition=md.qmu.vpartition-1; +md=partitioner(md,'package','linear','npart',md.mesh.numberofvertices)-1; %variables md.qmu.variables.surface_mass_balance=normal_uncertain('descriptor','scaled_SmbMassBalance',... - 'mean',ones(md.qmu.numberofpartitions,1),... - 'stddev',.1*ones(md.qmu.numberofpartitions,1),... - 'partition',md.qmu.vpartition); + 'mean',ones(md.mesh.numberofvertices,1),... + 'stddev',.1*ones(md.mesh.numberofvertices,1),... + 'partition',partition); %responses Index: /issm/trunk-jpl/test/NightlyRun/test251.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test251.m (revision 25004) +++ /issm/trunk-jpl/test/NightlyRun/test251.m (revision 25005) @@ -22,7 +22,5 @@ %partitioning -md.qmu.numberofpartitions=md.mesh.numberofvertices; -md=partitioner(md,'package','linear'); -md.qmu.vpartition=md.qmu.vpartition-1; +partition=partitioner(md,'package','linear','npart',md.mesh.numberofvertices)-1; %variables @@ -30,5 +28,5 @@ 'mean',ones(md.mesh.numberofvertices,1),... 'stddev',100*ones(md.mesh.numberofvertices,1),... - 'partition',md.qmu.vpartition); + 'partition',partition); %responses Index: /issm/trunk-jpl/test/NightlyRun/test412.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test412.m (revision 25004) +++ /issm/trunk-jpl/test/NightlyRun/test412.m (revision 25005) @@ -7,7 +7,5 @@ %partitioning -md.qmu.numberofpartitions=md.mesh.numberofvertices; -md=partitioner(md,'package','linear','npart',md.qmu.numberofpartitions); -md.qmu.vpartition=md.qmu.vpartition-1; +partition=partitioner(md,'package','linear','npart',md.mesh.numberofvertices)-1; md.qmu.isdakota=1; @@ -22,5 +20,5 @@ 'mean',ones(md.mesh.numberofvertices,1),... 'stddev',.01*ones(md.mesh.numberofvertices,1),... - 'partition',md.qmu.vpartition); + 'partition',partition); %responses Index: /issm/trunk-jpl/test/NightlyRun/test413.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test413.m (revision 25004) +++ /issm/trunk-jpl/test/NightlyRun/test413.m (revision 25005) @@ -12,14 +12,13 @@ %partitioning -md.qmu.numberofpartitions=20; -md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on'); -md.qmu.vpartition=md.qmu.vpartition-1; +npart=20; +partition=partitioner(md,'package','chaco','npart',npart,'weighting','on')-1; %variables md.qmu.variables.rho_ice=normal_uncertain('descriptor','MaterialsRhoIce','mean',md.materials.rho_ice,'stddev',.01); md.qmu.variables.drag_coefficient=normal_uncertain('descriptor','scaled_FrictionCoefficient',... - 'mean',ones(md.qmu.numberofpartitions,1),... - 'stddev',.01*ones(md.qmu.numberofpartitions,1),... - 'partition',md.qmu.vpartition); + 'mean',ones(npart,1),... + 'stddev',.01*ones(npart,1),... + 'partition',partition); %responses Index: /issm/trunk-jpl/test/NightlyRun/test414.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test414.m (revision 25004) +++ /issm/trunk-jpl/test/NightlyRun/test414.m (revision 25005) @@ -20,13 +20,12 @@ %partitioning -md.qmu.numberofpartitions=20; -md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on'); -md.qmu.vpartition=md.qmu.vpartition-1; +npart=20; +partition=partitioner(md,'package','chaco','npart',npart,'weighting','on')-1; %variables md.qmu.variables.drag_coefficient=normal_uncertain('descriptor','scaled_FrictionCoefficient',... - 'mean',ones(md.qmu.numberofpartitions,1),... - 'stddev',.01*ones(md.qmu.numberofpartitions,1),... - 'partition',md.qmu.vpartition); + 'mean',ones(npart,1),... + 'stddev',.01*ones(npart,1),... + 'partition',partition); %responses Index: /issm/trunk-jpl/test/NightlyRun/test417.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test417.m (revision 25004) +++ /issm/trunk-jpl/test/NightlyRun/test417.m (revision 25005) @@ -20,13 +20,12 @@ %partitioning -md.qmu.numberofpartitions=20; -md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on'); -md.qmu.vpartition=md.qmu.vpartition-1; +npart=20; +partition=partitioner(md,'package','chaco','npart',npart,'weighting','on')-1; md.qmu.isdakota=1; md.qmu.variables.drag_coefficient=normal_uncertain('descriptor','scaled_FrictionCoefficient',... - 'mean',ones(md.qmu.numberofpartitions,1),... - 'stddev',.01*ones(md.qmu.numberofpartitions,1),... - 'partition',md.qmu.vpartition); + 'mean',ones(npart,1),... + 'stddev',.01*ones(npart,1),... + 'partition',partition); md.qmu.responses.MaxVel=response_function('descriptor','MaxVel'); Index: /issm/trunk-jpl/test/NightlyRun/test418.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test418.m (revision 25004) +++ /issm/trunk-jpl/test/NightlyRun/test418.m (revision 25005) @@ -8,11 +8,10 @@ %partitioning -md.qmu.numberofpartitions=100; -md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions); -md.qmu.vpartition=md.qmu.vpartition-1; +npart=100; +partition=partitioner(md,'package','chaco','npart',npart)-1; vector=(1:1:md.mesh.numberofvertices)'; -vector_on_partition=AreaAverageOntoPartition(md,vector); -vector_on_nodes=vector_on_partition(md.qmu.vpartition+1); +vector_on_partition=AreaAverageOntoPartition(md,vector,partition); +vector_on_nodes=vector_on_partition(partition+1); field_names ={'vector_on_nodes'}; Index: /issm/trunk-jpl/test/NightlyRun/test420.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test420.m (revision 25004) +++ /issm/trunk-jpl/test/NightlyRun/test420.m (revision 25005) @@ -7,7 +7,6 @@ %partitioning -md.qmu.numberofpartitions=10; -md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions); -md.qmu.vpartition=md.qmu.vpartition-1; +npart=10; +partition=partitioner(md,'package','chaco','npart',npart)-1; md.qmu.isdakota=1; @@ -21,5 +20,5 @@ %responses -md.qmu.responses.MaxVel=response_function('descriptor','scaled_Thickness','partition',md.qmu.vpartition); +md.qmu.responses.MaxVel=response_function('descriptor','scaled_Thickness','partition',partition); %method @@ -49,11 +48,11 @@ %test on thickness -h=zeros(md.qmu.numberofpartitions,1); -for i=1:md.qmu.numberofpartitions, +h=zeros(part,1); +for i=1:npart, h(i)=md.qmu.results.dresp_out(i).mean; end %project onto grid -thickness=h(md.qmu.vpartition+1); +thickness=h(partition+1); %Fields and tolerances to track changes Index: /issm/trunk-jpl/test/NightlyRun/test440.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test440.m (revision 25004) +++ /issm/trunk-jpl/test/NightlyRun/test440.m (revision 25005) @@ -7,7 +7,5 @@ %partitioning -md.qmu.numberofpartitions=md.mesh.numberofvertices; -md=partitioner(md,'package','linear'); -md.qmu.vpartition=md.qmu.vpartition-1; +partition=partitioner(md,'package','linear','npart',md.mesh.numberofvertices)-1; md.qmu.isdakota=1; @@ -21,5 +19,5 @@ %responses -md.qmu.responses.MaxVel=response_function('descriptor','scaled_Thickness','partition',md.qmu.vpartition); +md.qmu.responses.MaxVel=response_function('descriptor','scaled_Thickness','partition',partition); %method @@ -49,11 +47,11 @@ %test on thickness -h=zeros(md.qmu.numberofpartitions,1); -for i=1:md.qmu.numberofpartitions, +h=zeros(npart,1); +for i=1:npart, h(i)=md.qmu.results.dresp_out(i).mean; end %project onto grid -thickness=h(md.qmu.vpartition+1); +thickness=h(partition+1); %Fields and tolerances to track changes Index: /issm/trunk-jpl/test/NightlyRun/test444.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test444.m (revision 25004) +++ /issm/trunk-jpl/test/NightlyRun/test444.m (revision 25005) @@ -50,13 +50,12 @@ %partitioning -md.qmu.numberofpartitions=10; -md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on'); -md.qmu.vpartition=md.qmu.vpartition-1; +npart=10; +partition=partitioner(md,'package','chaco','npart',npart,'weighting','on')-1; md.qmu.isdakota=1; md.qmu.variables.drag_coefficient=normal_uncertain('descriptor','scaled_BasalforcingsFloatingiceMeltingRate',... - 'mean',ones(md.qmu.numberofpartitions,1),... - 'stddev',.1*ones(md.qmu.numberofpartitions,1),... - 'partition',md.qmu.vpartition); + 'mean',ones(npart,1),... + 'stddev',.1*ones(npart,1),... + 'partition',partition); md.qmu.responses.IceMass1=response_function('descriptor','Outputdefinition5'); Index: /issm/trunk-jpl/test/NightlyRun/test445.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test445.m (revision 25004) +++ /issm/trunk-jpl/test/NightlyRun/test445.m (revision 25005) @@ -19,18 +19,17 @@ %partitioning -md.qmu.numberofpartitions=10; -md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on'); -md.qmu.vpartition=md.qmu.vpartition-1; +npart=10; +partition=partitioner(md,'package','chaco','npart',npart,'weighting','on')-1; md.qmu.isdakota=1; %variables md.qmu.variables.neff=normal_uncertain('descriptor','scaled_FrictionEffectivePressure',... - 'mean',ones(md.qmu.numberofpartitions,1),... - 'stddev',.05*ones(md.qmu.numberofpartitions,1),... - 'partition',md.qmu.vpartition); + 'mean',ones(npart,1),... + 'stddev',.05*ones(npart,1),... + 'partition',partition); md.qmu.variables.geoflux=normal_uncertain('descriptor','scaled_BasalforcingsGeothermalflux',... - 'mean',ones(md.qmu.numberofpartitions,1),... - 'stddev',.05*ones(md.qmu.numberofpartitions,1),... - 'partition',md.qmu.vpartition); + 'mean',ones(npart,1),... + 'stddev',.05*ones(npart,1),... + 'partition',partition); %responses