source: issm/oecreview/Archive/24684-25833/ISSM-25300-25301.diff

Last change on this file was 25834, checked in by Mathieu Morlighem, 4 years ago

CHG: added 24684-25833
File size: 5.6 KB
RevLine 
[25834]1Index: ../trunk-jpl/packagers/linux/package-issm-linux-binaries-solid_earth.sh
2===================================================================
3--- ../trunk-jpl/packagers/linux/package-issm-linux-binaries-solid_earth.sh (revision 25300)
4+++ ../trunk-jpl/packagers/linux/package-issm-linux-binaries-solid_earth.sh (revision 25301)
5@@ -96,7 +96,7 @@
6
7 # Check that MATLAB did not exit in error
8 matlabExitCode=`echo $?`
9-matlabExitedInError=`grep -E "Activation cannot proceed|license|Error" matlab.log | wc -l`
10+matlabExitedInError=`grep -E "Error|Standard exception|Traceback|bad interpreter" matlab.log | wc -l`
11
12 if [[ ${matlabExitCode} -ne 0 || ${matlabExitedInError} -ne 0 ]]; then
13 echo "----------MATLAB exited in error!----------"
14Index: ../trunk-jpl/packagers/linux/package-issm-linux-binaries-with_dakota.sh
15===================================================================
16--- ../trunk-jpl/packagers/linux/package-issm-linux-binaries-with_dakota.sh (revision 25300)
17+++ ../trunk-jpl/packagers/linux/package-issm-linux-binaries-with_dakota.sh (revision 25301)
18@@ -106,7 +106,7 @@
19
20 # Check that Python did not exit in error
21 pythonExitCode=`echo $?`
22-pythonExitedInError=`grep -E "Error|Traceback|bad interpreter" python.log | wc -l`
23+pythonExitedInError=`grep -E "Error|Standard exception|Traceback|bad interpreter" python.log | wc -l`
24
25 if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
26 echo "----------Python exited in error!----------"
27Index: ../trunk-jpl/packagers/mac/package-issm-mac-binaries-solid_earth.sh
28===================================================================
29--- ../trunk-jpl/packagers/mac/package-issm-mac-binaries-solid_earth.sh (revision 25300)
30+++ ../trunk-jpl/packagers/mac/package-issm-mac-binaries-solid_earth.sh (revision 25301)
31@@ -126,7 +126,7 @@
32
33 # Check that Python did not exit in error
34 pythonExitCode=`echo $?`
35-pythonExitedInError=`grep -E "Error|Traceback|bad interpreter" python.log | wc -l`
36+pythonExitedInError=`grep -E "Error|Standard exception|Traceback|bad interpreter" python.log | wc -l`
37
38 if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
39 echo "----------Python exited in error!----------"
40Index: ../trunk-jpl/packagers/mac/package-issm-mac-binaries-with_dakota.sh
41===================================================================
42--- ../trunk-jpl/packagers/mac/package-issm-mac-binaries-with_dakota.sh (revision 25300)
43+++ ../trunk-jpl/packagers/mac/package-issm-mac-binaries-with_dakota.sh (revision 25301)
44@@ -100,7 +100,7 @@
45
46 # Check that Python did not exit in error
47 pythonExitCode=`echo $?`
48-pythonExitedInError=`grep -E "Error|Traceback|bad interpreter" python.log | wc -l`
49+pythonExitedInError=`grep -E "Error|Standard exception|Traceback|bad interpreter" python.log | wc -l`
50
51 if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
52 echo "----------Python exited in error!----------"
53Index: ../trunk-jpl/jenkins/jenkins.sh
54===================================================================
55--- ../trunk-jpl/jenkins/jenkins.sh (revision 25300)
56+++ ../trunk-jpl/jenkins/jenkins.sh (revision 25301)
57@@ -574,7 +574,7 @@
58 done
59
60 # Check that Python did not exit in error
61- pythonExitedInError=`grep -E "Error|Traceback|bad interpreter" python_log.log | wc -l`
62+ pythonExitedInError=`grep -E "Error|Standard exception|Traceback|bad interpreter" python_log.log | wc -l`
63
64 if [ $pythonExitedInError -ne 0 ]
65 then
66Index: ../trunk-jpl/test/NightlyRun/runme.py
67===================================================================
68--- ../trunk-jpl/test/NightlyRun/runme.py (revision 25300)
69+++ ../trunk-jpl/test/NightlyRun/runme.py (revision 25301)
70@@ -60,7 +60,9 @@
71 runme(id = [[101, 102], ['Dakota', 'Slr']])
72
73 TODO:
74- - At '#disp test result', make sure precision of output matches
75+ - At '#disp test result', make sure precision of output matches that of
76+ MATLAB.
77+ - Check for failures that do not raise exceptions (for example, 'Standard exception'; see also jenkins/jenkins.sh). These should be counted as failures.
78 """
79 #Get ISSM_DIR variable
80 ISSM_DIR = os.environ['ISSM_DIR']
81@@ -200,6 +202,8 @@
82 print(('ERROR difference: {:7.2g} > {:7.2g} test id: {} test name: {} field: {}'.format(error_diff, tolerance, id, id_string, fieldname)))
83 errorcount += 1
84 erroredtest_list.append(id)
85+ elif :
86+ print('FAILURE')
87 else:
88 print(('SUCCESS difference: {:7.2g} < {:7.2g} test id: {} test name: {} field: {}'.format(error_diff, tolerance, id, id_string, fieldname)))
89
90Index: ../trunk-jpl/src/m/solve/WriteData.py
91===================================================================
92--- ../trunk-jpl/src/m/solve/WriteData.py (revision 25300)
93+++ ../trunk-jpl/src/m/solve/WriteData.py (revision 25301)
94@@ -39,9 +39,15 @@
95 # data = full(data)
96 # end
97
98- # Always make a copy of the the data so that we do not accidently overwrite
99- # any model fields.
100- data = deepcopy(data)
101+ # Make a copy of the the data so that we do not accidently overwrite any
102+ # model fields.
103+ #
104+ # NOTE: This is a temporary fix to get builds green in Jenkins: without it,
105+ # there still exists a bug wherein model fields are being modified
106+ # (see https://ross.ics.uci.edu/jenkins/view/All/job/Debian_Linux-Python/1036).
107+ #
108+ if mattype != 0:
109+ data = deepcopy(data)
110
111 #Scale data if necesarry
112 if options.exist('scale'):
Note: See TracBrowser for help on using the repository browser.