Skip to content
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

Update BOUT++ version #25

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+20 −20
Open

Update BOUT++ version #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2c9abf
Update BOUT++ version
bendudson May 20, 2023
0328bbe
Update header file locations
bendudson May 20, 2023
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
8 changes: 4 additions & 4 deletions div_ops.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
#include "div_ops.hxx"

#include <bout/mesh.hxx>
#include <globals.hxx>
#include <derivs.hxx>
#include <output.hxx>
#include <utils.hxx>
#include <bout/globals.hxx>
#include <bout/derivs.hxx>
#include <bout/output.hxx>
#include <bout/utils.hxx>
#include <bout/assert.hxx>

#include <cmath>
Expand Down
2 changes: 1 addition & 1 deletion div_ops.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#ifndef __DIV_OPS_H__
#define __DIV_OPS_H__

#include <field3d.hxx>
#include <bout/field3d.hxx>

/*!
* Parallel diffusion (in y)
Expand Down
2 changes: 1 addition & 1 deletion external/BOUT-dev
Open in desktop
Submodule BOUT-dev updated 604 files
8 changes: 4 additions & 4 deletions loadmetric.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
along with SD1D. If not, see <http://www.gnu.org/licenses/>.
*/

#include <globals.hxx>
#include <output.hxx>
#include <utils.hxx>
#include <field2d.hxx>
#include <bout/globals.hxx>
#include <bout/output.hxx>
#include <bout/utils.hxx>
#include <bout/field2d.hxx>
#include <bout/mesh.hxx>

#include "loadmetric.hxx"
Expand Down
2 changes: 1 addition & 1 deletion loadmetric.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#ifndef __LOADMETRIC_H__
#define __LOADMETRIC_H__

#include <bout_types.hxx>
#include <bout/bout_types.hxx>

void LoadMetric(BoutReal Lnorm, BoutReal Bnorm);

Expand Down
8 changes: 4 additions & 4 deletions radiation.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

#include <globals.hxx> // for mesh object
#include <output.hxx>
#include <boutexception.hxx>
#include <utils.hxx>
#include <bout/globals.hxx> // for mesh object
#include <bout/output.hxx>
#include <bout/boutexception.hxx>
#include <bout/utils.hxx>

#include "radiation.hxx"

Expand Down
4 changes: 2 additions & 2 deletions radiation.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#ifndef __RADIATION_H__
#define __RADIATION_H__

#include <field3d.hxx>
#include <bout_types.hxx>
#include <bout/field3d.hxx>
#include <bout/bout_types.hxx>

#include <vector>
#include <cmath>
Expand Down
6 changes: 3 additions & 3 deletions sd1d.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@

#include <bout/constants.hxx>
#include <bout/physicsmodel.hxx>
#include <derivs.hxx>
#include <field_factory.hxx>
#include <bout/derivs.hxx>
#include <bout/field_factory.hxx>
#include <bout/invert_pardiv.hxx>
#include <bout/snb.hxx>
#include <bout/fv_ops.hxx>
Expand Down Expand Up @@ -1850,7 +1850,7 @@ class SD1D : public PhysicsModel {
{"long_name", "neutral atom pressure source"}});
}

if (mesh->lastY()) {
if (mesh->lastY(0)) {
set_with_attrs(state["flux_ion"], flux_ion,
{{"units", "m^-2 s^-1"},
{"conversion", Nnorm * Cs0},
Expand Down