source: issm/oecreview/Archive/15392-16133/ISSM-15925-15926.diff@ 16134

Last change on this file since 16134 was 16134, checked in by Mathieu Morlighem, 12 years ago

Added Archive/15392-16133
File size: 3.8 KB
RevLine 
[16134]1Index: ../trunk-jpl/test/NightlyRun/test280.py
2===================================================================
3--- ../trunk-jpl/test/NightlyRun/test280.py (revision 15925)
4+++ ../trunk-jpl/test/NightlyRun/test280.py (revision 15926)
5@@ -12,16 +12,19 @@
6 md=setmask(md,'all','')
7 md=parameterize(md,'../Par/SquareShelf.py')
8 md=setflowequation(md,'SSA','all')
9-md.flowequation.fe_SSA='P2'
10 md.cluster=generic('name',oshostname(),'np',3)
11-md=solve(md,StressbalanceSolutionEnum())
12
13-#Fields and tolerances to track changes
14-field_names =['Vx','Vy','Vel','Pressure']
15-field_tolerances=[1e-12,1e-13,1e-13,1e-13]
16-field_values=[\
17- md.results.StressbalanceSolution.Vx,\
18- md.results.StressbalanceSolution.Vy,\
19- md.results.StressbalanceSolution.Vel,\
20- md.results.StressbalanceSolution.Pressure,\
21- ]
22+field_names=[]
23+field_tolerances=[]
24+field_values=[]
25+for i in ['P1bubble','P1bubblecondensed','P2']:
26+ md.flowequation.fe_SSA=i
27+ md=solve(md,StressbalanceSolutionEnum())
28+ field_names =field_names+['Vx'+i,'Vy'+i,'Vel'+i,'Pressure'+i]
29+ field_tolerances=field_tolerances+[1e-12,1e-13,1e-13,1e-13]
30+ field_values=field_values+[\
31+ md.results.StressbalanceSolution.Vx,\
32+ md.results.StressbalanceSolution.Vy,\
33+ md.results.StressbalanceSolution.Vel,\
34+ md.results.StressbalanceSolution.Pressure,\
35+ ]
36Index: ../trunk-jpl/test/NightlyRun/IdToName.m
37===================================================================
38--- ../trunk-jpl/test/NightlyRun/IdToName.m (revision 15925)
39+++ ../trunk-jpl/test/NightlyRun/IdToName.m (revision 15926)
40@@ -67,7 +67,7 @@
41 case 270, name='SquareShelfStressSSA2dDamage';
42 case 272, name='SquareShelfCMZSSA2dDamage';
43 case 274, name='SquareShelfStressSSA2dDamageRift';
44- case 280, name='SquareShelfStressSSA2dP2';
45+ case 280, name='SquareShelfStressSSA2dHigherOrder';
46 case 285, name='SquareShelfStressHOP1xP2';
47 case 286, name='SquareShelfStressHOP2xP1';
48 case 287, name='SquareShelfStressHOP2xP2';
49Index: ../trunk-jpl/test/NightlyRun/test280.m
50===================================================================
51--- ../trunk-jpl/test/NightlyRun/test280.m (revision 15925)
52+++ ../trunk-jpl/test/NightlyRun/test280.m (revision 15926)
53@@ -2,16 +2,21 @@
54 md=setmask(md,'all','');
55 md=parameterize(md,'../Par/SquareShelf.par');
56 md=setflowequation(md,'SSA','all');
57-md.flowequation.fe_SSA='P2';
58 md.cluster=generic('name',oshostname(),'np',3);
59-md=solve(md,StressbalanceSolutionEnum());
60
61-%Fields and tolerances to track changes
62-field_names ={'Vx','Vy','Vel','Pressure'};
63-field_tolerances={1e-12,1e-13,1e-13,1e-13};
64-field_values={...
65- (md.results.StressbalanceSolution.Vx),...
66- (md.results.StressbalanceSolution.Vy),...
67- (md.results.StressbalanceSolution.Vel),...
68- (md.results.StressbalanceSolution.Pressure),...
69- };
70+field_names={};
71+field_tolerances={};
72+field_values={};
73+for i={'P1bubble','P1bubblecondensed','P2'}
74+ md.flowequation.fe_SSA=i{1};
75+ md=solve(md,StressbalanceSolutionEnum());
76+ field_names ={field_names{:},['Vx' i{1}],['Vy' i{1}],['Vel' i{1}],['Pressure' i{1}]};
77+ field_tolerances={field_tolerances{:},1e-12,1e-13,1e-13,1e-13};
78+ field_values={field_values{:},...
79+ (md.results.StressbalanceSolution.Vx),...
80+ (md.results.StressbalanceSolution.Vy),...
81+ (md.results.StressbalanceSolution.Vel),...
82+ (md.results.StressbalanceSolution.Pressure),...
83+ };
84+end
85+
86Index: ../trunk-jpl/test/NightlyRun/IdToName.py
87===================================================================
88--- ../trunk-jpl/test/NightlyRun/IdToName.py (revision 15925)
89+++ ../trunk-jpl/test/NightlyRun/IdToName.py (revision 15926)
90@@ -71,7 +71,7 @@
91 270 : 'SquareShelfStressSSA2dDamage',
92 272 : 'SquareShelfCMZSSA2dDamage',
93 274 : 'SquareShelfStressSSA2dDamageRift',
94- 280 : 'SquareShelfStressSSA2dP2',
95+ 280 : 'SquareShelfStressSSA2dHigherOrder',
96 285 : 'SquareShelfStressHOP1xP2',
97 286 : 'SquareShelfStressHOP2xP1',
98 287 : 'SquareShelfStressHOP2xP2',
Note: See TracBrowser for help on using the repository browser.