From c26e2bc3a9dbe339868e97e76685db0be084aa74 Mon Sep 17 00:00:00 2001 From: MaxThevenet Date: Fri, 9 Oct 2020 13:10:43 +0200 Subject: [PATCH 01/11] reset particlecontainer dm and ba --- src/Hipace.H | 7 ++ src/Hipace.cpp | 72 +++++++++++++++++-- src/HipaceProfilerWrapper.H | 2 +- src/fields/Fields.H | 2 +- src/fields/Fields.cpp | 46 +----------- src/particles/PlasmaParticleContainer.H | 2 +- src/particles/PlasmaParticleContainer.cpp | 11 ++- src/particles/PlasmaParticleContainerInit.cpp | 7 +- 8 files changed, 96 insertions(+), 53 deletions(-) diff --git a/src/Hipace.H b/src/Hipace.H index 816a1f4181..81fe9859fc 100644 --- a/src/Hipace.H +++ b/src/Hipace.H @@ -188,6 +188,12 @@ private: /** Pointer to current (and only) instance of class Hipace */ static Hipace* m_instance; + amrex::RealBox m_slice_domain; + amrex::DistributionMapping m_slice_dm; + /** Slice BoxArray. Used for field slice and plasma particles */ + amrex::BoxArray m_slice_ba; + bool slice_initialized = false; + /** \brief Predictor-corrector loop to calculate Bx and By. * 1. an initial Bx and By value is guessed. * 2. Using this Bx and By values, the plasma particles are advanced to the next slice, @@ -204,6 +210,7 @@ private: */ void PredictorCorrectorLoopToSolveBxBy (const int islice, const int lev); + void DefineSliceGDB (const amrex::BoxArray& ba, const amrex::DistributionMapping& dm); }; #endif diff --git a/src/Hipace.cpp b/src/Hipace.cpp index 523a44c1dc..144cbe37cd 100644 --- a/src/Hipace.cpp +++ b/src/Hipace.cpp @@ -90,6 +90,67 @@ Hipace::~Hipace () #endif } +void +Hipace::DefineSliceGDB (const amrex::BoxArray& ba, const amrex::DistributionMapping& dm) +{ + std::map > boxes; + for (int i = 0; i < ba.size(); ++i) { + int rank = dm[i]; + if (InSameTransverseCommunicator(rank)) { + boxes[rank].push_back(ba[i]); + } + } + + // We assume each process may have multiple Boxes longitude direction, but only one Box in the + // transverse direction. The union of all Boxes on a process is rectangular. The slice + // BoxArray therefore has one Box per process. The Boxes in the slice BoxArray have one cell in + // the longitude direction. We will use the lowest longitude index in each process to construct + // the Boxes. These Boxes do not have any overlaps. Transversely, there are no gaps between + // them. + + amrex::BoxList bl; + amrex::Vector procmap; + for (auto const& kv : boxes) { + int const iproc = kv.first; + auto const& boxes_i = kv.second; + AMREX_ALWAYS_ASSERT_WITH_MESSAGE(boxes_i.size() > 0, + "We assume each process has at least one Box"); + amrex::Box bx = boxes_i[0]; + for (int j = 1; j < boxes_i.size(); ++j) { + amrex::Box const& bxj = boxes_i[j]; + for (int idim = 0; idim < Direction::z; ++idim) { + AMREX_ALWAYS_ASSERT(bxj.smallEnd(idim) == bx.smallEnd(idim)); + AMREX_ALWAYS_ASSERT(bxj.bigEnd(idim) == bx.bigEnd(idim)); + if (bxj.smallEnd(Direction::z) < bx.smallEnd(Direction::z)) { + bx = bxj; + } + } + } + bx.setBig(Direction::z, bx.smallEnd(Direction::z)); + bl.push_back(bx); + procmap.push_back(iproc); + } + + m_slice_ba = amrex::BoxArray(std::move(bl)); + m_slice_dm = amrex::DistributionMapping(std::move(procmap)); + constexpr int lev = 0; + m_slice_domain = Geom(lev).ProbDomain(); + + const int dir = AMREX_SPACEDIM-1; + const amrex::Real dx = Geom(lev).CellSize(dir); + const amrex::Real hi = Geom(lev).ProbHi(dir); + const amrex::Real lo = hi - dx; + + // amrex::RealBox particleBox = geom.ProbDomain(); + m_slice_domain.setHi(dir, hi); + m_slice_domain.setLo(dir, lo); + // m_slice_geom.setProbDomain(particleBox); + + slice_initialized = true; + // amrex::BoxArray slice_ba(std::move(bl)); + // amrex::DistributionMapping slice_dm(std::move(procmap)); +} + bool Hipace::InSameTransverseCommunicator (int rank) const { @@ -109,8 +170,12 @@ Hipace::InitData () SetMaxGridSize(new_max_grid_size); AmrCore::InitFromScratch(0.0); // function argument is time + amrex::Print()<<"slice_initialized "< m_poisson_solver; diff --git a/src/fields/Fields.cpp b/src/fields/Fields.cpp index 95acf22848..66928e0afe 100644 --- a/src/fields/Fields.cpp +++ b/src/fields/Fields.cpp @@ -15,8 +15,9 @@ Fields::Fields (Hipace const* a_hipace) } void -Fields::AllocData (int lev, const amrex::BoxArray& ba, - const amrex::DistributionMapping& dm, amrex::Geometry const& geom) +Fields::AllocData ( + int lev, const amrex::BoxArray& ba, const amrex::DistributionMapping& dm, + amrex::Geometry const& geom, const amrex::BoxArray& slice_ba, const amrex::DistributionMapping& slice_dm) { HIPACE_PROFILE("Fields::AllocData()"); // Need at least 1 guard cell transversally for transverse derivative @@ -32,47 +33,6 @@ Fields::AllocData (int lev, const amrex::BoxArray& ba, amrex::MFInfo().SetArena(amrex::The_Arena())); } - std::map > boxes; - for (int i = 0; i < ba.size(); ++i) { - int rank = dm[i]; - if (m_hipace->InSameTransverseCommunicator(rank)) { - boxes[rank].push_back(ba[i]); - } - } - - // We assume each process may have multiple Boxes longitude direction, but only one Box in the - // transverse direction. The union of all Boxes on a process is rectangular. The slice - // BoxArray therefore has one Box per process. The Boxes in the slice BoxArray have one cell in - // the longitude direction. We will use the lowest longitude index in each process to construct - // the Boxes. These Boxes do not have any overlaps. Transversely, there are no gaps between - // them. - - amrex::BoxList bl; - amrex::Vector procmap; - for (auto const& kv : boxes) { - int const iproc = kv.first; - auto const& boxes_i = kv.second; - AMREX_ALWAYS_ASSERT_WITH_MESSAGE(boxes_i.size() > 0, - "We assume each process has at least one Box"); - amrex::Box bx = boxes_i[0]; - for (int j = 1; j < boxes_i.size(); ++j) { - amrex::Box const& bxj = boxes_i[j]; - for (int idim = 0; idim < Direction::z; ++idim) { - AMREX_ALWAYS_ASSERT(bxj.smallEnd(idim) == bx.smallEnd(idim)); - AMREX_ALWAYS_ASSERT(bxj.bigEnd(idim) == bx.bigEnd(idim)); - if (bxj.smallEnd(Direction::z) < bx.smallEnd(Direction::z)) { - bx = bxj; - } - } - } - bx.setBig(Direction::z, bx.smallEnd(Direction::z)); - bl.push_back(bx); - procmap.push_back(iproc); - } - - amrex::BoxArray slice_ba(std::move(bl)); - amrex::DistributionMapping slice_dm(std::move(procmap)); - for (int islice=0; islice<(int) WhichSlice::N; islice++) { m_slices[lev][islice].define(slice_ba, slice_dm, FieldComps::nfields, m_slices_nguards, amrex::MFInfo().SetArena(amrex::The_Arena())); diff --git a/src/particles/PlasmaParticleContainer.H b/src/particles/PlasmaParticleContainer.H index b0131f82b9..94e3476ca9 100644 --- a/src/particles/PlasmaParticleContainer.H +++ b/src/particles/PlasmaParticleContainer.H @@ -36,7 +36,7 @@ public: /** Allocate data for the beam particles and initialize particles with requested beam profile */ - void InitData (const amrex::Geometry& geom); + void InitData (const amrex::RealBox& slice_box, const amrex::Geometry& geom); /** Initialize 1 xy slice of particles, with fixed number of particles per cell */ void InitParticles ( diff --git a/src/particles/PlasmaParticleContainer.cpp b/src/particles/PlasmaParticleContainer.cpp index 1333c42bf8..3f05642d8d 100644 --- a/src/particles/PlasmaParticleContainer.cpp +++ b/src/particles/PlasmaParticleContainer.cpp @@ -27,11 +27,15 @@ PlasmaParticleContainer::PlasmaParticleContainer (amrex::AmrCore* amr_core) } void -PlasmaParticleContainer::InitData (const amrex::Geometry& geom) +PlasmaParticleContainer::InitData (const amrex::RealBox& slice_box, const amrex::Geometry& geom) { reserveData(); resizeData(); + amrex::Print()< Date: Fri, 9 Oct 2020 14:08:02 +0200 Subject: [PATCH 02/11] use geom min for particle location --- src/particles/PlasmaParticleContainerInit.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/particles/PlasmaParticleContainerInit.cpp b/src/particles/PlasmaParticleContainerInit.cpp index 8851bc6303..ae261e0e7c 100644 --- a/src/particles/PlasmaParticleContainerInit.cpp +++ b/src/particles/PlasmaParticleContainerInit.cpp @@ -20,11 +20,12 @@ InitParticles (const IntVect& a_num_particles_per_cell, const int lev = 0; const auto dx = a_geom.CellSizeArray(); - const auto plo = a_bounds.lo(); + //const auto plo = a_bounds.lo(); const auto phi = a_bounds.hi(); - //const auto plo2 = a_geom.ProbLoArray(); - amrex::Print()<<"plo "< Date: Fri, 9 Oct 2020 14:19:05 +0200 Subject: [PATCH 03/11] cleaning --- src/Hipace.H | 2 -- src/Hipace.cpp | 4 ---- src/HipaceProfilerWrapper.H | 2 +- src/particles/PlasmaParticleContainer.cpp | 16 ---------------- src/particles/PlasmaParticleContainerInit.cpp | 6 ------ 5 files changed, 1 insertion(+), 29 deletions(-) diff --git a/src/Hipace.H b/src/Hipace.H index 81fe9859fc..5d69749d9b 100644 --- a/src/Hipace.H +++ b/src/Hipace.H @@ -190,9 +190,7 @@ private: amrex::RealBox m_slice_domain; amrex::DistributionMapping m_slice_dm; - /** Slice BoxArray. Used for field slice and plasma particles */ amrex::BoxArray m_slice_ba; - bool slice_initialized = false; /** \brief Predictor-corrector loop to calculate Bx and By. * 1. an initial Bx and By value is guessed. diff --git a/src/Hipace.cpp b/src/Hipace.cpp index 144cbe37cd..b6a518196a 100644 --- a/src/Hipace.cpp +++ b/src/Hipace.cpp @@ -141,14 +141,10 @@ Hipace::DefineSliceGDB (const amrex::BoxArray& ba, const amrex::DistributionMapp const amrex::Real hi = Geom(lev).ProbHi(dir); const amrex::Real lo = hi - dx; - // amrex::RealBox particleBox = geom.ProbDomain(); m_slice_domain.setHi(dir, hi); m_slice_domain.setLo(dir, lo); - // m_slice_geom.setProbDomain(particleBox); slice_initialized = true; - // amrex::BoxArray slice_ba(std::move(bl)); - // amrex::DistributionMapping slice_dm(std::move(procmap)); } bool diff --git a/src/HipaceProfilerWrapper.H b/src/HipaceProfilerWrapper.H index 180f269a2d..89d1508517 100644 --- a/src/HipaceProfilerWrapper.H +++ b/src/HipaceProfilerWrapper.H @@ -20,7 +20,7 @@ void doDeviceSynchronize(bool do_device_synchronize) amrex::Gpu::synchronize(); } -#define HIPACE_PROFILE(fname) doDeviceSynchronize(Hipace::m_do_device_synchronize); amrex::Print()< Date: Fri, 9 Oct 2020 14:22:21 +0200 Subject: [PATCH 04/11] remove check variable --- src/Hipace.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Hipace.cpp b/src/Hipace.cpp index b6a518196a..9b71b8f042 100644 --- a/src/Hipace.cpp +++ b/src/Hipace.cpp @@ -143,8 +143,6 @@ Hipace::DefineSliceGDB (const amrex::BoxArray& ba, const amrex::DistributionMapp m_slice_domain.setHi(dir, hi); m_slice_domain.setLo(dir, lo); - - slice_initialized = true; } bool @@ -166,7 +164,6 @@ Hipace::InitData () SetMaxGridSize(new_max_grid_size); AmrCore::InitFromScratch(0.0); // function argument is time - amrex::Print()<<"slice_initialized "< Date: Wed, 14 Oct 2020 22:39:30 +0200 Subject: [PATCH 05/11] also set particle geometry --- src/Hipace.H | 2 +- src/Hipace.cpp | 21 +++++++++++++------ src/particles/PlasmaParticleContainer.H | 6 ++---- src/particles/PlasmaParticleContainer.cpp | 4 ++-- src/particles/PlasmaParticleContainerInit.cpp | 9 ++++---- 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/src/Hipace.H b/src/Hipace.H index 5d69749d9b..d345734abb 100644 --- a/src/Hipace.H +++ b/src/Hipace.H @@ -188,7 +188,7 @@ private: /** Pointer to current (and only) instance of class Hipace */ static Hipace* m_instance; - amrex::RealBox m_slice_domain; + amrex::Geometry m_slice_geom; amrex::DistributionMapping m_slice_dm; amrex::BoxArray m_slice_ba; diff --git a/src/Hipace.cpp b/src/Hipace.cpp index 9b71b8f042..2d5e56c225 100644 --- a/src/Hipace.cpp +++ b/src/Hipace.cpp @@ -131,18 +131,27 @@ Hipace::DefineSliceGDB (const amrex::BoxArray& ba, const amrex::DistributionMapp procmap.push_back(iproc); } + // Slice BoxArray m_slice_ba = amrex::BoxArray(std::move(bl)); + + // Slice DistributionMapping m_slice_dm = amrex::DistributionMapping(std::move(procmap)); - constexpr int lev = 0; - m_slice_domain = Geom(lev).ProbDomain(); + // Slice Geometry + constexpr int lev = 0; const int dir = AMREX_SPACEDIM-1; + // Set the lo and hi of domain and probdomain in the z direction + amrex::RealBox tmp_probdom = Geom(lev).ProbDomain(); + amrex::Box tmp_dom = Geom(lev).Domain(); const amrex::Real dx = Geom(lev).CellSize(dir); const amrex::Real hi = Geom(lev).ProbHi(dir); const amrex::Real lo = hi - dx; - - m_slice_domain.setHi(dir, hi); - m_slice_domain.setLo(dir, lo); + tmp_probdom.setLo(dir, lo); + tmp_probdom.setHi(dir, hi); + tmp_dom.setSmall(dir, 0); + tmp_dom.setBig(dir, 0); + m_slice_geom = amrex::Geometry( + tmp_dom, tmp_probdom, Geom(lev).Coord(), Geom(lev).isPeriodic()); } bool @@ -168,7 +177,7 @@ Hipace::InitData () m_beam_container.InitData(geom[0]); m_plasma_container.SetParticleBoxArray(lev, m_slice_ba); m_plasma_container.SetParticleDistributionMap(lev, m_slice_dm); - m_plasma_container.InitData(m_slice_domain, geom[0]); + m_plasma_container.InitData(); } void diff --git a/src/particles/PlasmaParticleContainer.H b/src/particles/PlasmaParticleContainer.H index 94e3476ca9..534d9c45f8 100644 --- a/src/particles/PlasmaParticleContainer.H +++ b/src/particles/PlasmaParticleContainer.H @@ -36,7 +36,7 @@ public: /** Allocate data for the beam particles and initialize particles with requested beam profile */ - void InitData (const amrex::RealBox& slice_box, const amrex::Geometry& geom); + void InitData (); /** Initialize 1 xy slice of particles, with fixed number of particles per cell */ void InitParticles ( @@ -44,9 +44,7 @@ public: const amrex::RealVect& a_thermal_momentum_std, const amrex::RealVect& a_thermal_momentum_mean, const amrex::Real a_density, - const amrex::Real a_radius, - const amrex::Geometry& a_geom, - const amrex::RealBox& a_bounds); + const amrex::Real a_radius); amrex::Real m_density {0}; /**< Density of the plasma */ /** maximum weighting factor gamma/(Psi +1) before particle is regarded as violating diff --git a/src/particles/PlasmaParticleContainer.cpp b/src/particles/PlasmaParticleContainer.cpp index 47340e38c6..95dee90528 100644 --- a/src/particles/PlasmaParticleContainer.cpp +++ b/src/particles/PlasmaParticleContainer.cpp @@ -27,10 +27,10 @@ PlasmaParticleContainer::PlasmaParticleContainer (amrex::AmrCore* amr_core) } void -PlasmaParticleContainer::InitData (const amrex::RealBox& slice_box, const amrex::Geometry& geom) +PlasmaParticleContainer::InitData () { reserveData(); resizeData(); - InitParticles(m_ppc,m_u_std, m_u_mean, m_density, m_radius, geom, slice_box); + InitParticles(m_ppc,m_u_std, m_u_mean, m_density, m_radius); } diff --git a/src/particles/PlasmaParticleContainerInit.cpp b/src/particles/PlasmaParticleContainerInit.cpp index 8046afeae1..a48956f14f 100644 --- a/src/particles/PlasmaParticleContainerInit.cpp +++ b/src/particles/PlasmaParticleContainerInit.cpp @@ -12,15 +12,14 @@ InitParticles (const IntVect& a_num_particles_per_cell, const amrex::RealVect& a_u_std, const amrex::RealVect& a_u_mean, const amrex::Real a_density, - const amrex::Real a_radius, - const Geometry& a_geom, - const RealBox& a_bounds) + const amrex::Real a_radius) { HIPACE_PROFILE("PlasmaParticleContainer::InitParticles"); const int lev = 0; - const auto dx = a_geom.CellSizeArray(); - const auto plo = a_geom.ProbLoArray(); + const auto dx = ParticleGeom(lev).CellSizeArray(); + const auto plo = ParticleGeom(lev).ProbLoArray(); + const amrex::RealBox a_bounds = ParticleGeom(lev).ProbDomain(); const int num_ppc = AMREX_D_TERM( a_num_particles_per_cell[0], *a_num_particles_per_cell[1], From 9a1001dbc12884918652bf36c7a943d489835946 Mon Sep 17 00:00:00 2001 From: MaxThevenet Date: Wed, 14 Oct 2020 22:58:53 +0200 Subject: [PATCH 06/11] fix some comments --- src/Hipace.H | 6 ++++++ src/fields/Fields.H | 8 ++++++-- src/particles/PlasmaParticleContainer.H | 9 ++++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/Hipace.H b/src/Hipace.H index d345734abb..7401144f2c 100644 --- a/src/Hipace.H +++ b/src/Hipace.H @@ -208,6 +208,12 @@ private: */ void PredictorCorrectorLoopToSolveBxBy (const int islice, const int lev); + /** \brief define Geometry, DistributionMapping and BoxArray for the slice. + * The slice MultiFAB and the plasma particles are defined on this GDB. + * + * \param[in] ba BoxArray of the whole domain + * \param[in] dm DistributionMappint of the whole domain + */ void DefineSliceGDB (const amrex::BoxArray& ba, const amrex::DistributionMapping& dm); }; diff --git a/src/fields/Fields.H b/src/fields/Fields.H index b3aaf85dec..d75fbaa27f 100644 --- a/src/fields/Fields.H +++ b/src/fields/Fields.H @@ -52,9 +52,13 @@ public: * \param[in] ba BoxArray for the simulation * \param[in] dm DistributionMapping for the whole simulation * \param[in] geom Geometry + * \param[in] slice_ba BoxArray for the slice + * \param[in] slice_dm DistributionMapping for the slice */ - void AllocData (int lev, const amrex::BoxArray& ba, - const amrex::DistributionMapping& dm, amrex::Geometry const& geom, const amrex::BoxArray& slice_ba, const amrex::DistributionMapping& slice_dm); + void AllocData ( + int lev, const amrex::BoxArray& ba, const amrex::DistributionMapping& dm, + amrex::Geometry const& geom, const amrex::BoxArray& slice_ba, + const amrex::DistributionMapping& slice_dm); /** Class to handle transverse FFT Poisson solver on 1 slice */ std::unique_ptr m_poisson_solver; diff --git a/src/particles/PlasmaParticleContainer.H b/src/particles/PlasmaParticleContainer.H index 534d9c45f8..25b406ed0b 100644 --- a/src/particles/PlasmaParticleContainer.H +++ b/src/particles/PlasmaParticleContainer.H @@ -38,7 +38,14 @@ public: */ void InitData (); - /** Initialize 1 xy slice of particles, with fixed number of particles per cell */ + /** Initialize 1 xy slice of particles, with fixed number of particles per cell + * + * \param[in] a_num_particles_per_cell number of particles per cell in x and y + * \param[in] a_thermal_momentum_std standard deviation of the momentum distribution (3d) + * \param[in] a_thermal_momentum_mean average momentum (3d) + * \param[in] a_density plasma density (SI) + * \param[in] a_radius plasma radius. Only particles with x**2+y**2 Date: Thu, 15 Oct 2020 08:21:49 +0200 Subject: [PATCH 07/11] add call to set geometry --- src/Hipace.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Hipace.cpp b/src/Hipace.cpp index 2d5e56c225..507be4fef1 100644 --- a/src/Hipace.cpp +++ b/src/Hipace.cpp @@ -177,6 +177,7 @@ Hipace::InitData () m_beam_container.InitData(geom[0]); m_plasma_container.SetParticleBoxArray(lev, m_slice_ba); m_plasma_container.SetParticleDistributionMap(lev, m_slice_dm); + m_plasma_container.SetParticleGeometry(lev, m_slice_geom); m_plasma_container.InitData(); } From 73c9dd3c44e614ea0b205030deda5a6d32761673 Mon Sep 17 00:00:00 2001 From: Maxence Thevenet Date: Tue, 10 Nov 2020 14:34:07 +0100 Subject: [PATCH 08/11] add print statement --- src/Hipace.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/Hipace.cpp b/src/Hipace.cpp index bbe425c1aa..b29494b4ff 100644 --- a/src/Hipace.cpp +++ b/src/Hipace.cpp @@ -177,9 +177,23 @@ Hipace::InitData () AmrCore::InitFromScratch(0.0); // function argument is time constexpr int lev = 0; m_beam_container.InitData(geom[0]); + //m_plasma_container.SetParticleBoxArray(lev, m_slice_ba); + //m_plasma_container.SetParticleDistributionMap(lev, m_slice_dm); + //m_plasma_container.SetParticleGeometry(lev, m_slice_geom); + std::cout<<"m_slice_ba = \n"< Date: Tue, 10 Nov 2020 15:04:16 +0100 Subject: [PATCH 09/11] run CI on Andrew's branch for particle Geom --- .github/workflows/linux.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index e596f6605b..00d624632f 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -35,7 +35,9 @@ jobs: cd build cmake .. \ -DCMAKE_INSTALL_PREFIX=/tmp/my-hipace \ - -DCMAKE_CXX_STANDARD=17 + -DCMAKE_CXX_STANDARD=17 \ + -DHiPACE_amrex_repo=https://github.com/atmyers/amrex.git \ + -DHiPACE_amrex_branch=multiple_dual_grid make -j 2 VERBOSE=ON ctest --output-on-failure From c603863c6a718cbffc823f56b62dacfa1c6652d9 Mon Sep 17 00:00:00 2001 From: Maxence Thevenet Date: Tue, 10 Nov 2020 18:06:02 +0100 Subject: [PATCH 10/11] cleaning: remove spurious print statements --- src/Hipace.cpp | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/Hipace.cpp b/src/Hipace.cpp index b29494b4ff..bbe425c1aa 100644 --- a/src/Hipace.cpp +++ b/src/Hipace.cpp @@ -177,23 +177,9 @@ Hipace::InitData () AmrCore::InitFromScratch(0.0); // function argument is time constexpr int lev = 0; m_beam_container.InitData(geom[0]); - //m_plasma_container.SetParticleBoxArray(lev, m_slice_ba); - //m_plasma_container.SetParticleDistributionMap(lev, m_slice_dm); - //m_plasma_container.SetParticleGeometry(lev, m_slice_geom); - std::cout<<"m_slice_ba = \n"< Date: Tue, 10 Nov 2020 18:06:17 +0100 Subject: [PATCH 11/11] cleaning: build on AMReX development again --- .github/workflows/linux.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 00d624632f..e596f6605b 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -35,9 +35,7 @@ jobs: cd build cmake .. \ -DCMAKE_INSTALL_PREFIX=/tmp/my-hipace \ - -DCMAKE_CXX_STANDARD=17 \ - -DHiPACE_amrex_repo=https://github.com/atmyers/amrex.git \ - -DHiPACE_amrex_branch=multiple_dual_grid + -DCMAKE_CXX_STANDARD=17 make -j 2 VERBOSE=ON ctest --output-on-failure