source: issm/oecreview/Archive/14312-15392/ISSM-14739-14740.diff@ 15393

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

NEW: adding Archive/14312-15392 for oecreview
File size: 5.0 KB
RevLine 
[15393]1Index: ../trunk-jpl/test/NightlyRun/test330.m
2===================================================================
3--- ../trunk-jpl/test/NightlyRun/test330.m (revision 14739)
4+++ ../trunk-jpl/test/NightlyRun/test330.m (revision 14740)
5@@ -1,13 +0,0 @@
6-%GIA test, inspired on test101
7-md=triangle(model(),'../Exp/Square.exp',50000.);
8-md=setmask(md,'','');
9-md=parameterize(md,'../Par/SquareSheetConstrained.par');
10-md=setflowequation(md,'macayeal','all');
11-md.cluster=generic('name',oshostname(),'np',8);
12-md.verbose=verbose('1111111');
13-md=solve(md,GiaSolutionEnum());
14-
15-%Fields and tolerances to track changes
16-field_names ={'GiaW'};
17-field_tolerances={1e-13};
18-field_values ={(md.results.GiaSolution.GiaW)};
19Index: ../trunk-jpl/test/NightlyRun/test330.py
20===================================================================
21--- ../trunk-jpl/test/NightlyRun/test330.py (revision 14739)
22+++ ../trunk-jpl/test/NightlyRun/test330.py (revision 14740)
23@@ -1,22 +0,0 @@
24-import numpy
25-import copy
26-from model import *
27-from triangle import *
28-from setmask import *
29-from parameterize import *
30-from setflowequation import *
31-from EnumDefinitions import *
32-from solve import *
33-from MatlabFuncs import *
34-
35-md=triangle(model(),'../Exp/Square.exp',50000.)
36-md=setmask(md,'','')
37-md=parameterize(md,'../Par/SquareSheetConstrained.py')
38-md=setflowequation(md,'macayeal','all')
39-md.cluster=generic('name',oshostname(),'np',3)
40-md=solve(md,GiaSolutionEnum())
41-
42-#Fields and tolerances to track changes
43-field_names =['GiaW']
44-field_tolerances=[1e-13]
45-field_values =[md.results.GiaSolution.GiaW]
46Index: ../trunk-jpl/test/NightlyRun/test2001.py
47===================================================================
48--- ../trunk-jpl/test/NightlyRun/test2001.py (revision 0)
49+++ ../trunk-jpl/test/NightlyRun/test2001.py (revision 14740)
50@@ -0,0 +1,22 @@
51+import numpy
52+import copy
53+from model import *
54+from triangle import *
55+from setmask import *
56+from parameterize import *
57+from setflowequation import *
58+from EnumDefinitions import *
59+from solve import *
60+from MatlabFuncs import *
61+
62+md=triangle(model(),'../Exp/Square.exp',50000.)
63+md=setmask(md,'','')
64+md=parameterize(md,'../Par/SquareSheetConstrained.py')
65+md=setflowequation(md,'macayeal','all')
66+md.cluster=generic('name',oshostname(),'np',3)
67+md=solve(md,GiaSolutionEnum())
68+
69+#Fields and tolerances to track changes
70+field_names =['GiaW']
71+field_tolerances=[1e-13]
72+field_values =[md.results.GiaSolution.GiaW]
73Index: ../trunk-jpl/test/NightlyRun/test2001.m
74===================================================================
75--- ../trunk-jpl/test/NightlyRun/test2001.m (revision 0)
76+++ ../trunk-jpl/test/NightlyRun/test2001.m (revision 14740)
77@@ -0,0 +1,13 @@
78+%GIA test, inspired on test101
79+md=triangle(model(),'../Exp/Square.exp',50000.);
80+md=setmask(md,'','');
81+md=parameterize(md,'../Par/SquareSheetConstrained.par');
82+md=setflowequation(md,'macayeal','all');
83+md.cluster=generic('name',oshostname(),'np',8);
84+md.verbose=verbose('1111111');
85+md=solve(md,GiaSolutionEnum());
86+
87+%Fields and tolerances to track changes
88+field_names ={'GiaW'};
89+field_tolerances={1e-13};
90+field_values ={(md.results.GiaSolution.GiaW)};
91Index: ../trunk-jpl/test/NightlyRun/IdToName.m
92===================================================================
93--- ../trunk-jpl/test/NightlyRun/IdToName.m (revision 14739)
94+++ ../trunk-jpl/test/NightlyRun/IdToName.m (revision 14740)
95@@ -96,7 +96,6 @@
96 case 327, name='SquareSheetConstrainedTransP3dEnth';
97 case 328, name='SquareSheetConstrainedSmbGradients2d';
98 case 329, name='SquareSheetConstrainedSmbGradients3d';
99- case 330, name='SquareSheetConstrainedGia2d';
100 case 331, name='SquareSheetConstrainedHydrologyShreve';
101 case 332, name='SquareSheetConstrainedHydrologyDC';
102 case 401, name='SquareSheetShelfDiagM2d';
103@@ -189,6 +188,7 @@
104 case 1502, name='SquareShelfTranSawTooth3d';
105 case 1601, name='SquareShelfM2dRotation';
106 case 1602, name='SquareSheetShelfP3dRotation';
107+ case 2001, name='SquareSheetConstrainedGia2d';
108 case 3001, name='SquareShelfConstrainedDiagM2dAdolc';
109 case 3002, name='SquareShelfConstrainedDiagM3dAdolc';
110 case 3003, name='SquareShelfConstrainedDiagP3dAdolc';
111Index: ../trunk-jpl/test/NightlyRun/IdToName.py
112===================================================================
113--- ../trunk-jpl/test/NightlyRun/IdToName.py (revision 14739)
114+++ ../trunk-jpl/test/NightlyRun/IdToName.py (revision 14740)
115@@ -97,7 +97,6 @@
116 327 : 'SquareSheetConstrainedTransP3dEnth',
117 328 : 'SquareSheetConstrainedSmbGradients2d',
118 329 : 'SquareSheetConstrainedSmbGradients3d',
119- 330 : 'SquareSheetConstrainedGia2d',
120 331 : 'SquareSheetConstrainedHydrology',
121 333 : 'SquareSheetConstrainedTranCflM3d',
122 401 : 'SquareSheetShelfDiagM2d',
123@@ -190,6 +189,7 @@
124 1502 : 'SquareShelfTranSawTooth3d',
125 1601 : 'SquareShelfM2dRotation',
126 1602 : 'SquareSheetShelfP3dRotation',
127+ 2001 : 'SquareSheetConstrainedGia2d',
128 3001 : 'SquareShelfConstrainedDiagM2dAdolc',
129 3002 : 'SquareShelfConstrainedDiagM3dAdolc',
130 3003 : 'SquareShelfConstrainedDiagP3dAdolc',
Note: See TracBrowser for help on using the repository browser.