Index: /issm/trunk-jpl/examples/UncertaintyQuantification/runme.m =================================================================== --- /issm/trunk-jpl/examples/UncertaintyQuantification/runme.m (revision 25922) +++ /issm/trunk-jpl/examples/UncertaintyQuantification/runme.m (revision 25923) @@ -69,5 +69,6 @@ %partition the mesh npart=50; - partition=partitioner(md,'package','chaco','npart',npart,'weighting','on')-1; + [partition,md]=partitioner(md,'package','chaco','npart',npart,'weighting','on'); + partition=partition-1; %make DeltaHH into our 3 sigma deviation @@ -82,30 +83,17 @@ %responses - md.qmu.responses.MassFlux1=response_function('indexed_MassFlux_1',[],... - [0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - md.qmu.responses.MassFlux2=response_function('indexed_MassFlux_2',[],... - [0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); %grounding line - md.qmu.responses.MassFlux3=response_function('indexed_MassFlux_3',[],... - [0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - md.qmu.responses.MassFlux4=response_function('indexed_MassFlux_4',[],... - [0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - md.qmu.responses.MassFlux5=response_function('indexed_MassFlux_5',[],... - [0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - md.qmu.responses.MassFlux6=response_function('indexed_MassFlux_6',[],... - [0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - md.qmu.responses.MassFlux7=response_function('indexed_MassFlux_7',[],... - [0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - md.qmu.responses.MassFlux8=response_function('indexed_MassFlux_8',[],... - [0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - md.qmu.responses.MassFlux9=response_function('indexed_MassFlux_9',[],... - [0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - md.qmu.responses.MassFlux10=response_function('indexed_MassFlux_10',[],... - [0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - md.qmu.responses.MassFlux11=response_function('indexed_MassFlux_11',[],... - [0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - md.qmu.responses.MassFlux12=response_function('indexed_MassFlux_12',[],... - [0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - md.qmu.responses.MassFlux13=response_function('indexed_MassFlux_13',[],... - [0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); + md.qmu.responses.MassFlux1=response_function('descriptor','indexed_MassFlux_1'); + md.qmu.responses.MassFlux2=response_function('descriptor','indexed_MassFlux_2'); %grounding line + md.qmu.responses.MassFlux3=response_function('descriptor','indexed_MassFlux_3'); + md.qmu.responses.MassFlux4=response_function('descriptor','indexed_MassFlux_4'); + md.qmu.responses.MassFlux5=response_function('descriptor','indexed_MassFlux_5'); + md.qmu.responses.MassFlux6=response_function('descriptor','indexed_MassFlux_6'); + md.qmu.responses.MassFlux7=response_function('descriptor','indexed_MassFlux_7'); + md.qmu.responses.MassFlux8=response_function('descriptor','indexed_MassFlux_8'); + md.qmu.responses.MassFlux9=response_function('descriptor','indexed_MassFlux_9'); + md.qmu.responses.MassFlux10=response_function('descriptor','indexed_MassFlux_10'); + md.qmu.responses.MassFlux11=response_function('descriptor','indexed_MassFlux_11'); + md.qmu.responses.MassFlux12=response_function('descriptor','indexed_MassFlux_12'); + md.qmu.responses.MassFlux13=response_function('descriptor','indexed_MassFlux_13'); %mass flux profiles @@ -125,5 +113,5 @@ 'MassFlux13.exp'... }; - md.qmu.mass_flux_profile_directory='../MassFluxes/'; + md.qmu.mass_flux_profile_directory='./MassFluxes/'; %% sampling analysis @@ -171,31 +159,38 @@ %partition the mesh - md.qmu.numberofpartitions=10; - md=partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on'); - md.qmu.partition=md.qmu.partition-1; %switch partition to c-indexing + npart=10; + [partition,md]=partitioner(md,'package','chaco','weighting','on'); + partition=partition-1; %switch partition to c-indexing %all types of variables and responses: scaled_Thickness, indexed_MassFlux_i,MaxVel,nodal_DragCoefficient_i. scaled variables are expanded. %variables - md.qmu.variables.DragCoefficient=normal_uncertain(... - 'scaled_FrictionCoefficient',1,0.05); - md.qmu.variables.rheology_B=normal_uncertain(... - 'scaled_MaterialsRheologyB',1,0.05); - md.qmu.variables.Thickness=normal_uncertain('scaled_Thickness',1,0.05); + md.qmu.variables.drag_coefficient=normal_uncertain('descriptor','scaled_FrictionCoefficient',... + 'mean',ones(npart,1),... + 'stddev',0.05*ones(npart,1),... + 'partition',partition); + md.qmu.variables.rheology_B=normal_uncertain('descriptor','scaled_MaterialsRheologyB',... + 'mean',ones(npart,1),... + 'stddev',0.05*ones(npart,1),... + 'partition',partition); + md.qmu.variables.thickness=normal_uncertain('descriptor','scaled_Thickness',... + 'mean',ones(npart,1),... + 'stddev',0.05*ones(npart,1),... + 'partition',partition); %responses - md.qmu.responses.MassFlux1=response_function('indexed_MassFlux_1',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - md.qmu.responses.MassFlux2=response_function('indexed_MassFlux_2',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - md.qmu.responses.MassFlux3=response_function('indexed_MassFlux_3',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - md.qmu.responses.MassFlux4=response_function('indexed_MassFlux_4',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - md.qmu.responses.MassFlux5=response_function('indexed_MassFlux_5',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - md.qmu.responses.MassFlux6=response_function('indexed_MassFlux_6',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - md.qmu.responses.MassFlux7=response_function('indexed_MassFlux_7',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - md.qmu.responses.MassFlux8=response_function('indexed_MassFlux_8',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - md.qmu.responses.MassFlux9=response_function('indexed_MassFlux_9',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - md.qmu.responses.MassFlux10=response_function('indexed_MassFlux_10',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - md.qmu.responses.MassFlux11=response_function('indexed_MassFlux_11',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - md.qmu.responses.MassFlux12=response_function('indexed_MassFlux_12',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); - md.qmu.responses.MassFlux13=response_function('indexed_MassFlux_13',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]); + md.qmu.responses.MassFlux1=response_function('descriptor','indexed_MassFlux_1'); + md.qmu.responses.MassFlux2=response_function('descriptor','indexed_MassFlux_2'); + md.qmu.responses.MassFlux3=response_function('descriptor','indexed_MassFlux_3'); + md.qmu.responses.MassFlux4=response_function('descriptor','indexed_MassFlux_4'); + md.qmu.responses.MassFlux5=response_function('descriptor','indexed_MassFlux_5'); + md.qmu.responses.MassFlux6=response_function('descriptor','indexed_MassFlux_6'); + md.qmu.responses.MassFlux7=response_function('descriptor','indexed_MassFlux_7'); + md.qmu.responses.MassFlux8=response_function('descriptor','indexed_MassFlux_8'); + md.qmu.responses.MassFlux9=response_function('descriptor','indexed_MassFlux_9'); + md.qmu.responses.MassFlux10=response_function('descriptor','indexed_MassFlux_10'); + md.qmu.responses.MassFlux11=response_function('descriptor','indexed_MassFlux_11'); + md.qmu.responses.MassFlux12=response_function('descriptor','indexed_MassFlux_12'); + md.qmu.responses.MassFlux13=response_function('descriptor','indexed_MassFlux_13'); %mass flux profiles @@ -215,5 +210,5 @@ 'MassFlux13.exp'... }; - md.qmu.mass_flux_profile_directory='../MassFluxes/'; + md.qmu.mass_flux_profile_directory='./MassFluxes/'; %method: local reliability @@ -267,10 +262,10 @@ %which profile are we looking at? - index=1; + index=1; %retrieve results for the specific profile, mass flux in m^3 water equiv/s - result=md.results.dakota.dresp_dat(md.qmu.numberofpartitions+index); + result=md.results.dakota.dresp_dat(npart+index); result.sample=result.sample/1e12*60*60*24*365; - + %plot histogram plot_hist_norm(result,'cdfleg','off','cdfplt','off','nrmplt','off',... @@ -292,7 +287,7 @@ %To plot sensitivities - sa=md.results.dakota.dresp_out(index).sens(1:10); sa=sa(md.qmu.partition+1)/1e12*60*60*24*365; - sb=md.results.dakota.dresp_out(index).sens(11:20); sb=sb(md.qmu.partition+1)/1e12*60*60*24*365; - sh=md.results.dakota.dresp_out(index).sens(21:30); sh=sh(md.qmu.partition+1)/1e12*60*60*24*365; + sa=md.results.dakota.dresp_out(index).sens(1:10); sa=sa(partition+1)/1e12*60*60*24*365; + sb=md.results.dakota.dresp_out(index).sens(11:20); sb=sb(partition+1)/1e12*60*60*24*365; + sh=md.results.dakota.dresp_out(index).sens(21:30); sh=sh(partition+1)/1e12*60*60*24*365; plotmodel(md,'data',sh,'data',sa,'data',sb,'expdisp#all',... Index: /issm/trunk-jpl/test/NightlyRun/test417.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test417.m (revision 25922) +++ /issm/trunk-jpl/test/NightlyRun/test417.m (revision 25923) @@ -21,5 +21,6 @@ %partitioning npart=20; -partition=partitioner(md,'package','chaco','npart',npart,'weighting','on')-1; +[partition,md]=partitioner(md,'package','chaco','npart',npart,'weighting','on'); +partition=partition-1; md.qmu.isdakota=1;