Index: /issm/trunk/test/Exp/SquareEISMINT.exp =================================================================== --- /issm/trunk/test/Exp/SquareEISMINT.exp (revision 5089) +++ /issm/trunk/test/Exp/SquareEISMINT.exp (revision 5089) @@ -0,0 +1,10 @@ +## Name:domainoutline +## Icon:0 +# Points Count Value +5 1. +# X pos Y pos +0 0 +200000 0 +200000 200000 +0 200000 +0 0 Index: /issm/trunk/test/Exp/SquareFrontEISMINT.exp =================================================================== --- /issm/trunk/test/Exp/SquareFrontEISMINT.exp (revision 5089) +++ /issm/trunk/test/Exp/SquareFrontEISMINT.exp (revision 5089) @@ -0,0 +1,10 @@ +## Name:icefront +## Icon:0 +# Points Count Value +5 1. +# X pos Y pos +-1000 -1000 +-1000 1000 +201000 1000 +201000 -1000 +-1000 -1000 Index: /issm/trunk/test/NightlyRun/test1104_nightly.m =================================================================== --- /issm/trunk/test/NightlyRun/test1104_nightly.m (revision 5088) +++ /issm/trunk/test/NightlyRun/test1104_nightly.m (revision 5089) @@ -6,5 +6,5 @@ 'Vx80km','Vy80km','Vz80km',... 'Vx160km','Vy160km','Vz160km' -} +}; field_tolerances={... 1e-13,1e-13,1e-13,... @@ -18,5 +18,5 @@ for i=1:6, result=results{i}; - field_values={field_values{i},... + field_values={field_values{:},... PatchToVec(result.Vx),... PatchToVec(result.Vy),... Index: /issm/trunk/test/NightlyRun/test1202.m =================================================================== --- /issm/trunk/test/NightlyRun/test1202.m (revision 5089) +++ /issm/trunk/test/NightlyRun/test1202.m (revision 5089) @@ -0,0 +1,17 @@ +%Test on the diagnostic model and the prognostic in 2d + +%tests 3 and 4: using Glen's flow law +md=model; +md=mesh(md,'../Exp/SquareEISMINT.exp',3550); +md=geography(md,'all',''); +md=parameterize(md,'../Par/SquareEISMINT.par'); +md=setelementstype(md,'macayeal','all'); %MacAyeal's model and 2d + +%Compute solution for MacAyeal's model +md=solve(md,'analysis_type',DiagnosticSolutionEnum); + +%plot results +vx=PatchToVec(md.results.DiagnosticSolution.Vx); +vy=PatchToVec(md.results.DiagnosticSolution.Vy); + +plotmodel(md,'data',vx,'data',vy,'contourlevels',{0,20,40,-20,-40},'contourlevels',{-100,-200,-300,-400,-500,-600},'contourcolor','k') Index: /issm/trunk/test/NightlyRun/test1202_nightly.m =================================================================== --- /issm/trunk/test/NightlyRun/test1202_nightly.m (revision 5089) +++ /issm/trunk/test/NightlyRun/test1202_nightly.m (revision 5089) @@ -0,0 +1,6 @@ +field_names ={'Vx','Vy'}; +field_tolerances={1e-13,1e-13}; +field_values={... + vx, ... + vy, ... + }; Index: /issm/trunk/test/NightlyRun/test1203.m =================================================================== --- /issm/trunk/test/NightlyRun/test1203.m (revision 5089) +++ /issm/trunk/test/NightlyRun/test1203.m (revision 5089) @@ -0,0 +1,21 @@ +%Test on the diagnostic model and the prognostic in 2d + +%test 5 and 6 : +md=model; +md=mesh(md,'../Exp/SquareEISMINT.exp',5100); %test3 +md=geography(md,'all',''); +md=parameterize(md,'../Par/SquareEISMINT.par'); +md=setelementstype(md,'macayeal','all'); %MacAyeal's model and 2d + +%Impose a non zero velocity on the upper boundary condition (y=max(y)) +pos=find(md.y==max(md.y)); +md.spcvelocity(pos,5)=400*(((md.x(pos)-100000)/25000).^2-ones(size(pos,1),1)).*heaviside((1+eps)*ones(size(pos,1),1)-((md.x(pos)-100000)/25000).^2); + +%Compute solution for MacAyeal's model +md=solve(md,'analysis_type',DiagnosticSolutionEnum); + +vx=PatchToVec(md.results.DiagnosticSolution.Vx); +vy=PatchToVec(md.results.DiagnosticSolution.Vy); + +%plot results +plotmodel(md,'data',vx,'data',vy,'contourlevels',{0,20,40,-20,-40,-60,60},'contourlevels',{-100,-200,-300,-400,-500,-600,-700,-800}) Index: /issm/trunk/test/NightlyRun/test1203_nightly.m =================================================================== --- /issm/trunk/test/NightlyRun/test1203_nightly.m (revision 5089) +++ /issm/trunk/test/NightlyRun/test1203_nightly.m (revision 5089) @@ -0,0 +1,6 @@ +field_names ={'Vx','Vy'}; +field_tolerances={1e-13,1e-13}; +field_values={... + vx, ... + vy, ... + }; Index: /issm/trunk/test/NightlyRun/test1301.m =================================================================== --- /issm/trunk/test/NightlyRun/test1301.m (revision 5088) +++ /issm/trunk/test/NightlyRun/test1301.m (revision 5089) @@ -10,5 +10,4 @@ md=parameterize(md,'../Par/SquareThermal.par'); md=extrude(md,3,2); -md.verbose=2; md=setelementstype(md,'Pattyn','all'); Index: /issm/trunk/test/Par/SquareEISMINT.par =================================================================== --- /issm/trunk/test/Par/SquareEISMINT.par (revision 5089) +++ /issm/trunk/test/Par/SquareEISMINT.par (revision 5089) @@ -0,0 +1,45 @@ +%Ok, start defining model parameters here + +disp(' creating thickness'); +ymin=min(md.y); +ymax=max(md.y); +md.thickness=500*ones(md.numberofgrids,1); +md.firn_layer=0*ones(md.numberofgrids,1); +md.bed=-md.rho_ice/md.rho_water*md.thickness; +md.surface=md.bed+md.thickness; + +disp(' creating drag'); +md.drag_type=2; %0 none 1 plastic 2 viscous +md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1. +%Take care of iceshelves: no basal drag +pos=find(md.elementoniceshelf); +md.drag_coefficient(md.elements(pos,:))=0; +md.drag_p=ones(md.numberofelements,1); +md.drag_q=ones(md.numberofelements,1); + +disp(' creating temperature'); +md.observed_temperature=(273-20)*ones(md.numberofgrids,1); + +disp(' creating flow law paramter'); +%md.B=paterson(md.observed_temperature); +md.rheology_B=1.7687*10^8*ones(md.numberofgrids,1); +md.rheology_n=3*ones(md.numberofelements,1); + +disp(' creating accumulation rates'); +md.accumulation_rate=0.0*ones(md.numberofgrids,1); %0m/a +md.melting_rate=0*ones(md.numberofgrids,1); %0m/a + +disp(' boundary conditions '); +md=SetMarineIceSheetBC(md,'../Exp/SquareFrontEISMINT.exp'); + +%Parallel options +md.np=6; +md.cluster=oshostname(); + +%Evolution of the ice shelf +pos=find(md.y==200000); %grids on the upper boundary condition +md.spcthickness(pos,1)=1; +md.spcthickness(pos,2)=500; +md.ndt=500; +md.dt=1; +md.artificial_diffusivity=0; %Better result with no artificial diffusivity