Changeset 3757


Ignore:
Timestamp:
05/17/10 08:06:13 (15 years ago)
Author:
Mathieu Morlighem
Message:

update tests parameter files

Location:
issm/trunk/test/Verification
Files:
27 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/test/Verification/test01_IceShelfIceFrontM2d/Square.par

    r2340 r3757  
    1616
    1717md.drag_type=2; %0 none 1 plastic 2 viscous
    18 md.drag=200*ones(md.numberofgrids,1); %q=1.
     18md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1919%Take care of iceshelves: no basal drag
    2020pos=find(md.elementoniceshelf);
    21 md.drag(md.elements(pos,:))=0;
    22 md.p=ones(md.numberofelements,1);
    23 md.q=ones(md.numberofelements,1);
     21md.drag_coefficient(md.elements(pos,:))=0;
     22md.drag_p=ones(md.numberofelements,1);
     23md.drag_q=ones(md.numberofelements,1);
    2424md.viscosity_overshoot=0.3;
    2525
    2626md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
    2727
    28 md.B=paterson(md.observed_temperature);
    29 md.n=3*ones(md.numberofelements,1);
     28md.rheology_B=paterson(md.observed_temperature);
     29md.rheology_n=3*ones(md.numberofelements,1);
    3030
    3131%Deal with boundary conditions:

  • issm/trunk/test/Verification/test02_IceShelfIceFrontM3d/Square.par

    r2368 r3757  
    1717
    1818md.drag_type=2; %0 none 1 plastic 2 viscous
    19 md.drag=200*ones(md.numberofgrids,1); %q=1.
     19md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    2020%Take care of iceshelves: no basal drag
    2121pos=find(md.elementoniceshelf);
    22 md.drag(md.elements(pos,:))=0;
    23 md.p=ones(md.numberofelements,1);
    24 md.q=ones(md.numberofelements,1);
     22md.drag_coefficient(md.elements(pos,:))=0;
     23md.drag_p=ones(md.numberofelements,1);
     24md.drag_q=ones(md.numberofelements,1);
    2525md.viscosity_overshoot=0.0;
    2626
    2727md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
    2828
    29 md.B=paterson(md.observed_temperature);
    30 md.n=3*ones(md.numberofelements,1);
     29md.rheology_B=paterson(md.observed_temperature);
     30md.rheology_n=3*ones(md.numberofelements,1);
    3131
    3232%Deal with boundary conditions:

  • issm/trunk/test/Verification/test03_IceShelfIceFrontMP3d/Square.par

    r2331 r3757  
    1717
    1818md.drag_type=2; %0 none 1 plastic 2 viscous
    19 md.drag=200*ones(md.numberofgrids,1); %q=1.
     19md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    2020%Take care of iceshelves: no basal drag
    2121pos=find(md.elementoniceshelf);
    22 md.drag(md.elements(pos,:))=0;
    23 md.p=ones(md.numberofelements,1);
    24 md.q=ones(md.numberofelements,1);
     22md.drag_coefficient(md.elements(pos,:))=0;
     23md.drag_p=ones(md.numberofelements,1);
     24md.drag_q=ones(md.numberofelements,1);
    2525
    2626md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
    2727
    28 md.B=paterson(md.observed_temperature);
    29 md.n=3*ones(md.numberofelements,1);
     28md.rheology_B=paterson(md.observed_temperature);
     29md.rheology_n=3*ones(md.numberofelements,1);
    3030
    3131%Deal with boundary conditions:

  • issm/trunk/test/Verification/test04_IceShelfIceFrontMPS3d/Square.par

    r2331 r3757  
    1717
    1818md.drag_type=2; %0 none 1 plastic 2 viscous
    19 md.drag=200*ones(md.numberofgrids,1); %q=1.
     19md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    2020%Take care of iceshelves: no basal drag
    2121pos=find(md.elementoniceshelf);
    22 md.drag(md.elements(pos,:))=0;
    23 md.p=ones(md.numberofelements,1);
    24 md.q=ones(md.numberofelements,1);
     22md.drag_coefficient(md.elements(pos,:))=0;
     23md.drag_p=ones(md.numberofelements,1);
     24md.drag_q=ones(md.numberofelements,1);
    2525
    2626md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
    2727
    28 md.B=paterson(md.observed_temperature);
    29 md.n=3*ones(md.numberofelements,1);
     28md.rheology_B=paterson(md.observed_temperature);
     29md.rheology_n=3*ones(md.numberofelements,1);
    3030
    3131%Deal with boundary conditions:

  • issm/trunk/test/Verification/test05_IceShelfIceFrontP3d/Square.par

    r2331 r3757  
    1616
    1717md.drag_type=2; %0 none 1 plastic 2 viscous
    18 md.drag=200*ones(md.numberofgrids,1); %q=1.
     18md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1919%Take care of iceshelves: no basal drag
    2020pos=find(md.elementoniceshelf);
    21 md.drag(md.elements(pos,:))=0;
    22 md.p=ones(md.numberofelements,1);
    23 md.q=ones(md.numberofelements,1);
     21md.drag_coefficient(md.elements(pos,:))=0;
     22md.drag_p=ones(md.numberofelements,1);
     23md.drag_q=ones(md.numberofelements,1);
    2424
    2525md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
    2626
    27 md.B=paterson(md.observed_temperature);
    28 md.n=3*ones(md.numberofelements,1);
     27md.rheology_B=paterson(md.observed_temperature);
     28md.rheology_n=3*ones(md.numberofelements,1);
    2929
    3030%Deal with boundary conditions:

  • issm/trunk/test/Verification/test06_IceShelfIceFrontS3d/Square.par

    r2331 r3757  
    1616
    1717md.drag_type=2; %0 none 1 plastic 2 viscous
    18 md.drag=200*ones(md.numberofgrids,1); %q=1.
     18md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1919%Take care of iceshelves: no basal drag
    2020pos=find(md.elementoniceshelf);
    21 md.drag(md.elements(pos,:))=0;
    22 md.p=ones(md.numberofelements,1);
    23 md.q=ones(md.numberofelements,1);
     21md.drag_coefficient(md.elements(pos,:))=0;
     22md.drag_p=ones(md.numberofelements,1);
     23md.drag_q=ones(md.numberofelements,1);
    2424
    2525md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
    2626
    27 md.B=paterson(md.observed_temperature);
    28 md.n=3*ones(md.numberofelements,1);
     27md.rheology_B=paterson(md.observed_temperature);
     28md.rheology_n=3*ones(md.numberofelements,1);
    2929
    3030%Deal with boundary conditions:

  • issm/trunk/test/Verification/test07_IceSheetIceFrontM2d/Square.par

    r2331 r3757  
    1616
    1717md.drag_type=2; %0 none 1 plastic 2 viscous
    18 md.drag=200*ones(md.numberofgrids,1); %q=1.
     18md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1919%Take care of iceshelves: no basal drag
    2020pos=find(md.elementoniceshelf);
    21 md.drag(md.elements(pos,:))=0;
    22 md.p=ones(md.numberofelements,1);
    23 md.q=ones(md.numberofelements,1);
     21md.drag_coefficient(md.elements(pos,:))=0;
     22md.drag_p=ones(md.numberofelements,1);
     23md.drag_q=ones(md.numberofelements,1);
    2424md.viscosity_overshoot=0.3;
    2525
    2626md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
    2727
    28 md.B=paterson(md.observed_temperature);
    29 md.n=3*ones(md.numberofelements,1);
     28md.rheology_B=paterson(md.observed_temperature);
     29md.rheology_n=3*ones(md.numberofelements,1);
    3030
    3131%Deal with boundary conditions:

  • issm/trunk/test/Verification/test08_IceSheetIceFrontM3d/Square.par

    r2331 r3757  
    1717
    1818md.drag_type=2; %0 none 1 plastic 2 viscous
    19 md.drag=200*ones(md.numberofgrids,1); %q=1.
     19md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    2020%Take care of iceshelves: no basal drag
    2121pos=find(md.elementoniceshelf);
    22 md.drag(md.elements(pos,:))=0;
    23 md.p=ones(md.numberofelements,1);
    24 md.q=ones(md.numberofelements,1);
     22md.drag_coefficient(md.elements(pos,:))=0;
     23md.drag_p=ones(md.numberofelements,1);
     24md.drag_q=ones(md.numberofelements,1);
    2525md.viscosity_overshoot=0.0;
    2626
    2727md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
    2828
    29 md.B=paterson(md.observed_temperature);
    30 md.n=3*ones(md.numberofelements,1);
     29md.rheology_B=paterson(md.observed_temperature);
     30md.rheology_n=3*ones(md.numberofelements,1);
    3131
    3232%Deal with boundary conditions:

  • issm/trunk/test/Verification/test09_IceSheetIceFrontMP3d/Square.par

    r2331 r3757  
    1818
    1919md.drag_type=2; %0 none 1 plastic 2 viscous
    20 md.drag=200*ones(md.numberofgrids,1); %q=1.
     20md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    2121%Take care of iceshelves: no basal drag
    2222pos=find(md.elementoniceshelf);
    23 md.drag(md.elements(pos,:))=0;
    24 md.p=ones(md.numberofelements,1);
    25 md.q=ones(md.numberofelements,1);
     23md.drag_coefficient(md.elements(pos,:))=0;
     24md.drag_p=ones(md.numberofelements,1);
     25md.drag_q=ones(md.numberofelements,1);
    2626
    2727md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
    2828
    29 md.B=paterson(md.observed_temperature);
    30 md.n=3*ones(md.numberofelements,1);
     29md.rheology_B=paterson(md.observed_temperature);
     30md.rheology_n=3*ones(md.numberofelements,1);
    3131
    3232%Deal with boundary conditions:

  • issm/trunk/test/Verification/test10_IceSheetIceFrontP3d/Square.par

    r2331 r3757  
    1818
    1919md.drag_type=2; %0 none 1 plastic 2 viscous
    20 md.drag=200*ones(md.numberofgrids,1); %q=1.
     20md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    2121%Take care of iceshelves: no basal drag
    2222pos=find(md.elementoniceshelf);
    23 md.drag(md.elements(pos,:))=0;
    24 md.p=ones(md.numberofelements,1);
    25 md.q=ones(md.numberofelements,1);
     23md.drag_coefficient(md.elements(pos,:))=0;
     24md.drag_p=ones(md.numberofelements,1);
     25md.drag_q=ones(md.numberofelements,1);
    2626md.viscosity_overshoot=0.3;
    2727
    2828md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
    2929
    30 md.B=paterson(md.observed_temperature);
    31 md.n=3*ones(md.numberofelements,1);
     30md.rheology_B=paterson(md.observed_temperature);
     31md.rheology_n=3*ones(md.numberofelements,1);
    3232
    3333%Deal with boundary conditions:

  • issm/trunk/test/Verification/test11_IceSheetIceFrontS3d/Square.par

    r2331 r3757  
    1919
    2020md.drag_type=2; %0 none 1 plastic 2 viscous
    21 md.drag=200*ones(md.numberofgrids,1); %q=1.
     21md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    2222%Take care of iceshelves: no basal drag
    2323pos=find(md.elementoniceshelf);
    24 md.drag(md.elements(pos,:))=0;
    25 md.p=ones(md.numberofelements,1);
    26 md.q=ones(md.numberofelements,1);
     24md.drag_coefficient(md.elements(pos,:))=0;
     25md.drag_p=ones(md.numberofelements,1);
     26md.drag_q=ones(md.numberofelements,1);
    2727md.viscosity_overshoot=0.0;
    2828
    … …  
    3030md.min_thermal_constraints=3;
    3131
    32 md.B=paterson(md.observed_temperature);
    33 md.n=3*ones(md.numberofelements,1);
     32md.rheology_B=paterson(md.observed_temperature);
     33md.rheology_n=3*ones(md.numberofelements,1);
    3434
    3535%Deal with boundary conditions:

  • issm/trunk/test/Verification/test12_IceSheetNoIceFrontH2d/Square.par

    r2331 r3757  
    1616
    1717md.drag_type=2; %0 none 1 plastic 2 viscous
    18 md.drag=200*ones(md.numberofgrids,1); %q=1.
     18md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1919%Take care of iceshelves: no basal drag
    2020pos=find(md.elementoniceshelf);
    21 md.drag(md.elements(pos,:))=0;
    22 md.p=ones(md.numberofelements,1);
    23 md.q=ones(md.numberofelements,1);
     21md.drag_coefficient(md.elements(pos,:))=0;
     22md.drag_p=ones(md.numberofelements,1);
     23md.drag_q=ones(md.numberofelements,1);
    2424md.viscosity_overshoot=0.3;
    2525
    2626md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
    2727
    28 md.B=paterson(md.observed_temperature);
    29 md.n=3*ones(md.numberofelements,1);
     28md.rheology_B=paterson(md.observed_temperature);
     29md.rheology_n=3*ones(md.numberofelements,1);
    3030
    3131%Deal with boundary conditions:

  • issm/trunk/test/Verification/test13_IceSheetNoIceFrontH3d/Square.par

    r2331 r3757  
    1616
    1717md.drag_type=2; %0 none 1 plastic 2 viscous
    18 md.drag=200*ones(md.numberofgrids,1); %q=1.
     18md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1919%Take care of iceshelves: no basal drag
    2020pos=find(md.elementoniceshelf);
    21 md.drag(md.elements(pos,:))=0;
    22 md.p=ones(md.numberofelements,1);
    23 md.q=ones(md.numberofelements,1);
     21md.drag_coefficient(md.elements(pos,:))=0;
     22md.drag_p=ones(md.numberofelements,1);
     23md.drag_q=ones(md.numberofelements,1);
    2424
    2525md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
    2626
    27 md.B=paterson(md.observed_temperature);
    28 md.n=3*ones(md.numberofelements,1);
     27md.rheology_B=paterson(md.observed_temperature);
     28md.rheology_n=3*ones(md.numberofelements,1);
    2929
    3030%Deal with boundary conditions:

  • issm/trunk/test/Verification/test14_IceSheetNoIceFrontHM2d/Square.par

    r2331 r3757  
    1616
    1717md.drag_type=2; %0 none 1 plastic 2 viscous
    18 md.drag=200*ones(md.numberofgrids,1); %q=1.
     18md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1919%Take care of iceshelves: no basal drag
    2020pos=find(md.elementoniceshelf);
    21 md.drag(md.elements(pos,:))=0;
    22 md.p=ones(md.numberofelements,1);
    23 md.q=ones(md.numberofelements,1);
     21md.drag_coefficient(md.elements(pos,:))=0;
     22md.drag_p=ones(md.numberofelements,1);
     23md.drag_q=ones(md.numberofelements,1);
    2424md.viscosity_overshoot=0.3;
    2525
    2626md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
    2727
    28 md.B=paterson(md.observed_temperature);
    29 md.n=3*ones(md.numberofelements,1);
     28md.rheology_B=paterson(md.observed_temperature);
     29md.rheology_n=3*ones(md.numberofelements,1);
    3030
    3131%Deal with boundary conditions:

  • issm/trunk/test/Verification/test15_IceSheetNoIceFrontHM3d/Square.par

    r2331 r3757  
    1616
    1717md.drag_type=2; %0 none 1 plastic 2 viscous
    18 md.drag=200*ones(md.numberofgrids,1); %q=1.
     18md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1919%Take care of iceshelves: no basal drag
    2020pos=find(md.elementoniceshelf);
    21 md.drag(md.elements(pos,:))=0;
    22 md.p=ones(md.numberofelements,1);
    23 md.q=ones(md.numberofelements,1);
     21md.drag_coefficient(md.elements(pos,:))=0;
     22md.drag_p=ones(md.numberofelements,1);
     23md.drag_q=ones(md.numberofelements,1);
    2424
    2525md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
    2626
    27 md.B=paterson(md.observed_temperature);
    28 md.n=3*ones(md.numberofelements,1);
     27md.rheology_B=paterson(md.observed_temperature);
     28md.rheology_n=3*ones(md.numberofelements,1);
    2929
    3030%Deal with boundary conditions:

  • issm/trunk/test/Verification/test16_IceSheetNoIceFrontM2d/Square.par

    r2331 r3757  
    1616
    1717md.drag_type=2; %0 none 1 plastic 2 viscous
    18 md.drag=200*ones(md.numberofgrids,1); %q=1.
     18md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1919%Take care of iceshelves: no basal drag
    2020pos=find(md.elementoniceshelf);
    21 md.drag(md.elements(pos,:))=0;
    22 md.p=ones(md.numberofelements,1);
    23 md.q=ones(md.numberofelements,1);
     21md.drag_coefficient(md.elements(pos,:))=0;
     22md.drag_p=ones(md.numberofelements,1);
     23md.drag_q=ones(md.numberofelements,1);
    2424md.viscosity_overshoot=0.3;
    2525
    2626md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
    2727
    28 md.B=paterson(md.observed_temperature);
    29 md.n=3*ones(md.numberofelements,1);
     28md.rheology_B=paterson(md.observed_temperature);
     29md.rheology_n=3*ones(md.numberofelements,1);
    3030
    3131%Deal with boundary conditions:

  • issm/trunk/test/Verification/test17_IceSheetNoIceFrontM3d/Square.par

    r2331 r3757  
    1616
    1717md.drag_type=2; %0 none 1 plastic 2 viscous
    18 md.drag=200*ones(md.numberofgrids,1); %q=1.
     18md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1919%Take care of iceshelves: no basal drag
    2020pos=find(md.elementoniceshelf);
    21 md.drag(md.elements(pos,:))=0;
    22 md.p=ones(md.numberofelements,1);
    23 md.q=ones(md.numberofelements,1);
     21md.drag_coefficient(md.elements(pos,:))=0;
     22md.drag_p=ones(md.numberofelements,1);
     23md.drag_q=ones(md.numberofelements,1);
    2424
    2525md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
    2626
    27 md.B=paterson(md.observed_temperature);
    28 md.n=3*ones(md.numberofelements,1);
     27md.rheology_B=paterson(md.observed_temperature);
     28md.rheology_n=3*ones(md.numberofelements,1);
    2929
    3030%Deal with boundary conditions:

  • issm/trunk/test/Verification/test18_IceSheetNoIceFrontP3d/Square.par

    r2331 r3757  
    1616
    1717md.drag_type=2; %0 none 1 plastic 2 viscous
    18 md.drag=200*ones(md.numberofgrids,1); %q=1.
     18md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1919%Take care of iceshelves: no basal drag
    2020pos=find(md.elementoniceshelf);
    21 md.drag(md.elements(pos,:))=0;
    22 md.p=ones(md.numberofelements,1);
    23 md.q=ones(md.numberofelements,1);
     21md.drag_coefficient(md.elements(pos,:))=0;
     22md.drag_p=ones(md.numberofelements,1);
     23md.drag_q=ones(md.numberofelements,1);
    2424
    2525md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
    2626
    27 md.B=paterson(md.observed_temperature);
    28 md.n=3*ones(md.numberofelements,1);
     27md.rheology_B=paterson(md.observed_temperature);
     28md.rheology_n=3*ones(md.numberofelements,1);
    2929
    3030%Deal with boundary conditions:

  • issm/trunk/test/Verification/test19_IceSheetNoIceFrontS3d/Square.par

    r2331 r3757  
    1616
    1717md.drag_type=2; %0 none 1 plastic 2 viscous
    18 md.drag=200*ones(md.numberofgrids,1); %q=1.
     18md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1919%Take care of iceshelves: no basal drag
    2020pos=find(md.elementoniceshelf);
    21 md.drag(md.elements(pos,:))=0;
    22 md.p=ones(md.numberofelements,1);
    23 md.q=ones(md.numberofelements,1);
     21md.drag_coefficient(md.elements(pos,:))=0;
     22md.drag_p=ones(md.numberofelements,1);
     23md.drag_q=ones(md.numberofelements,1);
    2424
    2525md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
    2626
    27 md.B=paterson(md.observed_temperature);
    28 md.n=3*ones(md.numberofelements,1);
     27md.rheology_B=paterson(md.observed_temperature);
     28md.rheology_n=3*ones(md.numberofelements,1);
    2929
    3030%Deal with boundary conditions:

  • issm/trunk/test/Verification/test20_PigControlMethodDragM2d/Pig.par

    r3204 r3757  
    1414disp('      creating drag');
    1515md.drag_type=2;
    16 md.drag=50*ones(md.numberofgrids,1);
     16md.drag_coefficient=50*ones(md.numberofgrids,1);
    1717%Take care of iceshelves: no basal drag
    1818pos=find(md.elementoniceshelf);
    19 md.drag(md.elements(pos,:))=0;
    20 md.p=ones(md.numberofelements,1);
    21 md.q=ones(md.numberofelements,1);
     19md.drag_coefficient(md.elements(pos,:))=0;
     20md.drag_p=ones(md.numberofelements,1);
     21md.drag_q=ones(md.numberofelements,1);
    2222md.viscosity_overshoot=0.3;
    2323
    … …  
    2626
    2727disp('      creating flow law paramter');
    28 md.B=paterson(md.observed_temperature);
    29 md.n=3*ones(md.numberofelements,1);
     28md.rheology_B=paterson(md.observed_temperature);
     29md.rheology_n=3*ones(md.numberofelements,1);
    3030
    3131%Deal with boundary conditions:
    … …  
    3939%Misc
    4040md.verbose=0;
    41 md.plot=0;
     41md.drag_plot=0;
    4242md.eps_abs=NaN;
    4343md.eps_rel=0.05;

  • issm/trunk/test/Verification/test21_PigControlMethodBM2d/Pig.par

    r3204 r3757  
    1414disp('      creating drag');
    1515md.drag_type=2;
    16 md.drag=50*ones(md.numberofgrids,1);
     16md.drag_coefficient=50*ones(md.numberofgrids,1);
    1717%Take care of iceshelves: no basal drag
    1818pos=find(md.elementoniceshelf);
    19 md.drag(md.elements(pos,:))=0;
    20 md.p=ones(md.numberofelements,1);
    21 md.q=ones(md.numberofelements,1);
     19md.drag_coefficient(md.elements(pos,:))=0;
     20md.drag_p=ones(md.numberofelements,1);
     21md.drag_q=ones(md.numberofelements,1);
    2222md.viscosity_overshoot=0.3;
    2323
    … …  
    2626
    2727disp('      creating flow law paramter');
    28 md.B=paterson(md.observed_temperature);
    29 md.n=3*ones(md.numberofelements,1);
     28md.rheology_B=paterson(md.observed_temperature);
     29md.rheology_n=3*ones(md.numberofelements,1);
    3030
    3131%Deal with boundary conditions:
    … …  
    3939%Misc
    4040md.verbose=0;
    41 md.plot=0;
     41md.drag_plot=0;
    4242md.eps_abs=NaN;
    4343md.eps_rel=0.005;

  • issm/trunk/test/Verification/test22_PigControlMethodDragP3d/Pig.par

    r3204 r3757  
    1414disp('      creating drag');
    1515md.drag_type=2;
    16 md.drag=50*ones(md.numberofgrids,1);
     16md.drag_coefficient=50*ones(md.numberofgrids,1);
    1717%Take care of iceshelves: no basal drag
    1818pos=find(md.elementoniceshelf);
    19 md.drag(md.elements(pos,:))=0;
    20 md.p=ones(md.numberofelements,1);
    21 md.q=ones(md.numberofelements,1);
     19md.drag_coefficient(md.elements(pos,:))=0;
     20md.drag_p=ones(md.numberofelements,1);
     21md.drag_q=ones(md.numberofelements,1);
    2222md.viscosity_overshoot=0.3;
    2323
    … …  
    2626
    2727disp('      creating flow law paramter');
    28 md.B=paterson(md.observed_temperature);
    29 md.n=3*ones(md.numberofelements,1);
     28md.rheology_B=paterson(md.observed_temperature);
     29md.rheology_n=3*ones(md.numberofelements,1);
    3030
    3131%Deal with boundary conditions:
    … …  
    3939%Misc
    4040md.verbose=0;
    41 md.plot=0;
     41md.drag_plot=0;
    4242md.eps_abs=NaN;
    4343md.eps_rel=0.05;

  • issm/trunk/test/Verification/test23_PigControlMethodDragS3d/Pig.par

    r3204 r3757  
    1717disp('      creating drag');
    1818md.drag_type=2;
    19 md.drag=50*ones(md.numberofgrids,1);
     19md.drag_coefficient=50*ones(md.numberofgrids,1);
    2020%Take care of iceshelves: no basal drag
    2121pos=find(md.elementoniceshelf);
    22 md.drag(md.elements(pos,:))=0;
    23 md.p=ones(md.numberofelements,1);
    24 md.q=ones(md.numberofelements,1);
     22md.drag_coefficient(md.elements(pos,:))=0;
     23md.drag_p=ones(md.numberofelements,1);
     24md.drag_q=ones(md.numberofelements,1);
    2525md.viscosity_overshoot=0.3;
    2626
    … …  
    2929
    3030disp('      creating flow law paramter');
    31 md.B=paterson(md.observed_temperature);
    32 md.n=3*ones(md.numberofelements,1);
     31md.rheology_B=paterson(md.observed_temperature);
     32md.rheology_n=3*ones(md.numberofelements,1);
    3333
    3434%Deal with boundary conditions:
    … …  
    4242%Misc
    4343md.verbose=0;
    44 md.plot=0;
     44md.drag_plot=0;
    4545md.eps_abs=NaN;
    4646md.eps_rel=0.01;

  • issm/trunk/test/Verification/test24_IceShelfIceFrontM2dRifts/Square.par

    r2331 r3757  
    1616
    1717md.drag_type=2; %0 none 1 plastic 2 viscous
    18 md.drag=200*ones(md.numberofgrids,1); %q=1.
     18md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1919%Take care of iceshelves: no basal drag
    2020pos=find(md.elementoniceshelf);
    21 md.drag(md.elements(pos,:))=0;
    22 md.p=ones(md.numberofelements,1);
    23 md.q=ones(md.numberofelements,1);
     21md.drag_coefficient(md.elements(pos,:))=0;
     22md.drag_p=ones(md.numberofelements,1);
     23md.drag_q=ones(md.numberofelements,1);
    2424md.viscosity_overshoot=0.3;
    2525
    2626md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
    2727
    28 md.B=paterson(md.observed_temperature);
    29 md.n=3*ones(md.numberofelements,1);
     28md.rheology_B=paterson(md.observed_temperature);
     29md.rheology_n=3*ones(md.numberofelements,1);
    3030
    3131%Deal with boundary conditions:
    … …  
    4343md.rifts.fill=MelangeEnum();
    4444md.rifts.fraction=0;
    45 md.penalty_lock=2;
     45md.drag_penalty_lock=2;
    4646md.rifts.fractionincrement=.1;

  • issm/trunk/test/Verification/test25_IceSheetIceFrontM2dDakota/Square.par

    r2331 r3757  
    1616
    1717md.drag_type=2; %0 none 1 plastic 2 viscous
    18 md.drag=20*ones(md.numberofgrids,1); %q=1.
     18md.drag_coefficient=20*ones(md.numberofgrids,1); %q=1.
    1919%Take care of iceshelves: no basal drag
    2020pos=find(md.elementoniceshelf);
    21 md.drag(md.elements(pos,:))=0;
    22 md.p=ones(md.numberofelements,1);
    23 md.q=ones(md.numberofelements,1);
     21md.drag_coefficient(md.elements(pos,:))=0;
     22md.drag_p=ones(md.numberofelements,1);
     23md.drag_q=ones(md.numberofelements,1);
    2424md.viscosity_overshoot=0.3;
    2525
    2626md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
    2727
    28 md.B=paterson(md.observed_temperature);
    29 md.n=3*ones(md.numberofelements,1);
     28md.rheology_B=paterson(md.observed_temperature);
     29md.rheology_n=3*ones(md.numberofelements,1);
    3030
    3131%Deal with boundary conditions:
    … …  
    4848md.responses.rf (end+1)=response_function('max_vel',[],[0.0001 0.001 0.01 0.25 0.5 0.75 0.99 0.999 0.9999]);
    4949
    50 md.qmu_method     =dakota_method('nond_l');
     50md.drag_qmu_method     =dakota_method('nond_l');
    5151
    52 md.qmu_params.direct=true;
    53 md.qmu_params.analysis_driver='diagnostic';
    54 md.qmu_params.evaluation_concurrency=1;
    55 md.qmu_params.interval_type='forward';
    56 md.qmu_params.tabular_graphics_data=true;
     52md.drag_qmu_params.direct=true;
     53md.drag_qmu_params.analysis_driver='diagnostic';
     54md.drag_qmu_params.evaluation_concurrency=1;
     55md.drag_qmu_params.interval_type='forward';
     56md.drag_qmu_params.tabular_graphics_data=true;
    5757
    58 md.part=0:1:md.numberofgrids-1;
    59 md.part=md.part';
     58md.drag_part=0:1:md.numberofgrids-1;
     59md.drag_part=md.drag_part';
    6060md.npart=md.numberofgrids;
    61 md.qmu_analysis=1;
     61md.drag_qmu_analysis=1;
    6262
    6363md.eps_rel=10^-10; %tighten for qmu analysese

  • issm/trunk/test/Verification/test26_Balanced2d/79North.par

    r3537 r3757  
    1919disp('      creating drag');
    2020md.drag_type=2;
    21 md.drag=50*ones(md.numberofgrids,1);
     21md.drag_coefficient=50*ones(md.numberofgrids,1);
    2222%Take care of iceshelves: no basal drag
    2323pos=find(md.elementoniceshelf);
    24 md.drag(md.elements(pos,:))=0;
    25 md.p=ones(md.numberofelements,1);
    26 md.q=ones(md.numberofelements,1);
     24md.drag_coefficient(md.elements(pos,:))=0;
     25md.drag_p=ones(md.numberofelements,1);
     26md.drag_q=ones(md.numberofelements,1);
    2727md.viscosity_overshoot=0.3;
    2828
    … …  
    3131
    3232disp('      creating flow law paramter');
    33 md.B=paterson(md.observed_temperature);
    34 md.n=3*ones(md.numberofelements,1);
     33md.rheology_B=paterson(md.observed_temperature);
     34md.rheology_n=3*ones(md.numberofelements,1);
    3535
    3636%Deal with boundary conditions:
    … …  
    4747%Misc
    4848md.verbose=10;
    49 md.plot=0;
     49md.drag_plot=0;
    5050md.eps_abs=NaN;
    5151md.eps_rel=0.05;

  • issm/trunk/test/Verification/test27_Balanced3d/79North.par

    r3535 r3757  
    1919disp('      creating drag');
    2020md.drag_type=2;
    21 md.drag=50*ones(md.numberofgrids,1);
     21md.drag_coefficient=50*ones(md.numberofgrids,1);
    2222%Take care of iceshelves: no basal drag
    2323pos=find(md.elementoniceshelf);
    24 md.drag(md.elements(pos,:))=0;
    25 md.p=ones(md.numberofelements,1);
    26 md.q=ones(md.numberofelements,1);
     24md.drag_coefficient(md.elements(pos,:))=0;
     25md.drag_p=ones(md.numberofelements,1);
     26md.drag_q=ones(md.numberofelements,1);
    2727md.viscosity_overshoot=0.3;
    2828
    … …  
    3131
    3232disp('      creating flow law paramter');
    33 md.B=paterson(md.observed_temperature);
    34 md.n=3*ones(md.numberofelements,1);
     33md.rheology_B=paterson(md.observed_temperature);
     34md.rheology_n=3*ones(md.numberofelements,1);
    3535
    3636%Deal with boundary conditions:
    … …  
    4747%Misc
    4848md.verbose=10;
    49 md.plot=0;
     49md.drag_plot=0;
    5050md.eps_abs=NaN;
    5151md.eps_rel=0.05;
Note: See TracChangeset for help on using the changeset viewer.