Changeset 25836 for issm/trunk/test/NightlyRun/test235.m

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• test (modified) (1 prop)
• test/NightlyRun (modified) (1 prop)
• test/NightlyRun/test235.m (modified) (1 diff)

issm/trunk/test/NightlyRun

@@ -18 +18 @@
 run.old
 run_matlab
+test218.qmu.in
+test218.qmu.out
+test218.qmu.err

@@ -18 +18 @@
 run.old
 run_matlab
+test218.qmu.in
+test218.qmu.out
+test218.qmu.err

issm/trunk/test/NightlyRun/test235.m

@@ -22 +22 @@
 
 %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('scaled_SmbMassBalance',1,100);
+md.qmu.variables.surface_mass_balance=normal_uncertain('descriptor','scaled_SmbMassBalance',...
+        'mean',ones(npart,1),...
+        'stddev',100*ones(npart,1),...
+        'partition',partition);
 
 %responses
-md.qmu.responses.MaxVel=response_function('MaxVel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
-md.qmu.responses.IceVolume=response_function('IceVolume',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
-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.MaxVel=response_function('descriptor','MaxVel');
+md.qmu.responses.IceVolume=response_function('descriptor','IceVolume');
+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');
 
 %mass flux profiles

@@ -18 +18 @@
 run.old
 run_matlab
+test218.qmu.in
+test218.qmu.out
+test218.qmu.err