Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Common/src/geometry/meshreader/CSU2ASCIIMeshReaderFVM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,7 @@ void CSU2ASCIIMeshReaderFVM::SplitActuatorDiskSurface() {
}

sort(ActDiskPoint_Front.begin(), ActDiskPoint_Front.end());
auto it = unique(ActDiskPoint_Front.begin(), ActDiskPoint_Front.end());
ActDiskPoint_Front.resize(it - ActDiskPoint_Front.begin());
/* unique call removed to preserve frequency information for perimeter detection */

/*--- Check the begning of the list ---*/

Expand All @@ -268,13 +267,14 @@ void CSU2ASCIIMeshReaderFVM::SplitActuatorDiskSurface() {
bool Check_1 = !((ActDiskPoint_Front[iPoint] == ActDiskPoint_Front[iPoint - 1]));
bool Check_2 = !((ActDiskPoint_Front[iPoint] == ActDiskPoint_Front[iPoint + 1]));
if ((Check_1 && Check_2)) {
PerimeterPoint.push_back(ActDiskPoint_Front[iEdge]);
PerimeterPoint.push_back(ActDiskPoint_Front[iPoint]);
}
}

/*--- Check the end of the list ---*/

if (!((EdgeBegin[ActDiskPoint_Front.size() - 1] == EdgeBegin[ActDiskPoint_Front.size() - 2]))) {
if (!((ActDiskPoint_Front[ActDiskPoint_Front.size() - 1] ==
ActDiskPoint_Front[ActDiskPoint_Front.size() - 2]))) {
PerimeterPoint.push_back(ActDiskPoint_Front[ActDiskPoint_Front.size() - 1]);
}

Expand Down
14 changes: 7 additions & 7 deletions TestCases/TestCase.py
Original file line number Diff line number Diff line change
Expand Up @@ -564,8 +564,8 @@ def run_opt(self, with_tsan=False, with_asan=False, with_tapetests=False):
passed = False

# Examine the output
f = open(logfilename,'r')
output = f.readlines()
with open(logfilename,'r') as f:
output = f.readlines()
delta_vals = []
sim_vals = []
if not timed_out:
Expand Down Expand Up @@ -703,8 +703,8 @@ def run_geo(self, with_tsan=False, with_asan=False, with_tapetests=False):

if not with_tsan and not with_asan: # sanitizer findings result in non-zero return code, no need to examine the output
# Examine the output
f = open(logfilename,'r')
output = f.readlines()
with open(logfilename,'r') as f:
output = f.readlines()
data = []
if not timed_out:
start_solver = False
Expand Down Expand Up @@ -838,8 +838,8 @@ def run_def(self, with_tsan=False, with_asan=False, with_tapetests=False):

if not with_tsan and not with_asan: # sanitizer findings result in non-zero return code, no need to examine the output
# Examine the output
f = open(logfilename,'r')
output = f.readlines()
with open(logfilename,'r') as f:
output = f.readlines()
if not timed_out:
start_solver = False
for line in output:
Expand Down Expand Up @@ -1028,7 +1028,7 @@ def is_enabled(self, with_tsan=False, with_asan=False, with_tapetests=False):
if not tapetests_compatible:
print('Ignoring test "%s" because it is not enabled to run a test of the tape.' % self.tag)

return is_enabled_on_arch and tsan_compatible and asan_compatible and tapetests_compatible and tapetests_compatible
return is_enabled_on_arch and tsan_compatible and asan_compatible and tapetests_compatible

def adjust_test_data(self):

Expand Down
3 changes: 3 additions & 0 deletions TestCases/parallel_regression.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,15 @@

import sys
from TestCase import TestCase
from TestCase import parse_args

def main():
'''This program runs SU2 and ensures that the output matches specified values.
This will be used to do checks when code is pushed to github
to make sure nothing is broken. '''

args = parse_args('Parallel Regression Tests')

Check notice

Code scanning / CodeQL

Unused local variable Note

Variable args is not used.

test_list = []

#######################
Expand Down
3 changes: 3 additions & 0 deletions TestCases/parallel_regression_AD.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,15 @@

import sys
from TestCase import TestCase
from TestCase import parse_args

def main():
'''This program runs SU2 and ensures that the output matches specified values.
This will be used to do checks when code is pushed to github
to make sure nothing is broken. '''

args = parse_args('Parallel Regression AD Tests')

Check notice

Code scanning / CodeQL

Unused local variable Note

Variable args is not used.

test_list = []

#####################################
Expand Down