Skip to content

Header changes needed to compile with next branch in BOUT++. #559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wearysebas wants to merge 1 commit into from
Closed

Header changes needed to compile with next branch in BOUT++. #559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/evolve_density.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <bout/derivs.hxx>
#include <bout/difops.hxx>
#include <bout/initialprofiles.hxx>
#include <bout/solver.hxx>

#include "../include/div_ops.hxx"
#include "../include/evolve_density.hxx"
Expand Down
1 change: 1 addition & 0 deletions src/evolve_energy.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <bout/initialprofiles.hxx>
#include <bout/invert_pardiv.hxx>
#include <bout/output_bout_types.hxx>
#include <bout/solver.hxx>

#include "../include/div_ops.hxx"
#include "../include/evolve_energy.hxx"
Expand Down
1 change: 1 addition & 0 deletions src/evolve_momentum.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <bout/constants.hxx>
#include <bout/fv_ops.hxx>
#include <bout/output_bout_types.hxx>
#include <bout/solver.hxx>

#include "../include/evolve_momentum.hxx"
#include "../include/div_ops.hxx"
Expand Down
1 change: 1 addition & 0 deletions src/evolve_pressure.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <bout/initialprofiles.hxx>
#include <bout/invert_pardiv.hxx>
#include <bout/output_bout_types.hxx>
#include <bout/solver.hxx>

#include "../include/div_ops.hxx"
#include "../include/evolve_pressure.hxx"
Expand Down
2 changes: 2 additions & 0 deletions src/neutral_mixed.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#include <bout/difops.hxx>
#include <bout/fv_ops.hxx>
#include <bout/output_bout_types.hxx>
#include <bout/solver.hxx>
#include <bout/vecops.hxx>

#include "../include/div_ops.hxx"
#include "../include/hermes_build_config.hxx"
Expand Down
1 change: 1 addition & 0 deletions src/relax_potential.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <bout/derivs.hxx>
#include <bout/difops.hxx>
#include <bout/fv_ops.hxx>
#include <bout/solver.hxx>

using bout::globals::mesh;

Expand Down
1 change: 1 addition & 0 deletions src/vorticity.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <bout/derivs.hxx>
#include <bout/difops.hxx>
#include <bout/invert_laplace.hxx>
#include <bout/solver.hxx>

using bout::globals::mesh;

Expand Down
2 changes: 2 additions & 0 deletions tests/mms_operator/main.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#include "bout/field_factory.hxx"
#include "bout/bout.hxx"
#include "bout/options_io.hxx"

// #include "hermes-2.hxx"
#include "../include/div_ops.hxx"
Expand Down
20 changes: 12 additions & 8 deletions tests/unit/fake_mesh.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ public:

// Unused variables
periodicX = false;
NXPE = 1;
PE_XIND = 0;
IncIntShear = false;
maxregionblocksize = MAXREGIONBLOCKSIZE;

Expand Down Expand Up @@ -109,10 +107,14 @@ public:
return nullptr;
}
int wait(comm_handle UNUSED(handle)) override { return 0; }
int getNXPE() override { return 1; }
int getNYPE() override { return 1; }
int getXProcIndex() override { return 1; }
int getYProcIndex() override { return 1; }
int getNXPE() const override { return 1; }
int getNYPE() const override { return 1; }
int getNZPE() const override { return 1; }
int getXProcIndex() const override { return 0; }
int getYProcIndex() const override { return 0; }
int getZProcIndex() const override { return 0; }
int getProcIndex(int UNUSED(X), int UNUSED(Y), int UNUSED(Z)) const override { return 0; }
MPI_Comm getXZcomm() const override { return BoutComm::get(); }
bool firstX() const override { return true; }
bool lastX() const override { return true; }
int sendXOut(BoutReal* UNUSED(buffer), int UNUSED(size), int UNUSED(tag)) override {
Expand Down Expand Up @@ -164,8 +166,10 @@ public:
}
BoutReal GlobalX(int jx) const override { return jx; }
BoutReal GlobalY(int jy) const override { return jy; }
BoutReal GlobalZ(int jz) const override { return jz; }
BoutReal GlobalX(BoutReal jx) const override { return jx; }
BoutReal GlobalY(BoutReal jy) const override { return jy; }
BoutReal GlobalZ(BoutReal jz) const override { return jz; }
int getGlobalXIndex(int) const override { return 0; }
int getGlobalXIndexNoBoundaries(int) const override { return 0; }
int getGlobalYIndex(int y) const override { return y; }
Expand Down Expand Up @@ -228,15 +232,15 @@ public:
addRegion2D("RGN_BNDRY",
std::accumulate(begin(boundary_names), end(boundary_names),
Region<Ind2D>{},
[this](Region<Ind2D>& a, const std::string& b) {
[this](Region<Ind2D> a, const std::string& b) {
return a + getRegion2D(b);
})
.unique());

addRegion3D("RGN_BNDRY",
std::accumulate(begin(boundary_names), end(boundary_names),
Region<Ind3D>{},
[this](Region<Ind3D>& a, const std::string& b) {
[this](Region<Ind3D> a, const std::string& b) {
return a + getRegion3D(b);
})
.unique());
Expand Down
Loading