diff options
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | Examples/Tests/Larmor/inputs.mr | 2 | ||||
| -rw-r--r-- | Regression/prepare_file_travis.py | 2 | ||||
| -rw-r--r-- | Source/Particles/PhysicalParticleContainer.cpp | 13 |
4 files changed, 11 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 9e6f72d00..ccabd3852 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,8 @@ before_install: - wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh - bash Miniconda3-latest-Linux-x86_64.sh -b - export PATH=/home/travis/miniconda3/bin:$PATH - - pip install --upgrade pip && pip install numpy scipy matplotlib yt mpi4py + - pip install --upgrade pip && pip install numpy scipy matplotlib mpi4py cython + - pip install git+https://github.com/yt-project/yt.git script: - export FFTW_HOME=/usr/ diff --git a/Examples/Tests/Larmor/inputs.mr b/Examples/Tests/Larmor/inputs.mr index 30166a3d6..f933aa77a 100644 --- a/Examples/Tests/Larmor/inputs.mr +++ b/Examples/Tests/Larmor/inputs.mr @@ -2,7 +2,7 @@ max_step = 400 # number of grid points -amr.n_cell = 32 32 +amr.n_cell = 64 64 # The lo and hi ends of grids are multipliers of blocking factor amr.blocking_factor = 16 diff --git a/Regression/prepare_file_travis.py b/Regression/prepare_file_travis.py index 225ed75e3..d461f6f81 100644 --- a/Regression/prepare_file_travis.py +++ b/Regression/prepare_file_travis.py @@ -41,7 +41,7 @@ text = re.sub('runtime_params =', # Use only 2 cores for compiling text = re.sub( 'numMakeJobs = \d+', 'numMakeJobs = 2', text ) # Use only 1 MPI and 1 thread proc for tests -text = re.sub( 'numprocs = \d+', 'numprocs = 1', text) +text = re.sub( 'numprocs = \d+', 'numprocs = 2', text) text = re.sub( 'numthreads = \d+', 'numthreads = 1', text) # Prevent emails from being sent text = re.sub( 'sendEmailWhenFail = 1', 'sendEmailWhenFail = 0', text ) diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp index 008eb9c89..3128868e4 100644 --- a/Source/Particles/PhysicalParticleContainer.cpp +++ b/Source/Particles/PhysicalParticleContainer.cpp @@ -1362,40 +1362,41 @@ PhysicalParticleContainer::applyNCIFilter ( #endif // Filter Ex (Both 2D and 3D) - filtered_Ex.resize(amrex::convert(tbox,WarpX::Ex_nodal_flag)); + filtered_Ex.resize(amrex::convert(tbox,Ex.box().ixType())); // Safeguard for GPU exeli = filtered_Ex.elixir(); // Apply filter on Ex, result stored in filtered_Ex + nci_godfrey_filter_exeybz[lev]->ApplyStencil(filtered_Ex, Ex, filtered_Ex.box()); // Update ex_ptr reference ex_ptr = &filtered_Ex; // Filter Ez - filtered_Ez.resize(amrex::convert(tbox,WarpX::Ez_nodal_flag)); + filtered_Ez.resize(amrex::convert(tbox,Ez.box().ixType())); ezeli = filtered_Ez.elixir(); nci_godfrey_filter_bxbyez[lev]->ApplyStencil(filtered_Ez, Ez, filtered_Ez.box()); ez_ptr = &filtered_Ez; // Filter By - filtered_By.resize(amrex::convert(tbox,WarpX::By_nodal_flag)); + filtered_By.resize(amrex::convert(tbox,By.box().ixType())); byeli = filtered_By.elixir(); nci_godfrey_filter_bxbyez[lev]->ApplyStencil(filtered_By, By, filtered_By.box()); by_ptr = &filtered_By; #if (AMREX_SPACEDIM == 3) // Filter Ey - filtered_Ey.resize(amrex::convert(tbox,WarpX::Ey_nodal_flag)); + filtered_Ey.resize(amrex::convert(tbox,Ey.box().ixType())); eyeli = filtered_Ey.elixir(); nci_godfrey_filter_exeybz[lev]->ApplyStencil(filtered_Ey, Ey, filtered_Ey.box()); ey_ptr = &filtered_Ey; // Filter Bx - filtered_Bx.resize(amrex::convert(tbox,WarpX::Bx_nodal_flag)); + filtered_Bx.resize(amrex::convert(tbox,Bx.box().ixType())); bxeli = filtered_Bx.elixir(); nci_godfrey_filter_bxbyez[lev]->ApplyStencil(filtered_Bx, Bx, filtered_Bx.box()); bx_ptr = &filtered_Bx; // Filter Bz - filtered_Bz.resize(amrex::convert(tbox,WarpX::Bz_nodal_flag)); + filtered_Bz.resize(amrex::convert(tbox,Bz.box().ixType())); bzeli = filtered_Bz.elixir(); nci_godfrey_filter_exeybz[lev]->ApplyStencil(filtered_Bz, Bz, filtered_Bz.box()); bz_ptr = &filtered_Bz; |