Changeset 23978


Ignore:
Timestamp:
05/31/19 20:08:38 (6 years ago)
Author:
Mathieu Morlighem
Message:

CHG: updated NR test

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

Legend:

Unmodified
Added
Removed

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

    r23762 r23978  
    99md.verbose=verbose('solution',true);
    1010md.settings.recording_frequency=4;
     11md.settings.output_frequency=8;
    1112
    1213% time steps and resolution

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

    r21056 r23978  
    2020md=setflowequation(md,'SSA','all');
    2121md.cluster=generic('name',oshostname(),'np',3);
    22 md=solve(md,'DamageEvolution');
     22md=solve(md,'tr');
    2323
    2424field_names={'D','F'};

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

    r23108 r23978  
    11%Test Name: SquareSheetConstrainedStressFS
     2%md=triangle(model(),'../Exp/Square.exp',180000.);
    23md=triangle(model(),'../Exp/Square.exp',180000.);
    34md=setmask(md,'','');
    45md=parameterize(md,'../Par/SquareSheetConstrained.par');
    5 md=extrude(md,3,1.);
     6md=extrude(md,2,1.);
    67md=setflowequation(md,'FS','all');
    7 md.cluster=generic('name',oshostname(),'np',3);
     8md.cluster=generic('name',oshostname(),'np',2);
     9md.flowequation.fe_FS='TaylorHood';
    810md=solve(md,'Stressbalance');
    911

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

    r23976 r23978  
    11%Test Name: SquareSheetHydrologyGlaDS
    2 cluster=generic('name',oshostname(),'np',1);
    32
    43%create model:
    … …  
    1110md=setmask(md,'',''); %everywhere grounded
    1211md=setflowequation(md,'SSA','all');
     12md.stressbalance.maxiter=2; %Make sure it runs quickly...
    1313
    1414%Some constants
    1515md.constants.g=9.8;
    1616md.materials.rho_ice=910;
    17 md.materials.rho_water=1000;
    1817
    1918%Geometry
    … …  
    3130
    3231%Materials
    33 md.materials.rheology_B    = paterson(md.initialization.temperature);
    34 md.materials.rheology_B(:) = (5e-25)^(-1/3);
    35 md.materials.rheology_n    = 3.*ones(md.mesh.numberofelements,1);
     32md.materials.rheology_B = (5e-25)^(-1/3) * ones(md.mesh.numberofvertices,1);
     33md.materials.rheology_n = 3.*ones(md.mesh.numberofelements,1);
    3634
    3735%Friction
    … …  
    3937md.friction.p=ones(md.mesh.numberofelements,1);
    4038md.friction.q=ones(md.mesh.numberofelements,1);
    41 md.friction.coupling=0;
     39%md.friction.coupling=0;
    4240
    4341%Boundary conditions:
    … …  
    6664md.hydrology.spcphi(pos) = md.materials.rho_ice * md.constants.g * md.geometry.thickness(pos);
    6765
    68 md.cluster=cluster;
     66md.cluster=generic('np',2);
    6967md=solve(md,'Transient'); %or 'tr'
    7068

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

    r23074 r23978  
    33%
    44%Script control parameters
    5 steps=1:11;
     5steps=1:9
    66final_time=1;
    77

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

    r21056 r23978  
    11%Test Name: 79NorthMasstransp2d
    2 md=triangle(model(),'../Exp/79North.exp',10000.);
     2md=triangle(model(),'../Exp/79North.exp',100.);
    33md=setmask(md,'../Exp/79NorthShelf.exp','');
    44md=parameterize(md,'../Par/79North.par');

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

    r23339 r23978  
    11%Test Name: FlowbandFSshelf
    2 x =[1:100:3000]';
     2%x =[1:100:3000]';
     3x =[1 3000]';
    34h=linspace(1000,300,numel(x))';
    45b=-917/1023*h;
    56
    6 md=bamgflowband(model(),x,b+h,b,'hmax',80);
     7md=bamgflowband(model(),x,b+h,b,'hmax',800000);
    78
    89%Geometry
    … …  
    3637md.stressbalance.spcvy(find(vertexflags(md.mesh,4)))=0;
    3738md.basalforcings.floatingice_melting_rate=zeros(md.mesh.numberofvertices,1);
     39pos = find(md.mesh.vertexonboundary);
     40md.stressbalance.spcvx(pos)=0;
     41md.stressbalance.spcvy(:)=0;
     42md.stressbalance.spcvz(:)=0;
    3843
    3944%Misc
    … …  
    5863        disp(['====== Testing ' i{1} ' Full-Stokes Finite element =====']);
    5964        md.flowequation.fe_FS=i{1};
     65        error('t701');
    6066        md=solve(md,'Stressbalance');
    6167        field_names     ={field_names{:},['Vx' i{1}],['Vy' i{1}],['Vel' i{1}],['Pressure' i{1}]};

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

    r23339 r23978  
    11%Test Name: FlowbandFSsheetshelf
    22%mesh parameters
    3 x =[-5:.5:5]';
     3x =[-5:.5: 5]';
    44[b h sea]=NowickiProfile(x);
     5x=[x(1);x(end)];
     6b=[b(1);b(end)];
     7h=[h(1);h(end)];
    58x = x*10^3;
    69h = h*10^3;
    … …  
    811
    912%mesh domain
    10 md=bamgflowband(model(),x,b+h,b,'hmax',150);
     13md=bamgflowband(model(),x,b+h,b,'hmax',15000);
    1114
    1215%parameterize
    … …  
    3538md.stressbalance.spcvy(find(vertexflags(md.mesh,4)))=0;
    3639md.basalforcings.floatingice_melting_rate=zeros(md.mesh.numberofvertices,1);
     40pos = find(md.mesh.vertexonboundary);
     41md.stressbalance.spcvx(pos)=0;
     42md.stressbalance.spcvy(:)=0;
     43md.stressbalance.spcvz(:)=0;
    3744
    3845%Misc
    … …  
    4653md.miscellaneous.name = 'test702';
    4754md.groundingline.migration='None';
    48 md.cluster=generic('np',2);
     55md.cluster=generic('np',1);
    4956
    5057%Fields and tolerances to track changes
    … …  
    5663        disp(['====== Testing ' i{1} ' Full-Stokes Finite element =====']);
    5764        md.flowequation.fe_FS=i{1};
     65        error('S');
    5866        md=solve(md,'Stressbalance');
    5967        field_names     ={field_names{:},['Vx' i{1}],['Vy' i{1}],['Vel' i{1}],['Pressure' i{1}]};
Note: See TracChangeset for help on using the changeset viewer.