Skip to content

Commit 63a197e

Browse files
economoneconomon
committed
Merge branch 'develop'
2 parents e5ba788 + 03244b7 commit 63a197e

File tree

75 files changed

+86481
-58670
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+86481
-58670
lines changed

README renamed to README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-----------------------------------------------------------
2-
SU2 (ver. 3.2.9 "eagle"): The Open-Source CFD Code
2+
SU2 (ver. 4.0.0 "Cardinal"): The Open-Source CFD Code
33
-----------------------------------------------------------
44

55
Computational analysis tools have revolutionized the way we design aerospace systems, but most established codes are proprietary, unavailable, or prohibitively expensive for many users. The SU2 team is changing this, making computational analysis and design freely available as open-source software and involving everyone in its creation and development.

‎TestCase.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
## \file TestCase.py
44
# \brief Python class for automated regression testing of SU2 examples
5-
# \author A. Aranake, A. Campos, T. Economon, T. Lukaczyk
6-
# \version 3.2.9 "eagle"
5+
# \author A. Aranake, A. Campos, T. Economon, T. Lukaczyk, S. Padron
6+
# \version 4.0.0 "Cardinal"
77
#
8-
# SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
8+
# SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
99
# Dr. Thomas D. Economon ([email protected]).
1010
#
1111
# SU2 Developers: Prof. Juan J. Alonso's group at Stanford University.
@@ -29,15 +29,13 @@
2929
# You should have received a copy of the GNU Lesser General Public
3030
# License along with SU2. If not, see <http://www.gnu.org/licenses/>.
3131

32-
import sys,time, os, subprocess, datetime, signal, os.path
33-
32+
import time, os, subprocess, datetime
3433

3534
class TestCase:
3635

3736
def __init__(self,tag_in):
3837

39-
datestamp = time.strftime("%Y%m%d", time.gmtime())
40-
self.tag = "%s_%s"%(tag_in,datestamp) # Input, string tag that identifies this run
38+
self.tag = tag_in # Input, string tag that identifies this run
4139

4240
# Configuration file path/filename
4341
self.cfg_dir = "."
@@ -48,14 +46,13 @@ def __init__(self,tag_in):
4846
self.test_vals = []
4947

5048
# These can be optionally varied
51-
# self.su2_dir = "."
5249
self.su2_exec = "SU2_CFD"
5350
self.timeout = 300
5451
self.tol = 0.001
55-
self.outputdir = "."
5652

5753
def run_test(self):
5854

55+
print '==================== Start Test: %s ===================='%self.tag
5956
passed = True
6057
exceed_tol = False
6158
timed_out = False
@@ -80,8 +77,8 @@ def run_test(self):
8077
while process.poll() is None:
8178
time.sleep(0.1)
8279
now = datetime.datetime.now()
83-
84-
if (now - start).seconds> self.timeout:
80+
running_time = (now - start).seconds
81+
if running_time > self.timeout:
8582
try:
8683
process.kill()
8784
os.system('killall %s' % self.su2_exec) # In case of parallel execution
@@ -133,8 +130,6 @@ def run_test(self):
133130
if iter_missing:
134131
passed = False
135132

136-
print '=========================================================\n'
137-
138133
# Write the test results
139134
#for j in output:
140135
# print j
@@ -143,6 +138,8 @@ def run_test(self):
143138
print "%s: PASSED"%self.tag
144139
else:
145140
print "%s: FAILED"%self.tag
141+
print 'Output for the failed case'
142+
subprocess.call(['cat', logfilename])
146143

147144
print 'execution command: %s'%command
148145

@@ -173,8 +170,11 @@ def run_test(self):
173170
print 'delta_vals: ',
174171
for j in delta_vals:
175172
print '%f,'%j,
176-
print '\n'
177-
173+
print '\n',
174+
175+
print 'test duration: %.2f min'%(running_time/60.0)
176+
print '==================== End Test: %s ====================\n'%self.tag
177+
178178
os.chdir(workdir)
179179
return passed
180180

@@ -190,7 +190,7 @@ def adjust_iter(self):
190190
# Rewrite the file with a .autotest extension
191191
self.cfg_file = "%s.autotest"%self.cfg_file
192192
file_out = open(self.cfg_file,'w')
193-
file_out.write('%% This file automatically generated by cruise control\n')
193+
file_out.write('%% This file automatically generated by the regression script\n')
194194
file_out.write('%% Number of iterations changed to %d\n'%(self.test_iter+1))
195195
for line in lines:
196196
if not line.startswith("EXT_ITER"):

‎actuator_disk/ActDisk_Euler.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
% Author: Francisco Palacios %
66
% Institution: Stanford University %
77
% Date: 2014.06.01 %
8-
% File Version 3.2.9 "eagle" %
8+
% File Version 4.0.0 "Cardinal" %
99
% %
1010
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
1111

‎cont_adj_euler/naca0012/inv_NACA0012.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
% Author: Thomas D. Economon %
66
% Institution: Stanford University %
77
% Date: 2011.11.02 %
8-
% File Version 3.2.9 "eagle" %
8+
% File Version 4.0.0 "Cardinal" %
99
% %
1010
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
1111

‎cont_adj_euler/oneram6/inv_ONERAM6.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
% SU2 configuration file %
44
% Case description: Adjoint inv. ONERA M6 wing in inviscid flow (regression) %
55
% Author: Francisco Palacios %
6-
% Institution: Stanford University %
6+
% Institution: Stanford University %
77
% Date: 06.16.2014 %
8-
% File Version 3.2.9 "eagle" %
8+
% File Version 4.0.0 "Cardinal" %
99
% %
1010
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
1111

‎cont_adj_incomp_euler/naca0012/incomp_NACA0012.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
% Author: Francisco Palacios %
66
% Institution: Stanford University %
77
% Date: 2013.04.09 %
8-
% File Version 3.2.9 "eagle" %
8+
% File Version 4.0.0 "Cardinal" %
99
% %
1010
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
1111

‎cont_adj_incomp_navierstokes/cylinder/lam_incomp_cylinder.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
% %
33
% SU2 configuration file %
44
% Case description: Adjoint incompressible laminar flow around a cylinder %
5-
% Author: Francisco Palacios %
5+
% Author: Francisco Palacios %
66
% Institution: Stanford University %
77
% Date: 2012.03.14 %
8-
% File Version 3.2.9 "eagle" %
8+
% File Version 4.0.0 "Cardinal" %
99
% %
1010
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
1111

‎cont_adj_navierstokes/cylinder/lam_cylinder.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
% Author: Thomas D. Economon %
66
% Institution: Stanford University %
77
% Date: 2013.03.01 %
8-
% File Version 3.2.9 "eagle" %
8+
% File Version 4.0.0 "Cardinal" %
99
% %
1010
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
1111

‎cont_adj_navierstokes/naca0012_sub/lam_NACA0012.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
% Author: Francisco Palacios %
66
% Institution: Stanford University %
77
% Date: Jul 18th, 2014 %
8-
% File Version 3.2.9 "eagle" %
8+
% File Version 4.0.0 "Cardinal" %
99
% %
1010
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
1111

‎cont_adj_navierstokes/naca0012_trans/lam_NACA0012.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
% Author: Francisco Palacios %
66
% Institution: Stanford University %
77
% Date: Jul 18th, 2014 %
8-
% File Version 3.2.9 "eagle" %
8+
% File Version 4.0.0 "Cardinal" %
99
% %
1010
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
1111

0 commit comments

Comments
 (0)