source: issm/oecreview/Archive/21724-22754/ISSM-21789-21790.diff@ 22755

Last change on this file since 22755 was 22755, checked in by Mathieu Morlighem, 7 years ago

CHG: added 21724-22754
File size: 9.4 KB
RevLine 
[22755]1Index: ../trunk-jpl/test/NightlyRun/test441.m
2===================================================================
3--- ../trunk-jpl/test/NightlyRun/test441.m (nonexistent)
4+++ ../trunk-jpl/test/NightlyRun/test441.m (revision 21790)
5@@ -0,0 +1,80 @@
6+%Test Name: MISMIP3D
7+md=triangle(model(),'../Exp/Square.exp',100000.);
8+md=setmask(md,'../Exp/SquareShelf.exp','');
9+md=parameterize(md,'../Par/SquareSheetShelf.par');
10+md.initialization.vx(:)=1.;
11+md.initialization.vy(:)=1.;
12+md.geometry.thickness(:)=500-md.mesh.x/10000;
13+md.geometry.bed =-100-md.mesh.x/1000;
14+md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water;
15+md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
16+pos=find(md.mask.groundedice_levelset>=0);
17+md.geometry.base(pos)=md.geometry.bed(pos);
18+md.geometry.surface=md.geometry.base+md.geometry.thickness;
19+md=setflowequation(md,'SSA','all');
20+
21+%Boundary conditions:
22+md.mask.ice_levelset=-ones(md.mesh.numberofvertices,1);
23+md.mask.ice_levelset(find(md.mesh.x==max(md.mesh.x)))=0;
24+md.stressbalance.spcvx(:)=NaN;
25+md.stressbalance.spcvy(:)=NaN;
26+md.stressbalance.spcvz(:)=NaN;
27+pos=find((md.mesh.y<1000000.1 & md.mesh.y>999999.9) | (md.mesh.y<0.1 & md.mesh.y>-0.1));
28+md.stressbalance.spcvy(pos)=0;
29+pos2=find(md.mesh.x<0.1 & md.mesh.x>-0.1);
30+md.stressbalance.spcvx(pos2)=0;
31+md.stressbalance.spcvy(pos2)=0;
32+
33+md.materials.rheology_B=1/((10^-25)^(1/3))*ones(md.mesh.numberofvertices,1);
34+md.materials.rheology_law='None';
35+md.friction.coefficient(:)=sqrt(10^7)*ones(md.mesh.numberofvertices,1);
36+md.friction.p=3*ones(md.mesh.numberofelements,1);
37+md.smb.mass_balance(:)=1;
38+md.basalforcings.groundedice_melting_rate(:)=0;
39+md.basalforcings.floatingice_melting_rate(:)=30;
40+md.transient.isthermal=0;
41+md.transient.isstressbalance=1;
42+md.transient.isgroundingline=1;
43+md.transient.ismasstransport=1;
44+md.transient.issmb=1;
45+md.transient.requested_outputs={'default','BasalforcingsFloatingiceMeltingRate'};
46+md.groundingline.migration='SubelementMigration2';
47+md.timestepping.final_time=30;
48+md.timestepping.time_step=10;
49+
50+md.cluster=generic('name',oshostname(),'np',3);
51+md=solve(md,'Transient');
52+
53+%Fields and tolerances to track changes
54+field_names ={'Bed1','Surface1','Thickness1','Floatingice1','Vx1','Vy1','Pressure1','FloatingiceMeltingrate1',...
55+ 'Bed2','Surface2','Thickness2','Floatingice2','Vx2','Vy2','Pressure2','FloatingiceMeltingrate2',...
56+ 'Bed3','Surface3','Thickness3','Floatingice3','Vx3','Vy3','Pressure3','FloatingiceMeltingrate3'};
57+field_tolerances={2e-11,5e-12,2e-11,1e-11,5e-10,1e-08,1e-13,1e-13,...
58+ 3e-11,3e-11,9e-10,7e-11,1e-09,5e-08,1e-10,1e-13,...
59+ 1e-10,3e-11,1e-10,7e-11,1e-09,5e-08,1e-10,1e-13};
60+field_values={...
61+ (md.results.TransientSolution(1).Base),...
62+ (md.results.TransientSolution(1).Surface),...
63+ (md.results.TransientSolution(1).Thickness),...
64+ (md.results.TransientSolution(1).MaskGroundediceLevelset),...
65+ (md.results.TransientSolution(1).Vx),...
66+ (md.results.TransientSolution(1).Vy),...
67+ (md.results.TransientSolution(1).Pressure),...
68+ (md.results.TransientSolution(1).BasalforcingsFloatingiceMeltingRate),...
69+ (md.results.TransientSolution(2).Base),...
70+ (md.results.TransientSolution(2).Surface),...
71+ (md.results.TransientSolution(2).Thickness),...
72+ (md.results.TransientSolution(2).MaskGroundediceLevelset),...
73+ (md.results.TransientSolution(2).Vx),...
74+ (md.results.TransientSolution(2).Vy),...
75+ (md.results.TransientSolution(2).Pressure),...
76+ (md.results.TransientSolution(2).BasalforcingsFloatingiceMeltingRate),...
77+ (md.results.TransientSolution(3).Base),...
78+ (md.results.TransientSolution(3).Surface),...
79+ (md.results.TransientSolution(3).Thickness),...
80+ (md.results.TransientSolution(3).MaskGroundediceLevelset),...
81+ (md.results.TransientSolution(3).Vx),...
82+ (md.results.TransientSolution(3).Vy),...
83+ (md.results.TransientSolution(3).Pressure),...
84+ (md.results.TransientSolution(3).BasalforcingsFloatingiceMeltingRate),...
85+ };
86Index: ../trunk-jpl/test/NightlyRun/test442.m
87===================================================================
88--- ../trunk-jpl/test/NightlyRun/test442.m (nonexistent)
89+++ ../trunk-jpl/test/NightlyRun/test442.m (revision 21790)
90@@ -0,0 +1,84 @@
91+%Test Name: MISMIP3DHO
92+md=triangle(model(),'../Exp/Square.exp',100000.);
93+md=setmask(md,'../Exp/SquareShelf.exp','');
94+md=parameterize(md,'../Par/SquareSheetShelf.par');
95+md.initialization.vx(:)=1.;
96+md.initialization.vy(:)=1.;
97+md.geometry.thickness(:)=500-md.mesh.x/10000;
98+md.geometry.bed =-100-md.mesh.x/1000;
99+md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water;
100+md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bed;
101+pos=find(md.mask.groundedice_levelset>=0);
102+md.geometry.base(pos)=md.geometry.bed(pos);
103+md.geometry.surface=md.geometry.base+md.geometry.thickness;
104+md=extrude(md,4,1.);
105+md=setflowequation(md,'HO','all');
106+
107+%Boundary conditions:
108+md.mask.ice_levelset=-ones(md.mesh.numberofvertices,1);
109+md.mask.ice_levelset(find(md.mesh.x==max(md.mesh.x)))=0;
110+md.stressbalance.spcvx(:)=NaN;
111+md.stressbalance.spcvy(:)=NaN;
112+md.stressbalance.spcvz(:)=NaN;
113+pos=find((md.mesh.y<1000000.1 & md.mesh.y>999999.9) | (md.mesh.y<0.1 & md.mesh.y>-0.1));
114+md.stressbalance.spcvy(pos)=0;
115+pos2=find(md.mesh.x<0.1 & md.mesh.x>-0.1);
116+md.stressbalance.spcvx(pos2)=0;
117+md.stressbalance.spcvy(pos2)=0;
118+
119+md.materials.rheology_B=1/((10^-25)^(1/3))*ones(md.mesh.numberofvertices,1);
120+md.materials.rheology_law='None';
121+md.friction.coefficient(:)=sqrt(10^7)*ones(md.mesh.numberofvertices,1);
122+md.friction.p=3*ones(md.mesh.numberofelements,1);
123+md.smb.mass_balance(:)=1;
124+md.basalforcings.groundedice_melting_rate(:)=0;
125+md.basalforcings.floatingice_melting_rate(:)=30;
126+md.transient.isthermal=0;
127+md.transient.isstressbalance=1;
128+md.transient.isgroundingline=1;
129+md.transient.ismasstransport=1;
130+md.transient.issmb=1;
131+md.transient.requested_outputs={'default','BasalforcingsFloatingiceMeltingRate'};
132+md.groundingline.migration='SubelementMigration2';
133+md.timestepping.final_time=30;
134+md.timestepping.time_step=10;
135+
136+md.cluster=generic('name',oshostname(),'np',3);
137+md=solve(md,'Transient');
138+
139+%Fields and tolerances to track changes
140+field_names ={'Bed1','Surface1','Thickness1','Floatingice1','Vx1','Vy1','Vz1','Pressure1','FloatingiceMeltingrate1',...
141+ 'Bed2','Surface2','Thickness2','Floatingice2','Vx2','Vy2','Vz2','Pressure2','FloatingiceMeltingrate2',...
142+ 'Bed3','Surface3','Thickness3','Floatingice3','Vx3','Vy3','Vz3','Pressure3','FloatingiceMeltingrate3',};
143+field_tolerances={2e-11,5e-12,2e-11,1e-11,5e-10,1e-08,6e-10,1e-13,1e-13,...
144+ 3e-11,3e-11,9e-10,7e-11,1e-09,5e-08,1e-09,1e-10,1e-13,...
145+ 1e-10,3e-11,1e-10,7e-11,1e-09,5e-08,1e-09,1e-10,1e-13};
146+field_values={...
147+ (md.results.TransientSolution(1).Base),...
148+ (md.results.TransientSolution(1).Surface),...
149+ (md.results.TransientSolution(1).Thickness),...
150+ (md.results.TransientSolution(1).MaskGroundediceLevelset),...
151+ (md.results.TransientSolution(1).Vx),...
152+ (md.results.TransientSolution(1).Vy),...
153+ (md.results.TransientSolution(1).Vz),...
154+ (md.results.TransientSolution(1).Pressure),...
155+ (md.results.TransientSolution(1).BasalforcingsFloatingiceMeltingRate),...
156+ (md.results.TransientSolution(2).Base),...
157+ (md.results.TransientSolution(2).Surface),...
158+ (md.results.TransientSolution(2).Thickness),...
159+ (md.results.TransientSolution(2).MaskGroundediceLevelset),...
160+ (md.results.TransientSolution(2).Vx),...
161+ (md.results.TransientSolution(2).Vy),...
162+ (md.results.TransientSolution(2).Vz),...
163+ (md.results.TransientSolution(2).Pressure),...
164+ (md.results.TransientSolution(2).BasalforcingsFloatingiceMeltingRate),...
165+ (md.results.TransientSolution(3).Base),...
166+ (md.results.TransientSolution(3).Surface),...
167+ (md.results.TransientSolution(3).Thickness),...
168+ (md.results.TransientSolution(3).MaskGroundediceLevelset),...
169+ (md.results.TransientSolution(3).Vx),...
170+ (md.results.TransientSolution(3).Vy),...
171+ (md.results.TransientSolution(3).Vz),...
172+ (md.results.TransientSolution(3).Pressure),...
173+ (md.results.TransientSolution(3).BasalforcingsFloatingiceMeltingRate),...
174+ };
175Index: ../trunk-jpl/test/Archives/Archive442.arch
176===================================================================
177Cannot display: file marked as a binary type.
178svn:mime-type = application/octet-stream
179Index: ../trunk-jpl/test/Archives/Archive442.arch
180===================================================================
181--- ../trunk-jpl/test/Archives/Archive442.arch (nonexistent)
182+++ ../trunk-jpl/test/Archives/Archive442.arch (revision 21790)
183
184Property changes on: ../trunk-jpl/test/Archives/Archive442.arch
185___________________________________________________________________
186Added: svn:mime-type
187## -0,0 +1 ##
188+application/octet-stream
189\ No newline at end of property
190Index: ../trunk-jpl/test/Archives/Archive441.arch
191===================================================================
192Cannot display: file marked as a binary type.
193svn:mime-type = application/octet-stream
194Index: ../trunk-jpl/test/Archives/Archive441.arch
195===================================================================
196--- ../trunk-jpl/test/Archives/Archive441.arch (nonexistent)
197+++ ../trunk-jpl/test/Archives/Archive441.arch (revision 21790)
198
199Property changes on: ../trunk-jpl/test/Archives/Archive441.arch
200___________________________________________________________________
201Added: svn:mime-type
202## -0,0 +1 ##
203+application/octet-stream
204\ No newline at end of property
Note: See TracBrowser for help on using the repository browser.