Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
W
waLBerla
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Christoph Alt
waLBerla
Commits
3273c128
Commit
3273c128
authored
4 years ago
by
Dominik Thoennes
Browse files
Options
Downloads
Plain Diff
Merge branch 'Add_ifs' into 'master'
Added ifs in CMake See merge request
walberla/walberla!389
parents
129c4776
9d781038
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
apps/benchmarks/CMakeLists.txt
+16
-7
16 additions, 7 deletions
apps/benchmarks/CMakeLists.txt
apps/benchmarks/UniformGridGPU/CMakeLists.txt
+1
-0
1 addition, 0 deletions
apps/benchmarks/UniformGridGPU/CMakeLists.txt
apps/showcases/CMakeLists.txt
+1
-1
1 addition, 1 deletion
apps/showcases/CMakeLists.txt
with
18 additions
and
8 deletions
apps/benchmarks/CMakeLists.txt
+
16
−
7
View file @
3273c128
add_subdirectory
(
AdaptiveMeshRefinementFluidParticleCoupling
)
add_subdirectory
(
ComplexGeometry
)
add_subdirectory
(
DEM
)
add_subdirectory
(
FieldCommunication
)
add_subdirectory
(
MeshDistance
)
add_subdirectory
(
CouetteFlow
)
add_subdirectory
(
FluidParticleCoupling
)
...
...
@@ -15,10 +14,20 @@ add_subdirectory( PoiseuilleChannel )
add_subdirectory
(
ProbeVsExtraMessage
)
add_subdirectory
(
SchaeferTurek
)
add_subdirectory
(
UniformGrid
)
if
(
WALBERLA_BUILD_WITH_CODEGEN AND WALBERLA_BUILD_WITH_PYTHON
)
add_subdirectory
(
UniformGridGenerated
)
add_subdirectory
(
PhaseFieldAllenCahn
)
endif
()
if
(
WALBERLA_BUILD_WITH_CODEGEN AND WALBERLA_BUILD_WITH_CUDA
)
add_subdirectory
(
UniformGridGPU
)
if
(
WALBERLA_BUILD_WITH_PYTHON
)
add_subdirectory
(
FieldCommunication
)
if
(
WALBERLA_BUILD_WITH_CODEGEN
)
add_subdirectory
(
UniformGridGenerated
)
add_subdirectory
(
PhaseFieldAllenCahn
)
endif
()
if
(
WALBERLA_BUILD_WITH_CODEGEN AND WALBERLA_BUILD_WITH_CUDA
)
add_subdirectory
(
UniformGridGPU
)
endif
()
endif
()
This diff is collapsed.
Click to expand it.
apps/benchmarks/UniformGridGPU/CMakeLists.txt
+
1
−
0
View file @
3273c128
waLBerla_link_files_to_builddir
(
"*.prm"
)
waLBerla_link_files_to_builddir
(
"*.py"
)
waLBerla_link_files_to_builddir
(
"simulation_setup"
)
...
...
This diff is collapsed.
Click to expand it.
apps/showcases/CMakeLists.txt
+
1
−
1
View file @
3273c128
...
...
@@ -3,6 +3,6 @@ add_subdirectory( CombinedResolvedUnresolved )
add_subdirectory
(
HeatConduction
)
add_subdirectory
(
Mixer
)
add_subdirectory
(
PegIntoSphereBed
)
if
(
WALBERLA_BUILD_WITH_CODEGEN
)
if
(
WALBERLA_BUILD_WITH_CODEGEN
AND WALBERLA_BUILD_WITH_PYTHON
)
add_subdirectory
(
PhaseFieldAllenCahn
)
endif
()
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment