Changeset 5355


Ignore:
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:
28 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/test/NightlyRun/test223.m

    r5279 r5355  
    66%control parameters
    77md.control_analysis=1;
    8 md.control_type='rheology_B';
     8md.control_type=RheologyBbarEnum();
    99md.cm_min=10^6;
    1010md.cm_max=2*10^9;
     
    2121
    2222%Fields and tolerances to track changes
    23 field_names     ={'Gradient' 'Misfits' 'RheologyB2d' 'Pressure' 'Vel' 'Vx' 'Vy'};
     23field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
    2424field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    2525field_values={...
    2626        PatchToVec(md.results.DiagnosticSolution.Gradient),...
    2727        md.results.DiagnosticSolution.J,...
    28         PatchToVec(md.results.DiagnosticSolution.RheologyB2d),...
     28        PatchToVec(md.results.DiagnosticSolution.RheologyBbar),...
    2929        PatchToVec(md.results.DiagnosticSolution.Pressure),...
    3030        PatchToVec(md.results.DiagnosticSolution.Vel),...
  • issm/trunk/test/NightlyRun/test224.m

    r5279 r5355  
    66%control parameters
    77md.control_analysis=1;
    8 md.control_type='rheology_B';
     8md.control_type=RheologyBbarEnum();
    99md.cm_min=10^6;
    1010md.cm_max=2*10^9;
     
    2121
    2222%Fields and tolerances to track changes
    23 field_names     ={'Gradient' 'Misfits' 'RheologyB2d' 'Pressure' 'Vel' 'Vx' 'Vy'};
     23field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
    2424field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    2525field_values={...
    2626        PatchToVec(md.results.DiagnosticSolution.Gradient),...
    2727        md.results.DiagnosticSolution.J,...
    28         PatchToVec(md.results.DiagnosticSolution.RheologyB2d),...
     28        PatchToVec(md.results.DiagnosticSolution.RheologyBbar),...
    2929        PatchToVec(md.results.DiagnosticSolution.Pressure),...
    3030        PatchToVec(md.results.DiagnosticSolution.Vel),...
  • issm/trunk/test/NightlyRun/test225.m

    r5279 r5355  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type='rheology_B';
     9md.control_type=RheologyBbarEnum();
    1010md.cm_min=10^6;
    1111md.cm_max=2*10^9;
     
    2222
    2323%Fields and tolerances to track changes
    24 field_names     ={'Gradient' 'Misfits' 'RheologyB2d' 'Pressure' 'Vel' 'Vx' 'Vy'};
     24field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
    2525field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    2626field_values={...
  • issm/trunk/test/NightlyRun/test226.m

    r5279 r5355  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type='rheology_B';
     9md.control_type=RheologyBbarEnum();
    1010md.cm_min=10^6;
    1111md.cm_max=2*10^9;
     
    2222
    2323%Fields and tolerances to track changes
    24 field_names     ={'Gradient' 'Misfits' 'RheologyB2d' 'Pressure' 'Vel' 'Vx' 'Vy'};
     24field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
    2525field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    2626field_values={...
  • issm/trunk/test/NightlyRun/test227.m

    r5279 r5355  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type='rheology_B';
     9md.control_type=RheologyBbarEnum();
    1010md.cm_min=10^6;
    1111md.cm_max=2*10^9;
     
    2222
    2323%Fields and tolerances to track changes
    24 field_names     ={'Gradient' 'Misfits' 'RheologyB2d' 'Pressure' 'Vel' 'Vx' 'Vy'};
     24field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
    2525field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09};
    2626field_values={...
  • issm/trunk/test/NightlyRun/test228.m

    r5279 r5355  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type='rheology_B';
     9md.control_type=RheologyBbarEnum();
    1010md.cm_min=10^6;
    1111md.cm_max=2*10^9;
     
    2222
    2323%Fields and tolerances to track changes
    24 field_names     ={'Gradient' 'Misfits' 'RheologyB2d' 'Pressure' 'Vel' 'Vx' 'Vy'};
     24field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
    2525field_tolerances={1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08};
    2626field_values={...
  • issm/trunk/test/NightlyRun/test229.m

    r5279 r5355  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type='rheology_B';
     9md.control_type=RheologyBbarEnum();
    1010md.cm_min=10^6;
    1111md.cm_max=2*10^9;
     
    2222
    2323%Fields and tolerances to track changes
    24 field_names     ={'Gradient' 'Misfits' 'RheologyB2d' 'Pressure' 'Vel' 'Vx' 'Vy'};
     24field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
    2525field_tolerances={1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09};
    2626field_values={...
  • issm/trunk/test/NightlyRun/test230.m

    r5279 r5355  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type='rheology_B';
     9md.control_type=RheologyBbarEnum();
    1010md.cm_min=10^6;
    1111md.cm_max=2*10^9;
     
    2222
    2323%Fields and tolerances to track changes
    24 field_names     ={'Gradient' 'Misfits' 'RheologyB2d' 'Pressure' 'Vel' 'Vx' 'Vy'};
     24field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
    2525field_tolerances={1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09};
    2626field_values={...
  • issm/trunk/test/NightlyRun/test235.m

    r5337 r5355  
    6161%Dakota options
    6262%variables
    63 md.variables.rheology_B=normal_uncertain('RheologyB2d',1,.5);
     63md.variables.rheology_B=normal_uncertain('RheologyBbar',1,.5);
    6464
    6565%responses
     
    8585%Fields and tolerances to track changes
    8686md=tres(md,'dakota');
    87 md.results.dakota.importancefactors=importancefactors(md,'RheologyB2d','MaxVel')';
     87md.results.dakota.importancefactors=importancefactors(md,'RheologyBbar','MaxVel')';
    8888field_names     ={'importancefactors'};
    8989field_tolerances={1e-11};
  • issm/trunk/test/NightlyRun/test236.m

    r5337 r5355  
    6161%Dakota options
    6262%variables
    63 md.variables.rheology_B=normal_uncertain('RheologyB2d',1,.5);
     63md.variables.rheology_B=normal_uncertain('RheologyBbar',1,.5);
    6464
    6565%responses
     
    8585%Fields and tolerances to track changes
    8686md=tres(md,'dakota');
    87 md.results.dakota.importancefactors=importancefactors(md,'RheologyB2d','MaxVel')';
     87md.results.dakota.importancefactors=importancefactors(md,'RheologyBbar','MaxVel')';
    8888field_names     ={'importancefactors'};
    8989field_tolerances={1e-13};
  • issm/trunk/test/NightlyRun/test337.m

    r5279 r5355  
    66%control parameters
    77md.control_analysis=1;
    8 md.control_type='drag_coefficient';
     8md.control_type=DragCoefficientEnum();
    99md.cm_min=1;
    1010md.cm_max=200;
  • issm/trunk/test/NightlyRun/test338.m

    r5279 r5355  
    66%control parameters
    77md.control_analysis=1;
    8 md.control_type='drag_coefficient';
     8md.control_type=DragCoefficientEnum();
    99md.cm_min=1;
    1010md.cm_max=200;
  • issm/trunk/test/NightlyRun/test339.m

    r5279 r5355  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type='drag_coefficient';
     9md.control_type=DragCoefficientEnum();
    1010md.cm_min=1;
    1111md.cm_max=200;
  • issm/trunk/test/NightlyRun/test340.m

    r5279 r5355  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type='drag_coefficient';
     9md.control_type=DragCoefficientEnum();
    1010md.cm_min=1;
    1111md.cm_max=200;
  • issm/trunk/test/NightlyRun/test341.m

    r5279 r5355  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type='drag_coefficient';
     9md.control_type=DragCoefficientEnum();
    1010md.cm_min=1;
    1111md.cm_max=200;
  • issm/trunk/test/NightlyRun/test342.m

    r5279 r5355  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type='drag_coefficient';
     9md.control_type=DragCoefficientEnum();
    1010md.cm_min=1;
    1111md.cm_max=200;
  • issm/trunk/test/NightlyRun/test343.m

    r5279 r5355  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type='drag_coefficient';
     9md.control_type=DragCoefficientEnum();
    1010md.cm_min=1;
    1111md.cm_max=200;
  • issm/trunk/test/NightlyRun/test344.m

    r5279 r5355  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type='drag_coefficient';
     9md.control_type=DragCoefficientEnum();
    1010md.cm_min=1;
    1111md.cm_max=200;
  • issm/trunk/test/NightlyRun/test429.m

    r5279 r5355  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type='drag_coefficient';
     9md.control_type=DragCoefficientEnum();
    1010md.cm_min=1;
    1111md.cm_max=200;
  • issm/trunk/test/NightlyRun/test430.m

    r5279 r5355  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type='drag_coefficient';
     9md.control_type=DragCoefficientEnum();
    1010md.cm_min=1;
    1111md.cm_max=200;
  • issm/trunk/test/NightlyRun/test431.m

    r5279 r5355  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type='drag_coefficient';
     9md.control_type=DragCoefficientEnum();
    1010md.cm_min=1;
    1111md.cm_max=200;
  • issm/trunk/test/NightlyRun/test432.m

    r5352 r5355  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type='drag_coefficient';
     9md.control_type=DragCoefficientEnum();
    1010md.cm_min=1;
    1111md.cm_max=200;
  • issm/trunk/test/NightlyRun/test521.m

    r5279 r5355  
    1212%control parameters
    1313md.control_analysis=1;
    14 md.control_type='rheology_B';
     14md.control_type=RheologyBbarEnum();
    1515md.cm_min=10^6;
    1616md.cm_max=2*10^9;
  • issm/trunk/test/NightlyRun/test522.m

    r5279 r5355  
    1212%control parameters
    1313md.control_analysis=1;
    14 md.control_type='rheology_B';
     14md.control_type=RheologyBbarEnum();
    1515md.cm_min=10^6;
    1616md.cm_max=2*10^9;
  • issm/trunk/test/NightlyRun/test523.m

    r5279 r5355  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type='drag_coefficient';
     9md.control_type=DragCoefficientEnum();
    1010md.cm_min=1;
    1111md.cm_max=200;
  • issm/trunk/test/NightlyRun/test524.m

    r5279 r5355  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type='drag_coefficient';
     9md.control_type=DragCoefficientEnum();
    1010md.cm_min=1;
    1111md.cm_max=200;
  • issm/trunk/test/NightlyRun/test525.m

    r5279 r5355  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type='drag_coefficient';
     9md.control_type=DragCoefficientEnum();
    1010md.cm_min=1;
    1111md.cm_max=200;
  • issm/trunk/test/NightlyRun/test526.m

    r5279 r5355  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type='drag_coefficient';
     9md.control_type=DragCoefficientEnum();
    1010md.cm_min=1;
    1111md.cm_max=200;
Note: See TracChangeset for help on using the changeset viewer.