Skip to content

Commit

Permalink
Allow remote cell as argument to get_face_neighbors_of().
Browse files Browse the repository at this point in the history
  • Loading branch information
iljah committed Jun 5, 2020
1 parent a82fec2 commit b5ecae2
Show file tree
Hide file tree
Showing 5 changed files with 437 additions and 4 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ include \
tests/get_cell_datatype/project_makefile \
tests/constructors/project_makefile \
tests/get_neighbors_/project_makefile \
tests/get_face_neighbors/project_makefile \
tests/iterators/project_makefile \
tests/additional_cell_data/project_makefile \
tests/mpi_support/project_makefile \
Expand Down
4 changes: 0 additions & 4 deletions dccrg.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2820,10 +2820,6 @@ template <

std::vector<std::pair<uint64_t, int> > ret_val;

if (this->cell_data.count(cell) == 0) {
return ret_val;
}

if (this->neighbors_.count(cell) == 0) {
std::cerr << __FILE__ << ":" << __LINE__
<< " Internal error." << std::endl;
Expand Down
10 changes: 10 additions & 0 deletions tests/get_face_neighbors/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
all:
@$(MAKE) tests/get_face_neighbors/executables -C ../..

t: test
test:
@$(MAKE) tests/get_face_neighbors/tests -C ../..

c: clean
clean:
@$(MAKE) tests/get_face_neighbors/clean -C ../..
52 changes: 52 additions & 0 deletions tests/get_face_neighbors/project_makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
TESTS_GET_FACE_NEIGHBORS_EXECUTABLES = \
tests/get_face_neighbors/test1.exe

TESTS_GET_FACE_NEIGHBORS_TESTS = \
tests/get_face_neighbors/test1.tst \
tests/get_face_neighbors/test1.tstN

tests/get_face_neighbors/executables: $(TESTS_GET_FACE_NEIGHBORS_EXECUTABLES)

tests/get_face_neighbors/tests: $(TESTS_GET_FACE_NEIGHBORS_TESTS)

tests/get_face_neighbors/clean:
@printf "CLEAN tests/get_face_neighbors\n" && rm -f \
$(TESTS_GET_FACE_NEIGHBORS_EXECUTABLES) \
$(TESTS_GET_FACE_NEIGHBORS_TESTS)


EXECUTABLES += tests/get_face_neighbors/executables
TESTS += tests/get_face_neighbors/tests
CLEAN += tests/get_face_neighbors/clean


TESTS_GET_FACE_NEIGHBORS_COMMON_DEPS = \
$(DCCRG_HEADERS) \
tests/get_face_neighbors/project_makefile \
$(ENVIRONMENT_MAKEFILE) \
Makefile

TESTS_GET_FACE_NEIGHBORS_COMPILE_COMMAND = \
@printf "MPICXX $<\n" && $(MPICXX) $< -o $@ \
$(CPPFLAGS) \
$(CXXFLAGS) \
$(LDFLAGS) \
$(BOOST_CPPFLAGS) \
$(BOOST_LDFLAGS) \
$(BOOST_LIBS) \
$(ZOLTAN_CPPFLAGS) \
$(ZOLTAN_LDFLAGS) \
$(ZOLTAN_LIBS)

tests/get_face_neighbors/test1.exe: \
tests/get_face_neighbors/test1.cpp \
$(TESTS_GET_FACE_NEIGHBORS_COMMON_DEPS)
$(TESTS_GET_FACE_NEIGHBORS_COMPILE_COMMAND)

tests/get_face_neighbors/test1.tst: \
tests/get_face_neighbors/test1.exe
@printf RUN\ $<...\ \ && $(RUN) ./$< && printf "PASS\n" && touch $@

tests/get_face_neighbors/test1.tstN: \
tests/get_face_neighbors/test1.exe
@printf MPIRUN\ $<...\ \ && $(MPIRUN) ./$< && printf "PASS\n" && touch $@
Loading

0 comments on commit b5ecae2

Please sign in to comment.