Changeset 5355

Timestamp:

08/18/10 10:12:20 (15 years ago)

Author:

Mathieu Morlighem

Message:

control_type is now an Enum

Location:

issm/trunk/test/NightlyRun

Files:

• test223.m (modified) (2 diffs)
• test224.m (modified) (2 diffs)
• test225.m (modified) (2 diffs)
• test226.m (modified) (2 diffs)
• test227.m (modified) (2 diffs)
• test228.m (modified) (2 diffs)
• test229.m (modified) (2 diffs)
• test230.m (modified) (2 diffs)
• test235.m (modified) (2 diffs)
• test236.m (modified) (2 diffs)
• test337.m (modified) (1 diff)
• test338.m (modified) (1 diff)
• test339.m (modified) (1 diff)
• test340.m (modified) (1 diff)
• test341.m (modified) (1 diff)
• test342.m (modified) (1 diff)
• test343.m (modified) (1 diff)
• test344.m (modified) (1 diff)
• test429.m (modified) (1 diff)
• test430.m (modified) (1 diff)
• test431.m (modified) (1 diff)
• test432.m (modified) (1 diff)
• test521.m (modified) (1 diff)
• test522.m (modified) (1 diff)
• test523.m (modified) (1 diff)
• test524.m (modified) (1 diff)
• test525.m (modified) (1 diff)
• test526.m (modified) (1 diff)

issm/trunk/test/NightlyRun/test223.m

@@ -6 +6 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='rheology_B';
+md.control_type=RheologyBbarEnum();
 md.cm_min=10^6;
 md.cm_max=2*10^9;
