Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Praetorius, Simon
dune-multimesh
Commits
36330f0c
Commit
36330f0c
authored
Nov 28, 2018
by
Praetorius, Simon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
corrected pipline errors
parent
398e8216
Pipeline
#1481
canceled with stage
in 51 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
45 deletions
+44
-45
.gitlab-ci.yml
.gitlab-ci.yml
+1
-1
src/CMakeLists.txt
src/CMakeLists.txt
+43
-44
No files found.
.gitlab-ci.yml
View file @
36330f0c
...
@@ -4,7 +4,7 @@ before_script:
...
@@ -4,7 +4,7 @@ before_script:
-
duneci-install-module https://gitlab.dune-project.org/core/dune-common.git
-
duneci-install-module https://gitlab.dune-project.org/core/dune-common.git
-
duneci-install-module https://gitlab.dune-project.org/core/dune-geometry.git
-
duneci-install-module https://gitlab.dune-project.org/core/dune-geometry.git
-
duneci-install-module https://gitlab.dune-project.org/core/dune-grid.git
-
duneci-install-module https://gitlab.dune-project.org/core/dune-grid.git
-
duneci-install-module https://gitlab.dune-project.org/staging/dune-function.git
-
duneci-install-module https://gitlab.dune-project.org/staging/dune-function
s
.git
-
duneci-install-module https://gitlab.dune-project.org/extensions/dune-alugrid.git
-
duneci-install-module https://gitlab.dune-project.org/extensions/dune-alugrid.git
debian:10 gcc-8-noassert-17
:
debian:10 gcc-8-noassert-17
:
...
...
src/CMakeLists.txt
View file @
36330f0c
add_executable
(
"testiterator"
testiterator.cc
)
target_link_dune_default_libraries
(
"testiterator"
)
if
(
HAVE_ALBERTA
)
add_dune_alberta_flags
(
GRIDDIM 3 WORLDDIM 3
"testiterator"
)
endif
(
HAVE_ALBERTA
)
add_executable
(
"localrefinement"
localrefinement.cc
)
add_executable
(
"localrefinement"
localrefinement.cc
)
target_link_dune_default_libraries
(
"localrefinement"
)
target_link_dune_default_libraries
(
"localrefinement"
)
...
@@ -10,6 +5,21 @@ target_link_dune_default_libraries("localrefinement")
...
@@ -10,6 +5,21 @@ target_link_dune_default_libraries("localrefinement")
add_executable
(
"uggrid"
uggrid.cc
)
add_executable
(
"uggrid"
uggrid.cc
)
target_link_dune_default_libraries
(
"uggrid"
)
target_link_dune_default_libraries
(
"uggrid"
)
add_executable
(
"profiling"
profiling.cc
)
target_link_dune_default_libraries
(
"profiling"
)
add_executable
(
"benchmark"
benchmark.cc
)
target_link_dune_default_libraries
(
"benchmark"
)
add_executable
(
"testiterator"
testiterator.cc
)
target_link_dune_default_libraries
(
"testiterator"
)
if
(
HAVE_ALBERTA
)
add_dune_alberta_flags
(
GRIDDIM 3 WORLDDIM 3
"testiterator"
)
add_dune_alberta_flags
(
GRIDDIM 2 WORLDDIM 2
"benchmark"
)
endif
(
HAVE_ALBERTA
)
if
(
DUNE_HAVE_CXX_VARIANT
)
if
(
DUNE_HAVE_CXX_VARIANT
)
add_executable
(
"multigridview"
multigridview.cc
)
add_executable
(
"multigridview"
multigridview.cc
)
target_link_dune_default_libraries
(
"multigridview"
)
target_link_dune_default_libraries
(
"multigridview"
)
...
@@ -19,49 +29,38 @@ if (DUNE_HAVE_CXX_VARIANT)
...
@@ -19,49 +29,38 @@ if (DUNE_HAVE_CXX_VARIANT)
endif
(
DUNE_HAVE_CXX_VARIANT
)
endif
(
DUNE_HAVE_CXX_VARIANT
)
add_executable
(
"interpolate"
interpolate.cc
)
if
(
dune-functions_FOUND AND dune-alugrid_FOUND AND HAVE_ALBERTA
)
target_link_dune_default_libraries
(
"interpolate"
)
add_executable
(
"interpolate"
interpolate.cc
)
add_executable
(
"taylorhood"
taylorhood.cc
)
target_link_dune_default_libraries
(
"interpolate"
)
target_link_dune_default_libraries
(
"taylorhood"
)
add_dune_alberta_flags
(
GRIDDIM 2 WORLDDIM 2
"interpolate"
)
if
(
HAVE_ALBERTA
)
add_dune_alberta_flags
(
"interpolate"
)
add_dune_alberta_flags
(
"taylorhood"
)
endif
()
add_executable
(
"taylorhood"
taylorhood.cc
)
target_link_dune_default_libraries
(
"taylorhood"
)
add_dune_alberta_flags
(
GRIDDIM 2 WORLDDIM 2
"taylorhood"
)
add_executable
(
"benchmark"
benchmark.cc
)
find_package
(
MTL QUIET PATHS /opt/development/mtl4
)
target_link_dune_default_libraries
(
"benchmark"
)
if
(
MTL_FOUND
)
if
(
HAVE_ALBERTA
)
set
(
CXX_ELEVEN_FEATURE_LIST
"MOVE"
"AUTO"
"RANGEDFOR"
"INITLIST"
"STATICASSERT"
"DEFAULTIMPL"
)
add_dune_alberta_flags
(
GRIDDIM 2 WORLDDIM 2
"benchmark"
)
set
(
MTL_COMPILE_DEFINITIONS
""
)
endif
()
foreach
(
feature
${
CXX_ELEVEN_FEATURE_LIST
}
)
list
(
APPEND MTL_COMPILE_DEFINITIONS
"MTL_WITH_
${
feature
}
"
)
endforeach
()
add_executable
(
"profiling"
profiling.cc
)
if
(
HAVE_UMFPACK OR ENABLE_SUITESPARSE OR SuiteSparse_FOUND
)
target_link_dune_default_libraries
(
"profiling"
)
list
(
APPEND MTL_COMPILE_DEFINITIONS
"MTL_HAS_UMFPACK"
)
endif
()
find_package
(
MTL PATHS /opt/development/mtl4
)
set
(
MTL_TARGETS
""
)
if
(
MTL_FOUND
)
list
(
APPEND MTL_TARGETS
"phasefield"
"phasefield2"
"phasefield3"
"phasefield4"
)
set
(
CXX_ELEVEN_FEATURE_LIST
"MOVE"
"AUTO"
"RANGEDFOR"
"INITLIST"
"STATICASSERT"
"DEFAULTIMPL"
)
set
(
MTL_COMPILE_DEFINITIONS
""
)
foreach
(
feature
${
CXX_ELEVEN_FEATURE_LIST
}
)
list
(
APPEND MTL_COMPILE_DEFINITIONS
"MTL_WITH_
${
feature
}
"
)
endforeach
()
if
(
HAVE_UMFPACK OR ENABLE_SUITESPARSE OR SuiteSparse_FOUND
)
foreach
(
target
${
MTL_TARGETS
}
)
list
(
APPEND MTL_COMPILE_DEFINITIONS
"MTL_HAS_UMFPACK"
)
add_executable
(
${
target
}
${
target
}
.cc
)
endif
()
target_link_dune_default_libraries
(
${
target
}
)
add_dune_alberta_flags
(
GRIDDIM 2 WORLDDIM 2
${
target
}
)
set
(
MTL_TARGETS
""
)
target_include_directories
(
${
target
}
PRIVATE
${
MTL_INCLUDE_DIRS
}
)
list
(
APPEND MTL_TARGETS
"phasefield"
"phasefield2"
"phasefield3"
"phasefield4"
)
target_compile_definitions
(
${
target
}
PRIVATE
${
MTL_COMPILE_DEFINITIONS
}
)
target_compile_options
(
${
target
}
PRIVATE -Wno-deprecated-declarations
)
foreach
(
target
${
MTL_TARGETS
}
)
endforeach
()
add_executable
(
${
target
}
${
target
}
.cc
)
target_link_dune_default_libraries
(
${
target
}
)
if
(
HAVE_ALBERTA
)
add_dune_alberta_flags
(
${
target
}
)
endif
(
HAVE_ALBERTA
)
target_include_directories
(
${
target
}
PRIVATE
${
MTL_INCLUDE_DIRS
}
)
target_compile_definitions
(
${
target
}
PRIVATE
${
MTL_COMPILE_DEFINITIONS
}
)
target_compile_options
(
${
target
}
PRIVATE -Wno-deprecated-declarations
)
endforeach
()
endif
()
endif
()
endif
()
\ No newline at end of file
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