Index: ../trunk-jpl/test/NightlyRun/test441.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test441.m (nonexistent) +++ ../trunk-jpl/test/NightlyRun/test441.m (revision 21790) @@ -0,0 +1,80 @@ +%Test Name: MISMIP3D +md=triangle(model(),'../Exp/Square.exp',100000.); +md=setmask(md,'../Exp/SquareShelf.exp',''); +md=parameterize(md,'../Par/SquareSheetShelf.par'); +md.initialization.vx(:)=1.; +md.initialization.vy(:)=1.; +md.geometry.thickness(:)=500-md.mesh.x/10000; +md.geometry.bed =-100-md.mesh.x/1000; +md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water; +md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; +pos=find(md.mask.groundedice_levelset>=0); +md.geometry.base(pos)=md.geometry.bed(pos); +md.geometry.surface=md.geometry.base+md.geometry.thickness; +md=setflowequation(md,'SSA','all'); + +%Boundary conditions: +md.mask.ice_levelset=-ones(md.mesh.numberofvertices,1); +md.mask.ice_levelset(find(md.mesh.x==max(md.mesh.x)))=0; +md.stressbalance.spcvx(:)=NaN; +md.stressbalance.spcvy(:)=NaN; +md.stressbalance.spcvz(:)=NaN; +pos=find((md.mesh.y<1000000.1 & md.mesh.y>999999.9) | (md.mesh.y<0.1 & md.mesh.y>-0.1)); +md.stressbalance.spcvy(pos)=0; +pos2=find(md.mesh.x<0.1 & md.mesh.x>-0.1); +md.stressbalance.spcvx(pos2)=0; +md.stressbalance.spcvy(pos2)=0; + +md.materials.rheology_B=1/((10^-25)^(1/3))*ones(md.mesh.numberofvertices,1); +md.materials.rheology_law='None'; +md.friction.coefficient(:)=sqrt(10^7)*ones(md.mesh.numberofvertices,1); +md.friction.p=3*ones(md.mesh.numberofelements,1); +md.smb.mass_balance(:)=1; +md.basalforcings.groundedice_melting_rate(:)=0; +md.basalforcings.floatingice_melting_rate(:)=30; +md.transient.isthermal=0; +md.transient.isstressbalance=1; +md.transient.isgroundingline=1; +md.transient.ismasstransport=1; +md.transient.issmb=1; +md.transient.requested_outputs={'default','BasalforcingsFloatingiceMeltingRate'}; +md.groundingline.migration='SubelementMigration2'; +md.timestepping.final_time=30; +md.timestepping.time_step=10; + +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,'Transient'); + +%Fields and tolerances to track changes +field_names ={'Bed1','Surface1','Thickness1','Floatingice1','Vx1','Vy1','Pressure1','FloatingiceMeltingrate1',... + 'Bed2','Surface2','Thickness2','Floatingice2','Vx2','Vy2','Pressure2','FloatingiceMeltingrate2',... + 'Bed3','Surface3','Thickness3','Floatingice3','Vx3','Vy3','Pressure3','FloatingiceMeltingrate3'}; +field_tolerances={2e-11,5e-12,2e-11,1e-11,5e-10,1e-08,1e-13,1e-13,... + 3e-11,3e-11,9e-10,7e-11,1e-09,5e-08,1e-10,1e-13,... + 1e-10,3e-11,1e-10,7e-11,1e-09,5e-08,1e-10,1e-13}; +field_values={... + (md.results.TransientSolution(1).Base),... + (md.results.TransientSolution(1).Surface),... + (md.results.TransientSolution(1).Thickness),... + (md.results.TransientSolution(1).MaskGroundediceLevelset),... + (md.results.TransientSolution(1).Vx),... + (md.results.TransientSolution(1).Vy),... + (md.results.TransientSolution(1).Pressure),... + (md.results.TransientSolution(1).BasalforcingsFloatingiceMeltingRate),... + (md.results.TransientSolution(2).Base),... + (md.results.TransientSolution(2).Surface),... + (md.results.TransientSolution(2).Thickness),... + (md.results.TransientSolution(2).MaskGroundediceLevelset),... + (md.results.TransientSolution(2).Vx),... + (md.results.TransientSolution(2).Vy),... + (md.results.TransientSolution(2).Pressure),... + (md.results.TransientSolution(2).BasalforcingsFloatingiceMeltingRate),... + (md.results.TransientSolution(3).Base),... + (md.results.TransientSolution(3).Surface),... + (md.results.TransientSolution(3).Thickness),... + (md.results.TransientSolution(3).MaskGroundediceLevelset),... + (md.results.TransientSolution(3).Vx),... + (md.results.TransientSolution(3).Vy),... + (md.results.TransientSolution(3).Pressure),... + (md.results.TransientSolution(3).BasalforcingsFloatingiceMeltingRate),... + }; Index: ../trunk-jpl/test/NightlyRun/test442.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test442.m (nonexistent) +++ ../trunk-jpl/test/NightlyRun/test442.m (revision 21790) @@ -0,0 +1,84 @@ +%Test Name: MISMIP3DHO +md=triangle(model(),'../Exp/Square.exp',100000.); +md=setmask(md,'../Exp/SquareShelf.exp',''); +md=parameterize(md,'../Par/SquareSheetShelf.par'); +md.initialization.vx(:)=1.; +md.initialization.vy(:)=1.; +md.geometry.thickness(:)=500-md.mesh.x/10000; +md.geometry.bed =-100-md.mesh.x/1000; +md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water; +md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed; +pos=find(md.mask.groundedice_levelset>=0); +md.geometry.base(pos)=md.geometry.bed(pos); +md.geometry.surface=md.geometry.base+md.geometry.thickness; +md=extrude(md,4,1.); +md=setflowequation(md,'HO','all'); + +%Boundary conditions: +md.mask.ice_levelset=-ones(md.mesh.numberofvertices,1); +md.mask.ice_levelset(find(md.mesh.x==max(md.mesh.x)))=0; +md.stressbalance.spcvx(:)=NaN; +md.stressbalance.spcvy(:)=NaN; +md.stressbalance.spcvz(:)=NaN; +pos=find((md.mesh.y<1000000.1 & md.mesh.y>999999.9) | (md.mesh.y<0.1 & md.mesh.y>-0.1)); +md.stressbalance.spcvy(pos)=0; +pos2=find(md.mesh.x<0.1 & md.mesh.x>-0.1); +md.stressbalance.spcvx(pos2)=0; +md.stressbalance.spcvy(pos2)=0; + +md.materials.rheology_B=1/((10^-25)^(1/3))*ones(md.mesh.numberofvertices,1); +md.materials.rheology_law='None'; +md.friction.coefficient(:)=sqrt(10^7)*ones(md.mesh.numberofvertices,1); +md.friction.p=3*ones(md.mesh.numberofelements,1); +md.smb.mass_balance(:)=1; +md.basalforcings.groundedice_melting_rate(:)=0; +md.basalforcings.floatingice_melting_rate(:)=30; +md.transient.isthermal=0; +md.transient.isstressbalance=1; +md.transient.isgroundingline=1; +md.transient.ismasstransport=1; +md.transient.issmb=1; +md.transient.requested_outputs={'default','BasalforcingsFloatingiceMeltingRate'}; +md.groundingline.migration='SubelementMigration2'; +md.timestepping.final_time=30; +md.timestepping.time_step=10; + +md.cluster=generic('name',oshostname(),'np',3); +md=solve(md,'Transient'); + +%Fields and tolerances to track changes +field_names ={'Bed1','Surface1','Thickness1','Floatingice1','Vx1','Vy1','Vz1','Pressure1','FloatingiceMeltingrate1',... + 'Bed2','Surface2','Thickness2','Floatingice2','Vx2','Vy2','Vz2','Pressure2','FloatingiceMeltingrate2',... + 'Bed3','Surface3','Thickness3','Floatingice3','Vx3','Vy3','Vz3','Pressure3','FloatingiceMeltingrate3',}; +field_tolerances={2e-11,5e-12,2e-11,1e-11,5e-10,1e-08,6e-10,1e-13,1e-13,... + 3e-11,3e-11,9e-10,7e-11,1e-09,5e-08,1e-09,1e-10,1e-13,... + 1e-10,3e-11,1e-10,7e-11,1e-09,5e-08,1e-09,1e-10,1e-13}; +field_values={... + (md.results.TransientSolution(1).Base),... + (md.results.TransientSolution(1).Surface),... + (md.results.TransientSolution(1).Thickness),... + (md.results.TransientSolution(1).MaskGroundediceLevelset),... + (md.results.TransientSolution(1).Vx),... + (md.results.TransientSolution(1).Vy),... + (md.results.TransientSolution(1).Vz),... + (md.results.TransientSolution(1).Pressure),... + (md.results.TransientSolution(1).BasalforcingsFloatingiceMeltingRate),... + (md.results.TransientSolution(2).Base),... + (md.results.TransientSolution(2).Surface),... + (md.results.TransientSolution(2).Thickness),... + (md.results.TransientSolution(2).MaskGroundediceLevelset),... + (md.results.TransientSolution(2).Vx),... + (md.results.TransientSolution(2).Vy),... + (md.results.TransientSolution(2).Vz),... + (md.results.TransientSolution(2).Pressure),... + (md.results.TransientSolution(2).BasalforcingsFloatingiceMeltingRate),... + (md.results.TransientSolution(3).Base),... + (md.results.TransientSolution(3).Surface),... + (md.results.TransientSolution(3).Thickness),... + (md.results.TransientSolution(3).MaskGroundediceLevelset),... + (md.results.TransientSolution(3).Vx),... + (md.results.TransientSolution(3).Vy),... + (md.results.TransientSolution(3).Vz),... + (md.results.TransientSolution(3).Pressure),... + (md.results.TransientSolution(3).BasalforcingsFloatingiceMeltingRate),... + }; Index: ../trunk-jpl/test/Archives/Archive442.arch =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/test/Archives/Archive442.arch =================================================================== --- ../trunk-jpl/test/Archives/Archive442.arch (nonexistent) +++ ../trunk-jpl/test/Archives/Archive442.arch (revision 21790) Property changes on: ../trunk-jpl/test/Archives/Archive442.arch ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: ../trunk-jpl/test/Archives/Archive441.arch =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/test/Archives/Archive441.arch =================================================================== --- ../trunk-jpl/test/Archives/Archive441.arch (nonexistent) +++ ../trunk-jpl/test/Archives/Archive441.arch (revision 21790) Property changes on: ../trunk-jpl/test/Archives/Archive441.arch ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property