source: issm/oecreview/Archive/17984-18295/ISSM-18090-18091.diff@ 18296

Last change on this file since 18296 was 18296, checked in by Mathieu Morlighem, 11 years ago

Added 17984-18295
File size: 3.8 KB
RevLine 
[18296]1Index: ../trunk-jpl/test/NightlyRun/temp291.m
2===================================================================
3--- ../trunk-jpl/test/NightlyRun/temp291.m (revision 18090)
4+++ ../trunk-jpl/test/NightlyRun/temp291.m (revision 18091)
5@@ -1,8 +0,0 @@
6-md=triangle(model(),'../Exp/Square.exp',150000.);
7-md=setmask(md,'all','');
8-md=parameterize(md,'../Par/SquareShelf.par');
9-md=extrude(md,2,1.);
10-md=setflowequation(md,'FS','all');
11-md.flowequation.fe_FS='OneLayerP4z';
12-md.cluster=generic('name',oshostname(),'np',1);
13-md=solve(md,StressbalanceSolutionEnum());
14Index: ../trunk-jpl/test/NightlyRun/temp291.py
15===================================================================
16--- ../trunk-jpl/test/NightlyRun/temp291.py (revision 18090)
17+++ ../trunk-jpl/test/NightlyRun/temp291.py (revision 18091)
18@@ -1,18 +0,0 @@
19-from model import *
20-from triangle import *
21-from setmask import *
22-from parameterize import *
23-from setflowequation import *
24-from EnumDefinitions import *
25-from solve import *
26-from MatlabFuncs import *
27-from ContourToMesh import *
28-
29-md=triangle(model(),'../Exp/Square.exp',150000.)
30-md=setmask(md,'all','')
31-md=parameterize(md,'../Par/SquareShelf.py')
32-md.extrude(2,1.)
33-md=setflowequation(md,'FS','all')
34-md.flowequation.fe_FS='OneLayerP4z'
35-md.cluster=generic('name',oshostname(),'np',1)
36-md=solve(md,StressbalanceSolutionEnum())
37Index: ../trunk-jpl/test/NightlyRun/test291.py
38===================================================================
39--- ../trunk-jpl/test/NightlyRun/test291.py (revision 0)
40+++ ../trunk-jpl/test/NightlyRun/test291.py (revision 18091)
41@@ -0,0 +1,18 @@
42+from model import *
43+from triangle import *
44+from setmask import *
45+from parameterize import *
46+from setflowequation import *
47+from EnumDefinitions import *
48+from solve import *
49+from MatlabFuncs import *
50+from ContourToMesh import *
51+
52+md=triangle(model(),'../Exp/Square.exp',150000.)
53+md=setmask(md,'all','')
54+md=parameterize(md,'../Par/SquareShelf.py')
55+md.extrude(2,1.)
56+md=setflowequation(md,'FS','all')
57+md.flowequation.fe_FS='OneLayerP4z'
58+md.cluster=generic('name',oshostname(),'np',1)
59+md=solve(md,StressbalanceSolutionEnum())
60Index: ../trunk-jpl/test/NightlyRun/test291.m
61===================================================================
62--- ../trunk-jpl/test/NightlyRun/test291.m (revision 0)
63+++ ../trunk-jpl/test/NightlyRun/test291.m (revision 18091)
64@@ -0,0 +1,8 @@
65+md=triangle(model(),'../Exp/Square.exp',150000.);
66+md=setmask(md,'all','');
67+md=parameterize(md,'../Par/SquareShelf.par');
68+md=extrude(md,2,1.);
69+md=setflowequation(md,'FS','all');
70+md.flowequation.fe_FS='OneLayerP4z';
71+md.cluster=generic('name',oshostname(),'np',1);
72+md=solve(md,StressbalanceSolutionEnum());
73Index: ../trunk-jpl/test/NightlyRun/IdToName.m
74===================================================================
75--- ../trunk-jpl/test/NightlyRun/IdToName.m (revision 18090)
76+++ ../trunk-jpl/test/NightlyRun/IdToName.m (revision 18091)
77@@ -77,6 +77,7 @@
78 case 280, name='SquareShelfStressSSA2dHigherOrder';
79 case 285, name='SquareShelfStressHOHigherOrder';
80 case 290, name='SquareShelfStressFSP2P1';
81+ case 291, name='SquareShelfStressFSP4z';
82 case 301, name='SquareSheetConstrainedStressSSA2d';
83 case 302, name='SquareSheetConstrainedStressSIA2d';
84 case 303, name='SquareSheetConstrainedStressSIASSA2d';
85Index: ../trunk-jpl/test/NightlyRun/IdToName.py
86===================================================================
87--- ../trunk-jpl/test/NightlyRun/IdToName.py (revision 18090)
88+++ ../trunk-jpl/test/NightlyRun/IdToName.py (revision 18091)
89@@ -76,6 +76,7 @@
90 280 : 'SquareShelfStressSSA2dHigherOrder',
91 285 : 'SquareShelfStressHOHigherOrder',
92 290 : 'SquareShelfStressFSP2P1',
93+ 291 : 'SquareShelfStressFSP4z',
94 301 : 'SquareSheetConstrainedStressSSA2d',
95 302 : 'SquareSheetConstrainedStressSIA2d',
96 303 : 'SquareSheetConstrainedStressSIASSA2d',
Note: See TracBrowser for help on using the repository browser.