diff options
author | 2017-03-06 09:04:22 -0800 | |
---|---|---|
committer | 2017-03-06 09:04:22 -0800 | |
commit | 8db8371a7e59131fdd8172a19a1357c99fc61ec7 (patch) | |
tree | e9e12903f0d4f6930fc4198490d9467339064be8 /Python | |
parent | 091729f822ce85d08a894fd1ce6c5354ce72eb5d (diff) | |
parent | 2da3e1a73e9fd5c54d679adc4638e35cba537800 (diff) | |
download | WarpX-8db8371a7e59131fdd8172a19a1357c99fc61ec7.tar.gz WarpX-8db8371a7e59131fdd8172a19a1357c99fc61ec7.tar.zst WarpX-8db8371a7e59131fdd8172a19a1357c99fc61ec7.zip |
Merge branch 'amrex'
Diffstat (limited to 'Python')
-rw-r--r-- | Python/GNUmakefile | 3 | ||||
-rw-r--r-- | Python/ParticleProb.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Python/GNUmakefile b/Python/GNUmakefile index 78274a632..e86d23141 100644 --- a/Python/GNUmakefile +++ b/Python/GNUmakefile @@ -1,4 +1,4 @@ -BOXLIB_HOME ?= ../../BoxLib +AMREX_HOME ?= ../../amrex PICSAR_HOME ?= ../../picsar DEBUG = FALSE @@ -7,7 +7,6 @@ DEBUG = FALSE DIM = 3 COMP = gcc -FCOMP = gfortran TINY_PROFILE = TRUE TINY_PROFILE = FALSE diff --git a/Python/ParticleProb.cpp b/Python/ParticleProb.cpp index 96d0c2d44..71a2118c9 100644 --- a/Python/ParticleProb.cpp +++ b/Python/ParticleProb.cpp @@ -7,6 +7,8 @@ #include <ParticleContainer.H> #include <WarpXConst.H> +using namespace amrex; + void PhysicalParticleContainer::InitData() { |