Changeset 17470


Ignore:
Timestamp:
03/18/14 16:35:55 (11 years ago)
Author:
seroussi
Message:

BUG: fixed level set tests in matlab

Location:
issm/trunk-jpl/test
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/test/NightlyRun/IdToName.m

    r17453 r17470  
    177177        case 702, name='FlowbandFSsheetshelf';
    178178        case 703, name='FlowbandFSsheetshelfTrans';
     179        case 801, name='ValleyGlacierLevelsetSSA2d';
     180        case 802, name='ValleyGlacierLevelsetThermalSSA3d';
     181        case 803, name='ValleyGlacierLevelsetEnthalpyHO3d';
     182        case 804, name='ValleyGlacierLevelsetCalvingSIA2d';
     183        case 805, name='ValleyGlacierLevelsetEnthCalvingHO3d';
    179184        case 1101, name='ISMIPAHO';
    180185        case 1102, name='ISMIPAFS';

  • issm/trunk-jpl/test/NightlyRun/test801.m

    r17468 r17470  
    11md=triangle(model(),'../Exp/Square.exp',50000);
    22md=setmask(md,'','');
    3 md=parameterize(md,'../Par/ValleyGlacierShelf.py');
     3md=parameterize(md,'../Par/ValleyGlacierShelf.par');
    44md=setflowequation(md,'SSA','all');
    55md.cluster=generic('name',oshostname(),'np',3);

  • issm/trunk-jpl/test/NightlyRun/test802.m

    r17468 r17470  
    11md=triangle(model(),'../Exp/Square.exp',50000);
    22md=setmask(md,'','');
    3 md=parameterize(md,'../Par/ValleyGlacierShelf.py');
     3md=parameterize(md,'../Par/ValleyGlacierShelf.par');
    44md=extrude(md,3,2.);
    55md=setflowequation(md,'SSA','all');

  • issm/trunk-jpl/test/NightlyRun/test803.m

    r17468 r17470  
    11md=triangle(model(),'../Exp/Square.exp',50000);
    22md=setmask(md,'','');
    3 md=parameterize(md,'../Par/ValleyGlacierShelf.py');
     3md=parameterize(md,'../Par/ValleyGlacierShelf.par');
    44md=extrude(md,3,2.);
    55md=setflowequation(md,'HO','all');
    … …  
    1010md.thermal.spctemperature(pos_surf)=md.initialization.temperature(pos_surf);
    1111md.thermal.isenthalpy=1;
     12md.thermal.isdynamicbasalspc=1;
    1213
    1314%Transient

  • issm/trunk-jpl/test/NightlyRun/test803.py

    r17454 r17470  
    2020md.thermal.spctemperature[pos_surf]=md.initialization.temperature[pos_surf]
    2121md.thermal.isenthalpy=True
     22md.thermal.isdynamicbasalspc=True
    2223
    2324#Transient

  • issm/trunk-jpl/test/NightlyRun/test804.m

    r17468 r17470  
    11md=triangle(model(),'../Exp/Square.exp',50000);
    22md=setmask(md,'','');
    3 md=parameterize(md,'../Par/ValleyGlacierShelf.py');
     3md=parameterize(md,'../Par/ValleyGlacierShelf.par');
    44md=setflowequation(md,'SIA','all');
    55md.cluster=generic('name',oshostname(),'np',3);

  • issm/trunk-jpl/test/NightlyRun/test805.m

    r17468 r17470  
    11md=triangle(model(),'../Exp/Square.exp',50000);
    22md=setmask(md,'','');
    3 md=parameterize(md,'../Par/ValleyGlacierShelf.py');
     3md=parameterize(md,'../Par/ValleyGlacierShelf.par');
    44md=extrude(md,3,2.);
    55md=setflowequation(md,'HO','all');
    … …  
    1010md.thermal.spctemperature(pos_surf)=md.initialization.temperature(pos_surf);
    1111md.thermal.isenthalpy=1;
     12md.thermal.isdynamicbasalspc=1;
    1213
    1314%Transient

  • issm/trunk-jpl/test/NightlyRun/test805.py

    r17462 r17470  
    2020md.thermal.spctemperature[pos_surf]=md.initialization.temperature[pos_surf]
    2121md.thermal.isenthalpy=True
     22md.thermal.isdynamicbasalspc=True
    2223
    2324#Transient

  • issm/trunk-jpl/test/Par/ValleyGlacierShelf.par

    r17469 r17470  
    2020slope = 0.9*(bmin-bmax)*(x-xmin)/(Lx*alpha) + 0.1*(bmin-bmax)*(y-ymin)/(Ly) + bmax;
    2121md.geometry.surface = (thk_center+bmax) + slope ;
    22 md.geometry.bed = bmax + slope + 4./Ly^2*(thk_center-thk_margin)*(y-ym).^2);
     22md.geometry.bed = bmax + slope + 4./Ly^2*(thk_center-thk_margin)*(y-ym).^2;
    2323md.geometry.thickness = md.geometry.surface - md.geometry.bed;
    2424md.geometry.bathymetry = md.geometry.bed;
Note: See TracChangeset for help on using the changeset viewer.