Index: /issm/trunk-jpl/test/NightlyRun/IdToName.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/IdToName.m (revision 17184) +++ /issm/trunk-jpl/test/NightlyRun/IdToName.m (revision 17185) @@ -29,4 +29,5 @@ case 122, name='SquareShelfConstrainedTransHOEnth'; case 123, name='SquareShelfConstrainedTranMisfitSurface'; + case 124, name='SquareShelfConstrainedTranFSFreeSurface'; case 201, name='SquareShelfStressSSA2d'; case 202, name='SquareShelfStressSSA3d'; @@ -173,4 +174,5 @@ case 701, name='FlowbandFSshelf'; case 702, name='FlowbandFSsheetshelf'; + case 703, name='FlowbandFSsheetshelfTrans'; case 1101, name='ISMIPAHO'; case 1102, name='ISMIPAFS'; Index: /issm/trunk-jpl/test/NightlyRun/test124.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test124.m (revision 17185) +++ /issm/trunk-jpl/test/NightlyRun/test124.m (revision 17185) @@ -0,0 +1,47 @@ +md=triangle(model(),'../Exp/Square.exp',150000.); +md=setmask(md,'all',''); +md=parameterize(md,'../Par/SquareShelfConstrained.par'); +md=extrude(md,3,1.); +md=setflowequation(md,'FS','all'); + +%Free surface +md.masstransport.isfreesurface=1; +md.timestepping.time_step=0.00001; +md.timestepping.final_time=0.00005; + +%Go solve +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,TransientSolutionEnum()); + +%Fields and tolerances to track changes +field_names ={... + 'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1',... + 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2',... + 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; +field_tolerances={... + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; +field_values={... + (md.results.TransientSolution(1).Vx),... + (md.results.TransientSolution(1).Vy),... + (md.results.TransientSolution(1).Vel),... + (md.results.TransientSolution(1).Pressure),... + (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Surface),... + (md.results.TransientSolution(1).Thickness),... + (md.results.TransientSolution(2).Vx),... + (md.results.TransientSolution(2).Vy),... + (md.results.TransientSolution(2).Vel),... + (md.results.TransientSolution(2).Pressure),... + (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Surface),... + (md.results.TransientSolution(2).Thickness),... + (md.results.TransientSolution(3).Vx),... + (md.results.TransientSolution(3).Vy),... + (md.results.TransientSolution(3).Vel),... + (md.results.TransientSolution(3).Pressure),... + (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Surface),... + (md.results.TransientSolution(3).Thickness),... + }; Index: /issm/trunk-jpl/test/NightlyRun/test703.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test703.m (revision 17185) +++ /issm/trunk-jpl/test/NightlyRun/test703.m (revision 17185) @@ -0,0 +1,93 @@ +%mesh parameters +x =[-5:.5:5]'; +[b h sea]=NowickiProfile(x); +x = x*10^3; +h = h*10^3; +b = (b-sea)*10^3; + +%mesh domain +md=bamgflowband(model(),x,b+h,b,'hmax',150); + +%parameterize +md.geometry.surface = interp1(x,b+h,md.mesh.x); +md.geometry.bed = interp1(x,b,md.mesh.x); +md.geometry.thickness = md.geometry.surface-md.geometry.bed; +md.mask.ice_levelset = - ones(md.mesh.numberofvertices,1); +md.mask.ice_levelset(find(vertexflags(md.mesh,2))) = 0; +md.mask.groundedice_levelset = double(md.mesh.x<0)-.5; + +md.initialization.temperature=(273.-20.)*ones(md.mesh.numberofvertices,1); +md.materials.rheology_B=paterson(md.initialization.temperature); +md.materials.rheology_n=3*ones(md.mesh.numberofelements,1); +md.damage.D=zeros(md.mesh.numberofvertices,1); +md.damage.spcdamage=NaN(md.mesh.numberofvertices,1); +md.friction.coefficient=zeros(md.mesh.numberofvertices,1); +md.friction.coefficient(find(vertexflags(md.mesh,1)))=20; +md.friction.p=ones(md.mesh.numberofelements,1); +md.friction.q=ones(md.mesh.numberofelements,1); +md.stressbalance.spcvx=NaN*ones(md.mesh.numberofvertices,1); +md.stressbalance.spcvy=NaN*ones(md.mesh.numberofvertices,1); +md.stressbalance.spcvz=NaN*ones(md.mesh.numberofvertices,1); +md.stressbalance.referential=NaN*ones(md.mesh.numberofvertices,6); +md.stressbalance.loadingforce=0*ones(md.mesh.numberofvertices,3); +md.stressbalance.spcvx(find(vertexflags(md.mesh,4)))=800; +md.stressbalance.spcvy(find(vertexflags(md.mesh,4)))=0; + +%Misc +md=setflowequation(md,'FS','all'); +md.flowequation.fe_FS='TaylorHood'; +md.stressbalance.abstol=NaN; +md.miscellaneous.name = 'flowline'; + +%Transient settings +md.timestepping.time_step=0.000001; +md.timestepping.final_time=0.000005; +md.surfaceforcings.mass_balance=zeros(md.mesh.numberofvertices,1); +md.basalforcings.melting_rate=zeros(md.mesh.numberofvertices,1); +md.basalforcings.geothermalflux=zeros(md.mesh.numberofvertices,1); +posb=find((md.mesh.x>0) & md.mesh.vertexonbed); +md.basalforcings.melting_rate(posb)=18; +md.initialization.vx=zeros(md.mesh.numberofvertices,1); +md.initialization.vy=zeros(md.mesh.numberofvertices,1); +md.initialization.pressure=zeros(md.mesh.numberofvertices,1); +md.masstransport.spcthickness=NaN*ones(md.mesh.numberofvertices,1); +md.thermal.spctemperature=NaN*ones(md.mesh.numberofvertices,1); +md.transient.isthermal=0; +md.masstransport.isfreesurface=1; + +%Go solve +md.cluster=generic('np',3); +md=solve(md,TransientSolutionEnum()); + +%Fields and tolerances to track changes +field_names ={... + 'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1',... + 'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2',... + 'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; +field_tolerances={... + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; +field_values={... + (md.results.TransientSolution(1).Vx),... + (md.results.TransientSolution(1).Vy),... + (md.results.TransientSolution(1).Vel),... + (md.results.TransientSolution(1).Pressure),... + (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Surface),... + (md.results.TransientSolution(1).Thickness),... + (md.results.TransientSolution(2).Vx),... + (md.results.TransientSolution(2).Vy),... + (md.results.TransientSolution(2).Vel),... + (md.results.TransientSolution(2).Pressure),... + (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Surface),... + (md.results.TransientSolution(2).Thickness),... + (md.results.TransientSolution(3).Vx),... + (md.results.TransientSolution(3).Vy),... + (md.results.TransientSolution(3).Vel),... + (md.results.TransientSolution(3).Pressure),... + (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Surface),... + (md.results.TransientSolution(3).Thickness),... + };