Index: /issm/branches/trunk-larour-SLPS2020/test/NightlyRun/test2006.m
===================================================================
--- /issm/branches/trunk-larour-SLPS2020/test/NightlyRun/test2006.m	(revision 25603)
+++ /issm/branches/trunk-larour-SLPS2020/test/NightlyRun/test2006.m	(revision 25604)
@@ -3,5 +3,5 @@
 %mesh earth:
 md=model;
-md.cluster=generic('name',oshostname(),'np',5);
+md.cluster=generic('name',oshostname(),'np',10);
 md.mesh=gmshplanet('radius',6.371012*10^3,'resolution',700.); %700 km resolution mesh
 
@@ -55,5 +55,5 @@
 
 %Miscellaneous
-md.miscellaneous.name='test2005';
+md.miscellaneous.name='test2006';
 
 %Solution parameters
@@ -118,9 +118,23 @@
 md.qmu.variables.surfaceload=qmuvar.surfaceload;
 
+locations=[1 5 10 15 20];
 %responses  % {{{
 md.qmu.responses.sealevel1=response_function('descriptor','Outputdefinition1');
+md.qmu.responses.sealevel2=response_function('descriptor','Outputdefinition2');
+md.qmu.responses.sealevel3=response_function('descriptor','Outputdefinition3');
+md.qmu.responses.sealevel4=response_function('descriptor','Outputdefinition4');
+md.qmu.responses.sealevel5=response_function('descriptor','Outputdefinition5');
+
 %output definitions: 
-md.outputdefinition.definitions={nodalvalue('name','SNode','definitionstring','Outputdefinition1', ...
-	'model_string','Sealevel','node',1)};  %Pick vertex index at 1.
+for i=1:length(locations),
+	ind=locations(i);
+	if i==1,
+		md.outputdefinition.definitions={nodalvalue('name','SNode','definitionstring','Outputdefinition1', ...
+			'model_string','Sealevel','node',ind)}; 
+	else
+		md.outputdefinition.definitions{end+1}=nodalvalue('name','SNode','definitionstring',['Outputdefinition' num2str(i)], ...
+			'model_string','Sealevel','node',ind); 
+	end
+end 
 % }}}
 	%algorithm:  % {{{
@@ -142,15 +156,42 @@
 	md.verbose=verbose(0); md.verbose.qmu=1;
 	% }}}
+	%qmu statistics %{{{
+	md.qmu.statistics.nfiles_per_directory=2;
+	md.qmu.statistics.ndirectories=5;
+	
+	md.qmu.statistics.method(1).name='Histogram';
+	md.qmu.statistics.method(1).fields={'Sealevel','BslrIce'};
+	md.qmu.statistics.method(1).steps=1:10;
+	md.qmu.statistics.method(1).nbins=20;
+
+	md.qmu.statistics.method(2).name='MeanVariance';
+	md.qmu.statistics.method(2).fields={'Sealevel','BslrIce'};
+	md.qmu.statistics.method(2).steps=[1:10];
+
+	md.qmu.statistics.method(3).name='SampleSeries';
+	md.qmu.statistics.method(3).fields={'Sealevel','BslrIce'};
+	md.qmu.statistics.method(3).steps=[1:10];
+	md.qmu.statistics.method(3).indices=locations;
+	%}}}
 
 %run transient dakota solution: 
+mds=solve(md,'Transient');
+
+%run without statistics computations:
+md.qmu.statistics.method(1).name='None';
 md=solve(md,'Transient');
 
-%sealevel mean and standard deviation:
-Smean=md.results.dakota.dresp_out.mean;
-Sstd=md.results.dakota.dresp_out.stddev;
+%compare statistics with our own here: 
+svalues=mds.results.StatisticsSolution(end).SealevelSamples; %all values at locations. 
+
+dvalues=zeros(md.qmu.method.params.samples,length(locations));
+for i=1:md.qmu.method.params.samples,
+	dvalues(i,:)=md.results.dakota.modelresults{i}.TransientSolution(end).Sealevel(locations);
+end
+
+samplesnorm=norm(dvalues-svalues,'fro');
 
 %Fields and tolerances to track changes
-field_names={'Sealevel Mean','Sealevel Standard Deviation'};
-field_tolerances={1e-13,1e-13};
-field_values={Smean,Sstd};
-
+field_names={'Samples Norm'};
+field_tolerances={1e-13};
+field_values={samplesnorm};