Changeset 3768


Ignore:
Timestamp:
05/17/10 09:19:37 (15 years ago)
Author:
seroussi
Message:

fields name

Location:
issm/trunk/test
Files:
26 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/test/Miscellaneous/Bump/Bump.par

    r2898 r3768  
    2121
    2222md.drag_type=2; %0 none 1 plastic 2 viscous
    23 md.drag=30*ones(md.numberofgrids,1); %q=1.
     23md.drag_coefficient=30*ones(md.numberofgrids,1); %q=1.
    2424%Take care of iceshelves: no basal drag
    2525pos=find(md.elementoniceshelf);
    26 md.drag(md.elements(pos,:))=0;
    27 md.p=ones(md.numberofelements,1);
    28 md.q=ones(md.numberofelements,1);
     26md.drag_coefficient(md.elements(pos,:))=0;
     27md.drag_p=ones(md.numberofelements,1);
     28md.drag_q=ones(md.numberofelements,1);
    2929
    3030md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
    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/Miscellaneous/connectivity/Square.par

    r340 r3768  
    1515
    1616md.drag_type=2; %0 none 1 plastic 2 viscous
    17 md.drag=200*ones(md.numberofgrids,1); %q=1.
     17md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1818%Take care of iceshelves: no basal drag
    1919pos=find(md.elementoniceshelf);
    20 md.drag(md.elements(pos,:))=0;
    21 md.p=ones(md.numberofelements,1);
    22 md.q=ones(md.numberofelements,1);
     20md.drag_coefficient(md.elements(pos,:))=0;
     21md.drag_p=ones(md.numberofelements,1);
     22md.drag_q=ones(md.numberofelements,1);
    2323md.viscosity_overshoot=0.3;
    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/Validation/ControlMethods/Square.par

    r280 r3768  
    1717disp('      creating drag');
    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
    … …  
    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:

  • issm/trunk/test/Validation/EISMINT/Diagnostic1/Square.par

    r900 r3768  
    1111disp('      creating drag');
    1212md.drag_type=2; %0 none 1 plastic 2 viscous
    13 md.drag=200*ones(md.numberofgrids,1); %q=1.
     13md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1414%Take care of iceshelves: no basal drag
    1515pos=find(md.elementoniceshelf);
    16 md.drag(md.elements(pos,:))=0;
    17 md.p=ones(md.numberofelements,1);
    18 md.q=ones(md.numberofelements,1);
     16md.drag_coefficient(md.elements(pos,:))=0;
     17md.drag-p=ones(md.numberofelements,1);
     18md.drag_q=ones(md.numberofelements,1);
    1919
    2020disp('      creating temperature');
    … …  
    2222
    2323disp('      creating flow law paramter');
    24 md.B=1.7687*10^8*ones(md.numberofgrids,1);
    25 md.n=3*ones(md.numberofelements,1);
     24md.rheology_B=1.7687*10^8*ones(md.numberofgrids,1);
     25md.rheology_n=3*ones(md.numberofelements,1);
    2626
    2727disp('      creating accumulation rates');
    28 md.accumulation=0.2*ones(md.numberofgrids,1); %0.2m/a
    29 md.melting=0*ones(md.numberofgrids,1); %0m/a
     28md.accumulation_rate=0.2*ones(md.numberofgrids,1); %0.2m/a
     29md.melting_rate=0*ones(md.numberofgrids,1); %0m/a
    3030
    3131disp('      boundary conditions ');

  • issm/trunk/test/Validation/EISMINT/Diagnostic2/Square.par

    r900 r3768  
    1111disp('      creating drag');
    1212md.drag_type=2; %0 none 1 plastic 2 viscous
    13 md.drag=200*ones(md.numberofgrids,1); %q=1.
     13md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1414%Take care of iceshelves: no basal drag
    1515pos=find(md.elementoniceshelf);
    16 md.drag(md.elements(pos,:))=0;
    17 md.p=ones(md.numberofelements,1);
    18 md.q=ones(md.numberofelements,1);
     16md.drag_coefficient(md.elements(pos,:))=0;
     17md.drag_p=ones(md.numberofelements,1);
     18md.drag_q=ones(md.numberofelements,1);
    1919
    2020disp('      creating temperature');
    … …  
    2222
    2323disp('      creating flow law paramter');
    24 md.B=1.7687*10^8*ones(md.numberofgrids,1);
    25 md.n=3*ones(md.numberofelements,1);
     24md.rheology_B=1.7687*10^8*ones(md.numberofgrids,1);
     25md.rheology_n=3*ones(md.numberofelements,1);
    2626
    2727disp('      creating accumulation rates');
    28 md.accumulation=0.2*ones(md.numberofgrids,1); %0.2m/a
    29 md.melting=0*ones(md.numberofgrids,1); %0m/a
     28md.accumulation_rate=0.2*ones(md.numberofgrids,1); %0.2m/a
     29md.melting_rate=0*ones(md.numberofgrids,1); %0m/a
    3030
    3131disp('      boundary conditions ');

  • issm/trunk/test/Validation/EISMINT/MassConservation/Square.par

    r3156 r3768  
    1111disp('      creating drag');
    1212md.drag_type=2; %0 none 1 plastic 2 viscous
    13 md.drag=200*ones(md.numberofgrids,1); %q=1.
     13md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1414%Take care of iceshelves: no basal drag
    1515pos=find(md.elementoniceshelf);
    16 md.drag(md.elements(pos,:))=0;
    17 md.p=ones(md.numberofelements,1);
    18 md.q=ones(md.numberofelements,1);
     16md.drag_coefficient(md.elements(pos,:))=0;
     17md.drag-p=ones(md.numberofelements,1);
     18md.drag_q=ones(md.numberofelements,1);
    1919
    2020disp('      creating temperature');
    … …  
    2323disp('      creating flow law paramter');
    2424%md.B=paterson(md.observed_temperature);
    25 md.B=1.7687*10^8*ones(md.numberofgrids,1);
    26 md.n=3*ones(md.numberofelements,1);
     25md.rheology_B=1.7687*10^8*ones(md.numberofgrids,1);
     26md.rheology_n=3*ones(md.numberofelements,1);
    2727
    2828disp('      creating accumulation rates');
    29 md.accumulation=0.0*ones(md.numberofgrids,1); %0m/a
    30 md.melting=0*ones(md.numberofgrids,1); %0m/a
     29md.accumulation_rate=0.0*ones(md.numberofgrids,1); %0m/a
     30md.melting_rate=0*ones(md.numberofgrids,1); %0m/a
    3131
    3232disp('      boundary conditions ');

  • issm/trunk/test/Validation/EISMINT/Transient/Square.par

    r900 r3768  
    1111disp('      creating drag');
    1212md.drag_type=2; %0 none 1 plastic 2 viscous
    13 md.drag=200*ones(md.numberofgrids,1); %q=1.
     13md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1414%Take care of iceshelves: no basal drag
    1515pos=find(md.elementoniceshelf);
    16 md.drag(md.elements(pos,:))=0;
    17 md.p=ones(md.numberofelements,1);
    18 md.q=ones(md.numberofelements,1);
     16md.drag_coefficient(md.elements(pos,:))=0;
     17md.drag_p=ones(md.numberofelements,1);
     18md.drag_q=ones(md.numberofelements,1);
    1919
    2020disp('      creating temperature');
    … …  
    2222
    2323disp('      creating flow law paramter');
    24 md.B=1.7687*10^8*ones(md.numberofgrids,1);
    25 md.n=3*ones(md.numberofelements,1);
     24md.rheology_B=1.7687*10^8*ones(md.numberofgrids,1);
     25md.rheology_n=3*ones(md.numberofelements,1);
    2626
    2727disp('      creating accumulation rates');
    28 md.accumulation=0.2*ones(md.numberofgrids,1); %0.2m/a
    29 md.melting=0*ones(md.numberofgrids,1); %0m/a
     28md.accumulation_rate=0.2*ones(md.numberofgrids,1); %0.2m/a
     29md.melting_rate=0*ones(md.numberofgrids,1); %0m/a
    3030
    3131disp('      boundary conditions ');

  • issm/trunk/test/Validation/HydrostaticIceSheet/NoFront/Square.par

    r761 r3768  
    1212disp('      creating drag');
    1313md.drag_type=2; %0 none 1 plastic 2 viscous
    14 md.drag=200*ones(md.numberofgrids,1); %q=1.
     14md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1515%Take care of iceshelves: no basal drag
    1616pos=find(md.elementoniceshelf);
    17 md.drag(md.elements(pos,:))=0;
    18 md.p=ones(md.numberofelements,1);
    19 md.q=ones(md.numberofelements,1);
     17md.drag_coefficient(md.elements(pos,:))=0;
     18md.drag_p=ones(md.numberofelements,1);
     19md.drag_q=ones(md.numberofelements,1);
    2020md.viscosity_overshoot=0.3;
    2121
    … …  
    2424
    2525disp('      creating flow law paramter');
    26 md.B=paterson(md.observed_temperature);
    27 md.n=3*ones(md.numberofelements,1);
     26md.rheology_B=paterson(md.observed_temperature);
     27md.rheology_n=3*ones(md.numberofelements,1);
    2828
    2929%Deal with boundary conditions:

  • issm/trunk/test/Validation/HydrostaticIceSheet/WithFront/Square.par

    r761 r3768  
    1212disp('      creating drag');
    1313md.drag_type=2; %0 none 1 plastic 2 viscous
    14 md.drag=200*ones(md.numberofgrids,1); %q=1.
     14md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1515%Take care of iceshelves: no basal drag
    1616pos=find(md.elementoniceshelf);
    17 md.drag(md.elements(pos,:))=0;
    18 md.p=ones(md.numberofelements,1);
    19 md.q=ones(md.numberofelements,1);
     17md.drag_coefficient(md.elements(pos,:))=0;
     18md.drag_p=ones(md.numberofelements,1);
     19md.drag_q=ones(md.numberofelements,1);
    2020md.viscosity_overshoot=0.3;
    2121
    … …  
    2424
    2525disp('      creating flow law paramter');
    26 md.B=paterson(md.observed_temperature);
    27 md.n=3*ones(md.numberofelements,1);
     26md.rheology_B=paterson(md.observed_temperature);
     27md.rheology_n=3*ones(md.numberofelements,1);
    2828
    2929%Deal with boundary conditions:

  • issm/trunk/test/Validation/ISMIP/TestA/Square.par

    r904 r3768  
    99disp('      creating drag');
    1010md.drag_type=2; %0 none 1 plastic 2 viscous
    11 md.drag=200*ones(md.numberofgrids,1); %q=1.
     11md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1212%Take care of iceshelves: no basal drag
    1313pos=find(md.elementoniceshelf);
    14 md.drag(md.elements(pos,:))=0;
    15 md.p=ones(md.numberofelements,1);
    16 md.q=ones(md.numberofelements,1);
     14md.drag_coefficient(md.elements(pos,:))=0;
     15md.drag_p=ones(md.numberofelements,1);
     16md.drag_q=ones(md.numberofelements,1);
    1717
    1818disp('      creating flow law paramter');
    19 md.B=6.8067*10^7*ones(md.numberofgrids,1);
    20 md.n=3*ones(md.numberofelements,1);
     19md.rheology_B=6.8067*10^7*ones(md.numberofgrids,1);
     20md.rheology_n=3*ones(md.numberofelements,1);
    2121
    2222disp('      boundary conditions for diagnostic model');

  • issm/trunk/test/Validation/ISMIP/TestB/Square.par

    r904 r3768  
    99disp('      creating drag');
    1010md.drag_type=2; %0 none 1 plastic 2 viscous
    11 md.drag=200*ones(md.numberofgrids,1); %q=1.
     11md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1212%Take care of iceshelves: no basal drag
    1313pos=find(md.elementoniceshelf);
    14 md.drag(md.elements(pos,:))=0;
    15 md.p=ones(md.numberofelements,1);
    16 md.q=ones(md.numberofelements,1);
     14md.drag_coefficient(md.elements(pos,:))=0;
     15md.drag_p=ones(md.numberofelements,1);
     16md.drag_q=ones(md.numberofelements,1);
    1717
    1818disp('      creating flow law paramter');
    19 md.B=6.8067*10^7*ones(md.numberofgrids,1);
    20 md.n=3*ones(md.numberofelements,1);
     19md.rheology_B=6.8067*10^7*ones(md.numberofgrids,1);
     20md.rheology_n=3*ones(md.numberofelements,1);
    2121
    2222disp('      boundary conditions for diagnostic model: ');

  • issm/trunk/test/Validation/ISMIP/TestC/Square.par

    r904 r3768  
    99disp('      creating drag');
    1010md.drag_type=2; %0 none 1 plastic 2 viscous
    11 md.drag=sqrt(md.yts.*(1000+1000*sin(md.x*2*pi/max(md.x)).*sin(md.y*2*pi/max(md.x)))./(md.g*(md.rho_ice*md.thickness+md.rho_water*md.bed)));
     11md.drag_coefficient=sqrt(md.yts.*(1000+1000*sin(md.x*2*pi/max(md.x)).*sin(md.y*2*pi/max(md.x)))./(md.g*(md.rho_ice*md.thickness+md.rho_water*md.bed)));
    1212%Take care of iceshelves: no basal drag
    1313pos=find(md.elementoniceshelf);
    14 md.drag(md.elements(pos,:))=0;
    15 md.p=ones(md.numberofelements,1);
    16 md.q=ones(md.numberofelements,1);
     14md.drag_coefficient(md.elements(pos,:))=0;
     15md.drag_p=ones(md.numberofelements,1);
     16md.drag_q=ones(md.numberofelements,1);
    1717
    1818disp('      creating flow law paramter');
    19 md.B=6.8067*10^7*ones(md.numberofgrids,1);
    20 md.n=3*ones(md.numberofelements,1);
     19md.rheology_B=6.8067*10^7*ones(md.numberofgrids,1);
     20md.rheology_n=3*ones(md.numberofelements,1);
    2121
    2222disp('      boundary conditions for diagnostic model: ');

  • issm/trunk/test/Validation/ISMIP/TestD/Square.par

    r904 r3768  
    99disp('      creating drag');
    1010md.drag_type=2; %0 none 1 plastic 2 viscous
    11 md.drag=sqrt(md.yts.*(1000+1000*sin(md.x*2*pi/max(md.x)))./(md.g*(md.rho_ice*md.thickness+md.rho_water*md.bed)));
     11md.drag_coefficient=sqrt(md.yts.*(1000+1000*sin(md.x*2*pi/max(md.x)))./(md.g*(md.rho_ice*md.thickness+md.rho_water*md.bed)));
    1212%Take care of iceshelves: no basal drag
    1313pos=find(md.elementoniceshelf);
    14 md.drag(md.elements(pos,:))=0;
    15 md.p=ones(md.numberofelements,1);
    16 md.q=ones(md.numberofelements,1);
     14md.drag_coefficient(md.elements(pos,:))=0;
     15md.drag_p=ones(md.numberofelements,1);
     16md.drag_q=ones(md.numberofelements,1);
    1717
    1818disp('      creating flow law paramter');
    19 md.B=6.8067*10^7*ones(md.numberofgrids,1);
    20 md.n=3*ones(md.numberofelements,1);
     19md.rheology_B=6.8067*10^7*ones(md.numberofgrids,1);
     20md.rheology_n=3*ones(md.numberofelements,1);
    2121
    2222disp('      boundary conditions for diagnostic model: ');

  • issm/trunk/test/Validation/ISMIP/TestE/Square.par

    r904 r3768  
    2121disp('      creating drag');
    2222md.drag_type=2; %0 none 1 plastic 2 viscous
    23 md.drag=zeros(md.numberofgrids,1);
     23md.drag_coefficient=zeros(md.numberofgrids,1);
    2424%Take care of iceshelves: no basal drag
    2525pos=find(md.elementoniceshelf);
    26 md.drag(md.elements(pos,:))=0;
    27 md.p=ones(md.numberofelements,1);
    28 md.q=ones(md.numberofelements,1);
     26md.drag_coefficient(md.elements(pos,:))=0;
     27md.drag_p=ones(md.numberofelements,1);
     28md.drag_q=ones(md.numberofelements,1);
    2929
    3030disp('      creating flow law paramter');
    31 md.B=6.8067*10^7*ones(md.numberofgrids,1);
    32 md.n=3*ones(md.numberofelements,1);
     31md.rheology_B=6.8067*10^7*ones(md.numberofgrids,1);
     32md.rheology_n=3*ones(md.numberofelements,1);
    3333
    3434disp('      boundary conditions for diagnostic model: ');

  • issm/trunk/test/Validation/ISMIP/TestF/Square.par

    r2527 r3768  
    1111disp('      creating drag');
    1212md.drag_type=2; %0 none 1 plastic 2 viscous
    13 md.drag=sqrt(md.yts.*(2.140373*10^-7*1000)^(-1));
    14 md.p=ones(md.numberofelements,1);
    15 md.q=zeros(md.numberofelements,1);
     13md.drag_coefficient=sqrt(md.yts.*(2.140373*10^-7*1000)^(-1));
     14md.drag_p=ones(md.numberofelements,1);
     15md.drag_q=zeros(md.numberofelements,1);
    1616
    1717disp('      creating flow law paramter');
    18 md.B=1.4734*10^14*ones(md.numberofgrids,1);
    19 md.n=1*ones(md.numberofelements,1);
     18md.rheology_B=1.4734*10^14*ones(md.numberofgrids,1);
     19md.rheology_n=1*ones(md.numberofelements,1);
    2020
    2121disp('      boundary conditions for diagnostic model');

  • issm/trunk/test/Validation/MacAyealVsPattyn/test1_iceshelf/Square.par

    r909 r3768  
    1616disp('      creating drag');
    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
    2525disp('      creating flow law paramter');
    26 md.B=paterson(md.observed_temperature);
    27 md.n=3*ones(md.numberofelements,1);
     26md.rheology_B=paterson(md.observed_temperature);
     27md.rheology_n=3*ones(md.numberofelements,1);
    2828
    2929disp('      boundary conditions for diagnostic model: ');

  • issm/trunk/test/Validation/MacAyealVsPattyn/test2_icesheet/Square.par

    r909 r3768  
    1616disp('      creating drag');
    1717md.drag_type=2; %0 none 1 plastic 2 viscous
    18 md.drag=10*ones(md.numberofgrids,1); %q=1.
     18md.drag_coefficient=10*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
    2525disp('      creating flow law paramter');
    26 md.B=paterson(md.observed_temperature);
    27 md.n=3*ones(md.numberofelements,1);
     26md.rheology_B=paterson(md.observed_temperature);
     27md.rheology_n=3*ones(md.numberofelements,1);
    2828
    2929%Deal with boundary conditions:

  • issm/trunk/test/Validation/MacAyealVsPattyn/test3_icesheet_iceshelf/Square.par

    r909 r3768  
    1212disp('      creating drag');
    1313md.drag_type=2; %0 none 1 plastic 2 viscous
    14 md.drag=200*ones(md.numberofgrids,1); %q=1.
     14md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1515%Take care of iceshelves: no basal drag
    1616pos=find(md.elementoniceshelf);
    17 md.drag(md.elements(pos,:))=0;
    18 md.p=ones(md.numberofelements,1);
    19 md.q=ones(md.numberofelements,1);
     17md.drag_coefficient(md.elements(pos,:))=0;
     18md.drag_p=ones(md.numberofelements,1);
     19md.drag_q=ones(md.numberofelements,1);
    2020
    2121disp('      creating temperature');
    … …  
    2323
    2424disp('      creating flow law paramter');
    25 md.B=paterson(md.observed_temperature);
    26 md.n=3*ones(md.numberofelements,1);
     25md.rheology_B=paterson(md.observed_temperature);
     26md.rheology_n=3*ones(md.numberofelements,1);
    2727
    2828%Deal with boundary conditions:

  • issm/trunk/test/Validation/PattynStokes/test1_iceshelf/Square.par

    r910 r3768  
    1313disp('      creating drag');
    1414md.drag_type=2; %0 none 1 plastic 2 viscous
    15 md.drag=200*ones(md.numberofgrids,1); %q=1.
     15md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1616%Take care of iceshelves: no basal drag
    1717pos=find(md.elementoniceshelf);
    18 md.drag(md.elements(pos,:))=0;
    19 md.p=ones(md.numberofelements,1);
    20 md.q=ones(md.numberofelements,1);
     18md.drag_coefficient(md.elements(pos,:))=0;
     19md.drag_p=ones(md.numberofelements,1);
     20md.drag_q=ones(md.numberofelements,1);
    2121
    2222disp('      creating temperature');
    … …  
    2424
    2525disp('      creating flow law paramter');
    26 md.B=paterson(md.observed_temperature);
    27 md.n=3*ones(md.numberofelements,1);
     26md.rheology_B=paterson(md.observed_temperature);
     27md.rheology_n=3*ones(md.numberofelements,1);
    2828
    2929disp('      boundary conditions for diagnostic model: ');

  • issm/trunk/test/Validation/PattynStokes/test2_icesheet/Square.par

    r910 r3768  
    1313disp('      creating drag');
    1414md.drag_type=2; %0 none 1 plastic 2 viscous
    15 md.drag=200*ones(md.numberofgrids,1); %q=1.
     15md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1616%Take care of iceshelves: no basal drag
    1717pos=find(md.elementoniceshelf);
    18 md.drag(md.elements(pos,:))=0;
    19 md.p=ones(md.numberofelements,1);
    20 md.q=ones(md.numberofelements,1);
     18md.drag_coefficient(md.elements(pos,:))=0;
     19md.drag_p=ones(md.numberofelements,1);
     20md.drag_q=ones(md.numberofelements,1);
    2121
    2222disp('      creating temperature');
    … …  
    2424
    2525disp('      creating flow law paramter');
    26 md.B=paterson(md.observed_temperature);
    27 md.n=3*ones(md.numberofelements,1);
     26md.rheology_B=paterson(md.observed_temperature);
     27md.rheology_n=3*ones(md.numberofelements,1);
    2828
    2929%Deal with boundary conditions:

  • issm/trunk/test/Validation/PattynStokes/test3_icesheet_iceshelf/Square.par

    r910 r3768  
    1313disp('      creating drag');
    1414md.drag_type=2; %0 none 1 plastic 2 viscous
    15 md.drag=200*ones(md.numberofgrids,1); %q=1.
     15md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    1616%Take care of iceshelves: no basal drag
    1717pos=find(md.elementoniceshelf);
    18 md.drag(md.elements(pos,:))=0;
    19 md.p=ones(md.numberofelements,1);
    20 md.q=ones(md.numberofelements,1);
     18md.drag_coefficient(md.elements(pos,:))=0;
     19md.drag_p=ones(md.numberofelements,1);
     20md.drag_q=ones(md.numberofelements,1);
    2121
    2222disp('      creating temperature');
    … …  
    2424
    2525disp('      creating flow law paramter');
    26 md.B=paterson(md.observed_temperature);
    27 md.n=3*ones(md.numberofelements,1);
     26md.rheology_B=paterson(md.observed_temperature);
     27md.rheology_n=3*ones(md.numberofelements,1);
    2828
    2929%Deal with boundary conditions:

  • issm/trunk/test/Validation/RoundIceSheet/Circ.par

    r908 r3768  
    1313disp('      creating drag');
    1414md.drag_type=2; %0 none 1 plastic 2 viscous
    15 md.drag=20*ones(md.numberofgrids,1); %q=1. %no drag is specified in the analytical solution
     15md.drag_coefficient=20*ones(md.numberofgrids,1); %q=1. %no drag is specified in the analytical solution
    1616%Take care of iceshelves: no basal drag
    1717pos=find(md.elementoniceshelf);
    18 md.drag(md.elements(pos,:))=0;
    19 md.p=ones(md.numberofelements,1);
    20 md.q=ones(md.numberofelements,1);
     18md.drag_coefficient(md.elements(pos,:))=0;
     19md.drag_p=ones(md.numberofelements,1);
     20md.drag_q=ones(md.numberofelements,1);
    2121
    2222disp('      creating temperatures');
    … …  
    2424
    2525disp('      creating flow law paramter');
    26 md.B=6.81*10^(7)*ones(md.numberofgrids,1); %to have the same B as the analytical solution
    27 md.n=3*ones(md.numberofelements,1);
     26md.rheology_B=6.81*10^(7)*ones(md.numberofgrids,1); %to have the same B as the analytical solution
     27md.rheology_n=3*ones(md.numberofelements,1);
    2828
    2929disp('      creating accumulation rates');
    30 md.accumulation=0.3*ones(md.numberofgrids,1)/md.yts; %1m/a
     30md.accumulation_rate=0.3*ones(md.numberofgrids,1)/md.yts; %1m/a
    3131
    3232disp('      creating velocities');

  • issm/trunk/test/Validation/ThermalTests/Melting/Square.par

    r900 r3768  
    1818disp('      creating drag');
    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
    2727disp('      creating temperatures');
    … …  
    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
    3434disp('      creating accumulation rates');
    35 md.accumulation=ones(md.numberofgrids,1)/md.yts; %1m/a
    36 md.melting=0*ones(md.numberofgrids,1)/md.yts; %1m/a
     35md.accumulation_rate=ones(md.numberofgrids,1)/md.yts; %1m/a
     36md.melting_rate=0*ones(md.numberofgrids,1)/md.yts; %1m/a
    3737
    3838%Deal with boundary conditions:

  • issm/trunk/test/Validation/ThermalTests/Simpleadvection/Square.par

    r900 r3768  
    1818disp('      creating drag');
    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
    2727disp('      creating temperatures');
    … …  
    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
    3434disp('      creating accumulation rates');
    35 md.accumulation=ones(md.numberofgrids,1)/md.yts; %1m/a
    36 md.melting=0*ones(md.numberofgrids,1)/md.yts; %1m/a
     35md.accumulation_rate=ones(md.numberofgrids,1)/md.yts; %1m/a
     36md.melting_rate=0*ones(md.numberofgrids,1)/md.yts; %1m/a
    3737
    3838%Deal with boundary conditions:

  • issm/trunk/test/Validation/ThermalTests/Simpleconduction/Square.par

    r491 r3768  
    1818        disp('      creating drag');
    1919        md.drag_type=2; %0 none 1 plastic 2 viscous
    20         md.drag=200*ones(md.numberofgrids,1); %q=1.
     20        md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
    2121        %Take care of iceshelves: no basal drag
    2222        pos=find(md.elementoniceshelf);
    23         md.drag(md.elements(pos,:))=0;
    24         md.p=ones(md.numberofelements,1);
    25         md.q=ones(md.numberofelements,1);
     23        md.drag_coefficient(md.elements(pos,:))=0;
     24        md.drag_p=ones(md.numberofelements,1);
     25        md.drag_q=ones(md.numberofelements,1);
    2626
    2727        disp('      creating temperatures');
    … …  
    2929
    3030        disp('      creating flow law paramter');
    31         md.B=paterson(md.observed_temperature);
    32         md.n=3*ones(md.numberofelements,1);
     31        md.rheology_B=paterson(md.observed_temperature);
     32        md.rheology_n=3*ones(md.numberofelements,1);
    3333       
    3434        disp('      creating accumulation rates');
    35         md.accumulation=ones(md.numberofgrids,1)/md.yts; %1m/a
    36         md.melting=0*ones(md.numberofgrids,1)/md.yts; %1m/a
     35        md.accumulation_rate=ones(md.numberofgrids,1)/md.yts; %1m/a
     36        md.melting_rate=0*ones(md.numberofgrids,1)/md.yts; %1m/a
    3737
    3838        %Deal with boundary conditions:

  • issm/trunk/test/Validation/ThermalTests/Simplegeothermalflux/Square.par

    r900 r3768  
    1818disp('      creating drag');
    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
    2727disp('      creating temperatures');
    … …  
    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
    3434disp('      creating accumulation rates');
    35 md.accumulation=ones(md.numberofgrids,1)/md.yts; %1m/a
    36 md.melting=0*ones(md.numberofgrids,1)/md.yts; %1m/a
     35md.accumulation_rate=ones(md.numberofgrids,1)/md.yts; %1m/a
     36md.melting_rate=0*ones(md.numberofgrids,1)/md.yts; %1m/a
    3737
    3838%Deal with boundary conditions:
Note: See TracChangeset for help on using the changeset viewer.