Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Markus Holzer
waLBerla
Commits
f664fd07
Commit
f664fd07
authored
Apr 20, 2022
by
Christoph Schwarzmeier
Browse files
Merge branch 'fix_intel_memoryusage_test' into 'master'
Increased memory limit in test for intel compiler See merge request
!542
parents
7dd54044
46787755
Changes
2
Hide whitespace changes
Inline
Side-by-side
tests/core/CMakeLists.txt
View file @
f664fd07
...
...
@@ -199,11 +199,8 @@ waLBerla_execute_test( NAME FunctionTraitsTest )
waLBerla_compile_test
(
FILES GridGeneratorTest.cpp
)
waLBerla_execute_test
(
NAME GridGeneratorTest
)
#TODO: find fix for this test with intel OneApi compiler
if
(
NOT WALBERLA_CXX_COMPILER_IS_INTELLLVM
)
waLBerla_compile_test
(
FILES MemoryUsage.cpp
)
waLBerla_execute_test
(
NAME MemoryUsage
)
endif
()
waLBerla_compile_test
(
FILES MemoryUsage.cpp
)
waLBerla_execute_test
(
NAME MemoryUsage
)
waLBerla_compile_test
(
FILES OpenMPWrapperTest.cpp
)
waLBerla_execute_test
(
NAME OpenMPWrapperTest
)
...
...
tests/core/MemoryUsage.cpp
View file @
f664fd07
...
...
@@ -39,7 +39,7 @@ int main( int argc, char** argv )
auto
memSize
=
getResidentMemorySize
();
#ifdef __linux__
WALBERLA_CHECK_GREATER
(
memSize
,
200000
);
WALBERLA_CHECK_LESS
(
memSize
,
2
5
0000
);
WALBERLA_CHECK_LESS
(
memSize
,
2
8
0000
);
#else
WALBERLA_CHECK_EQUAL
(
memSize
,
0
);
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment