Skip to content

Fixes to compile with BOUT++ next branch#1

Open
bendudson wants to merge 4 commits into
totork:testingfrom
bendudson:testing-boutnext
Open

Fixes to compile with BOUT++ next branch#1
bendudson wants to merge 4 commits into
totork:testingfrom
bendudson:testing-boutnext

Conversation

@bendudson

Copy link
Copy Markdown

Requires this PR boutproject/BOUT-dev#2988

  • https://github.com/nlohmann/json/ dependency (via Atomic++) so that it compiles with C++17
  • BOUT++ include header locations
  • Adds C language to CMake project. My build required MPI::C.
  • Replace call to SpecificInd::zpm() with SpecificInd::offset() since zpm is not in BOUT++ next.

Some dependencies (PETSc?) need MPI::C, so adding C language to
the project.
BOUT++ `next` branch doesn't have a zpm method, and here an offset in
X and Z is being performed so .offset(x,y,z) is now used.
Upgrading JSON reader to support C++17

https://github.com/nlohmann/json/
Commit 6325839
BOUT++ v5 moves all headers into bout/ directory.

Suppresses upgrade warnings
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant