Skip to content

Commit fdc56e9

Browse files
committed
wip
1 parent d6ed5ab commit fdc56e9

File tree

9 files changed

+1491
-809
lines changed

9 files changed

+1491
-809
lines changed

Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,8 @@ examples := $(examples.c:examples/ceed/%.c=$(OBJDIR)/%$(EXE_SUFFIX))
338338
examples += $(examples.f:examples/ceed/%.f90=$(OBJDIR)/%$(EXE_SUFFIX))
339339

340340
# deal.II Examples
341-
dealiiexamples := $(OBJDIR)/dealii-bps
341+
dealiiexamples.cc := $(sort $(wildcard examples/deal.II/*.cc))
342+
dealiiexamples := $(dealiiexamples.cc:examples/deal.II/%.cc=$(OBJDIR)/dealii-%)
342343

343344
# MFEM Examples
344345
mfemexamples.cpp := $(sort $(wildcard examples/mfem/*.cpp))
@@ -697,11 +698,12 @@ $(OBJDIR)/%$(EXE_SUFFIX) : examples/ceed/%.f90 | $$(@D)/.DIR
697698

698699
# deal.II
699700
# Note: Invoking deal.II's CMAKE build system here
700-
$(OBJDIR)/dealii-bps : examples/deal.II/*.cc examples/deal.II/*.h $(libceed) | $$(@D)/.DIR
701+
$(OBJDIR)/dealii-% : examples/deal.II/*.cc examples/deal.II/*.h $(libceed) | $$(@D)/.DIR
701702
mkdir -p examples/deal.II/build
702703
cmake -B examples/deal.II/build -S examples/deal.II -DDEAL_II_DIR=$(DEAL_II_DIR) -DCEED_DIR=$(PWD)
703704
+$(call quiet,MAKE) -C examples/deal.II/build
704-
cp examples/deal.II/build/bps $(OBJDIR)/dealii-bps
705+
cp examples/deal.II/build/bps_cpu $(OBJDIR)/dealii-bps_cpu
706+
cp examples/deal.II/build/bps_kokkos $(OBJDIR)/dealii-bps_kokkos
705707

706708
# MFEM
707709
$(OBJDIR)/mfem-% : examples/mfem/%.cpp $(libceed) | $$(@D)/.DIR

examples/deal.II/CMakeLists.txt

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,21 @@ IF(NOT ${deal.II_FOUND})
1111
)
1212
ENDIF()
1313

14-
DEAL_II_INITIALIZE_CACHED_VARIABLES()
15-
PROJECT("bps")
14+
FILE(GLOB SOURCE_FILES "*.cc")
1615

17-
DEAL_II_INITIALIZE_CACHED_VARIABLES()
16+
FOREACH ( source_file ${SOURCE_FILES} )
17+
GET_FILENAME_COMPONENT(file_name ${source_file} NAME)
18+
STRING( REPLACE ".cc" "" exec ${file_name} )
1819

19-
ADD_EXECUTABLE(bps bps.cc)
20-
DEAL_II_SETUP_TARGET(bps)
20+
DEAL_II_INITIALIZE_CACHED_VARIABLES()
21+
PROJECT(${exec})
2122

22-
TARGET_INCLUDE_DIRECTORIES(bps PUBLIC ${CEED_DIR}/include)
23-
TARGET_LINK_LIBRARIES(bps ${CEED_DIR}/lib/libceed.so)
23+
DEAL_II_INITIALIZE_CACHED_VARIABLES()
24+
25+
ADD_EXECUTABLE(${exec} ${source_file})
26+
DEAL_II_SETUP_TARGET(${exec})
27+
28+
TARGET_INCLUDE_DIRECTORIES(${exec} PUBLIC ${CEED_DIR}/include)
29+
TARGET_LINK_LIBRARIES(${exec} ${CEED_DIR}/lib/libceed.so)
30+
31+
ENDFOREACH ( source_file ${SOURCE_FILES} )

examples/deal.II/README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,14 @@ cmake ../ -DDEAL_II_DIR=~/path/to/dealii -DCEED_DIR=~/path/to/libceed
1212
make
1313
```
1414

15-
To run the executable, write:
15+
To run the executables, write:
1616

1717
```
18-
./bps
18+
./bps_cpu
19+
```
20+
21+
```
22+
./bps_kokkos
1923
```
2024

2125
Optional command-line arguments are shown by adding the command-line argument "--help".

0 commit comments

Comments
 (0)