@@ -21 +21 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Gradient' 'Misfits' 'RheologyB2d' 'Pressure' 'Vel' 'Vx' 'Vy'};
+field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
 field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
 field_values={...
         PatchToVec(md.results.DiagnosticSolution.Gradient),...
         md.results.DiagnosticSolution.J,...
-        PatchToVec(md.results.DiagnosticSolution.RheologyB2d),...
+        PatchToVec(md.results.DiagnosticSolution.RheologyBbar),...
         PatchToVec(md.results.DiagnosticSolution.Pressure),...
         PatchToVec(md.results.DiagnosticSolution.Vel),...

issm/trunk/test/NightlyRun/test224.m

@@ -6 +6 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='rheology_B';
+md.control_type=RheologyBbarEnum();
 md.cm_min=10^6;
 md.cm_max=2*10^9;
@@ -21 +21 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Gradient' 'Misfits' 'RheologyB2d' 'Pressure' 'Vel' 'Vx' 'Vy'};
+field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
 field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
 field_values={...
         PatchToVec(md.results.DiagnosticSolution.Gradient),...
         md.results.DiagnosticSolution.J,...
-        PatchToVec(md.results.DiagnosticSolution.RheologyB2d),...
+        PatchToVec(md.results.DiagnosticSolution.RheologyBbar),...
         PatchToVec(md.results.DiagnosticSolution.Pressure),...
         PatchToVec(md.results.DiagnosticSolution.Vel),...

issm/trunk/test/NightlyRun/test225.m

@@ -7 +7 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='rheology_B';
+md.control_type=RheologyBbarEnum();
 md.cm_min=10^6;
 md.cm_max=2*10^9;
@@ -22 +22 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Gradient' 'Misfits' 'RheologyB2d' 'Pressure' 'Vel' 'Vx' 'Vy'};
+field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
 field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
 field_values={...

issm/trunk/test/NightlyRun/test226.m

@@ -7 +7 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='rheology_B';
+md.control_type=RheologyBbarEnum();
 md.cm_min=10^6;
 md.cm_max=2*10^9;
@@ -22 +22 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Gradient' 'Misfits' 'RheologyB2d' 'Pressure' 'Vel' 'Vx' 'Vy'};
+field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
 field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
 field_values={...

issm/trunk/test/NightlyRun/test227.m

@@ -7 +7 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='rheology_B';
+md.control_type=RheologyBbarEnum();
 md.cm_min=10^6;
 md.cm_max=2*10^9;
@@ -22 +22 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Gradient' 'Misfits' 'RheologyB2d' 'Pressure' 'Vel' 'Vx' 'Vy'};
+field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
 field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09};
 field_values={...

issm/trunk/test/NightlyRun/test228.m

@@ -7 +7 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='rheology_B';
+md.control_type=RheologyBbarEnum();
 md.cm_min=10^6;
 md.cm_max=2*10^9;
@@ -22 +22 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Gradient' 'Misfits' 'RheologyB2d' 'Pressure' 'Vel' 'Vx' 'Vy'};
+field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
 field_tolerances={1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08};
 field_values={...

issm/trunk/test/NightlyRun/test229.m

@@ -7 +7 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='rheology_B';
+md.control_type=RheologyBbarEnum();
 md.cm_min=10^6;
 md.cm_max=2*10^9;
@@ -22 +22 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Gradient' 'Misfits' 'RheologyB2d' 'Pressure' 'Vel' 'Vx' 'Vy'};
+field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
 field_tolerances={1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09};
 field_values={...

issm/trunk/test/NightlyRun/test230.m

@@ -7 +7 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='rheology_B';
+md.control_type=RheologyBbarEnum();
 md.cm_min=10^6;
 md.cm_max=2*10^9;
@@ -22 +22 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Gradient' 'Misfits' 'RheologyB2d' 'Pressure' 'Vel' 'Vx' 'Vy'};
+field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
 field_tolerances={1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09};
 field_values={...

issm/trunk/test/NightlyRun/test235.m

@@ -61 +61 @@
 %Dakota options
 %variables
-md.variables.rheology_B=normal_uncertain('RheologyB2d',1,.5);
+md.variables.rheology_B=normal_uncertain('RheologyBbar',1,.5);
 
 %responses
@@ -85 +85 @@
 %Fields and tolerances to track changes
 md=tres(md,'dakota');
-md.results.dakota.importancefactors=importancefactors(md,'RheologyB2d','MaxVel')';
+md.results.dakota.importancefactors=importancefactors(md,'RheologyBbar','MaxVel')';
 field_names     ={'importancefactors'};
 field_tolerances={1e-11};

issm/trunk/test/NightlyRun/test236.m

@@ -61 +61 @@
 %Dakota options
 %variables
-md.variables.rheology_B=normal_uncertain('RheologyB2d',1,.5);
+md.variables.rheology_B=normal_uncertain('RheologyBbar',1,.5);
 
 %responses
@@ -85 +85 @@
 %Fields and tolerances to track changes
 md=tres(md,'dakota');
-md.results.dakota.importancefactors=importancefactors(md,'RheologyB2d','MaxVel')';
+md.results.dakota.importancefactors=importancefactors(md,'RheologyBbar','MaxVel')';
 field_names     ={'importancefactors'};
 field_tolerances={1e-13};

issm/trunk/test/NightlyRun/test337.m

@@ -6 +6 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;

issm/trunk/test/NightlyRun/test338.m

@@ -6 +6 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;

issm/trunk/test/NightlyRun/test339.m

@@ -7 +7 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;

issm/trunk/test/NightlyRun/test340.m

@@ -7 +7 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;

issm/trunk/test/NightlyRun/test341.m

@@ -7 +7 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;

issm/trunk/test/NightlyRun/test342.m

@@ -7 +7 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;

issm/trunk/test/NightlyRun/test343.m

@@ -7 +7 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;

issm/trunk/test/NightlyRun/test344.m

@@ -7 +7 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;

issm/trunk/test/NightlyRun/test429.m

@@ -7 +7 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;

issm/trunk/test/NightlyRun/test430.m

@@ -7 +7 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;

issm/trunk/test/NightlyRun/test431.m

@@ -7 +7 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;

issm/trunk/test/NightlyRun/test432.m

@@ -7 +7 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;

issm/trunk/test/NightlyRun/test521.m

@@ -12 +12 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='rheology_B';
+md.control_type=RheologyBbarEnum();
 md.cm_min=10^6;
 md.cm_max=2*10^9;

issm/trunk/test/NightlyRun/test522.m

@@ -12 +12 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='rheology_B';
+md.control_type=RheologyBbarEnum();
 md.cm_min=10^6;
 md.cm_max=2*10^9;

issm/trunk/test/NightlyRun/test523.m

@@ -7 +7 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;

issm/trunk/test/NightlyRun/test524.m

@@ -7 +7 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;

issm/trunk/test/NightlyRun/test525.m

@@ -7 +7 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;

issm/trunk/test/NightlyRun/test526.m

@@ -7 +7 @@
 %control parameters
 md.control_analysis=1;
-md.control_type='drag_coefficient';
+md.control_type=DragCoefficientEnum();
 md.cm_min=1;
 md.cm_max=200;