-
Notifications
You must be signed in to change notification settings - Fork 227
2D EM solver with EB #2401
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.
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
2D EM solver with EB #2401
Conversation
Merge ecp/dev lgiacome/dev
This reverts commit 801e6fc.
Co-authored-by: Neïl Zaim <[email protected]>
|
@ax3l it's done :) |
|
X-ref: particle scraping in 2D, 1D and RZ: #2536 |
|
Just cc-ing @prkkumar on this. |
Examples/Modules/embedded_boundary_rotated_cube/analysis_fields_2d.py
Outdated
Show resolved
Hide resolved
| borrowing_y_inds_pointer(i, j, k) = borrowing_y_inds + ps; | ||
|
|
||
| Sy_mod(i, j, k) = Sy(i, j, k); | ||
| #ifdef WARPX_DIM_XZ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For this large block: is there a way to reuse more code?
It looks to me like we might duplicate a lot of math here.
That duplication makes it hard to maintain in the future, e.g., imagine a fix or extension of any section (which needs to be then remembered to be copied to 4 different geometric implementations that are mostly copied).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm afraid this won't be possible. The problem is that in 3D the z-direction is stored in the third dimension of the arrays, while in XZ it is stored in the second dimension.
For example, let's say we want to access the top-right neighbor's area. In the 3D code, it is going to be something like Sy(i+1, j, k+1), while in XZ it's going to be Sy(i+1, j+1, k).
I couldn't see an easy way to work around this issue but I am open if you have ideas 😄
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you use constants for the index calculation/access and only put those in #ifdefs?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You are making a really good point and, in general, I think I should try to reduce the code duplication in this file. We also discussed this with Remi in the past because in 3D we repeat the same operations 3 times and we just change the order of the indices.
The problem is mainly that lines like the following are difficult to generalize
amrex::Real denom = local_avail(0, 1) * Sy(i - 1, j, k) +
local_avail(2, 1) * Sy(i + 1, j, k) +
local_avail(1, 0) * Sy(i, j - 1, k ) +
local_avail(1, 2) * Sy(i, j + 1, k) +
local_avail(0, 0) * Sy(i - 1, j - 1, k) +
local_avail(2, 0) * Sy(i + 1, j - 1, k) +
local_avail(0, 2) * Sy(i - 1, j + 1, k) +
local_avail(2, 2) * Sy(i + 1, j + 1, k);
In principle, I could try to write a sort of decorator for the multifab class that depending on the dimension in consideration accesses the right indices. That might help to not expose this part of code to the choice of indices based on the dimension.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, we could generally write for instance a constexpr function that does the index permutation at compile time for the chosen dimensionality. That would come with zero runtime overhead.
Additional terms in sums like this can also be #ifdefd out.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds like a good strategy. I actually had already started that, but I missed that it should be constexpr
Thanks for the suggestion!
ax3l
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks a lot!
Formula-wise, I only glimpsed for obvious mistakes and cannot spot any.
Since @RemiLehe is still outstanding, if you like to explore a way to make the 2D/3D code more compact then feel free to push another update. Otherwise ok with me for now :)
|
Discussed on Slack: we will already merge this and potential revisions will be addressed in the coming week. |
* Add Python Wrappers for F,G in PML (BLAST-WarpX#2481) * Add Python Wrappers for F,G in PML * Add Getters for F,G Nodal Flags * Fix Bug in <F,G>FPPMLWrapper (Default Level) * Fix Bug in F,G Nodal Flags * Use GetPML Method for F,G Nodal Flags * PICMI: Add max_grid_size, blocking_factor in (x,y,z) (BLAST-WarpX#2524) * PICMI: Add amr.max_grid_size_<x,y,z> * Set All Flags in Python * PICMI: Add amr.blocking_factor_<x,y,z> * added wrappers to get particle structs for the particles in the boundary buffers (BLAST-WarpX#2498) * Doxygen: Fix Docs (BLAST-WarpX#2526) * Fix Bug with Tilebox for G in PML (BLAST-WarpX#2527) * Fix Bug with Tilebox for G in PML * Reset Benchmark * AMReX/PICSAR: Weekly Update (BLAST-WarpX#2533) Weekly update to latest AMReX. Weekly update to latest PICSAR (no changes). ``` ./Tools/Release/updatePICSAR.py ./Tools/Release/updateAMReX.py ``` * Install pre-commit (BLAST-WarpX#2532) * Add pre-commit Add basis for automated pre-commit checks. Install locally via: ```bash python3 -m pip install -U pre-commit pre-commit install ``` See: https://pre-commit.com * Cleanup: Whitespaces * Cleanup: requirements.txt order * Summit: Update Numpy Hints (BLAST-WarpX#2535) Make sure `numpy` can be rebuilt when and were needed. To achieve that, move numpy-specific installation hints on OpenBLAS to the WarpX profile. * Fix some issues with Fujitsu compiler (BLAST-WarpX#2529) * make some code compilable with Fujitsu compiler in clang mode * update documentation * Fix BLAST-WarpX#2522: Gaussian beam positions do not change with warpx.random_seed (BLAST-WarpX#2523) * Draw Gaussian beam position with amrex random engine * Update benchmarks * Update tolerance in space-charge tests * Update benchmark for space charge initialization test * Update benchmarks * Update benchmark * Clean-up code * Update benchmarks * BLAST-WarpX#2534: Don't access position vector values beyond the configured dimension (BLAST-WarpX#2536) * BLAST-WarpX#2534: Don't access position vector values beyond the configured dimension * Fix particle position component used in XZ configuration * Handle 1D case * Move values only used in scraping function into inside-boundary condition * Error out if scraping from EB in RZ * Spack Development: macOS & GNUmake (BLAST-WarpX#2545) - Add macOS hints for OpenMP - Add hints for running GNUmake regression tests locally * Regression Tests: OMP on (BLAST-WarpX#2548) We generally run only with one OpenMP threads at the moment, but disabling OpenMP altogether causes an extra compile, which slows down CI. * Tests: numthreads to 1 (BLAST-WarpX#2546) * Tests: numthreads to 1 We already hack this option to read `numthreads = 1` already for benchmarks, thus we remove the confusing other values now. * Prepare for CI: Do not Overwrite `numthreads` * std::ifstream: Defensive Patterns (BLAST-WarpX#2547) Add failure handling if inputs in `std::ifstream`s cannot be opened or have problems seek-ing through them. This should catch I/O errors early. * openPMD: 0.14.3 (BLAST-WarpX#2551) Automatically copy and compile openPMD-api 0.14.3, but still supporting the 0.14.2+ range (BLAST-WarpX#2150). The 0.14.3 release solves ABI incompatibilities in C++14/17 mixed builds, among other issues (mainly read). * Add Ar and Xe to pre-defined particle types. (BLAST-WarpX#2549) * Added Ar and Xe to pre-defined particle types * Added Boltzmann's constant to warpx parser * Updated documentation * 2D EM solver with EB (BLAST-WarpX#2401) * adding the FieldProbe * adding missing file * updating makefile * fixing host-device problem * Revert "fixing host-device problem" This reverts commit 801e6fc. * fixing host-device problem * making some variables const * adding a few comments * Adding the FieldProbe to the documentation * making the probe mpi-safe * added field probe to reduced diag test * added field probe to reduced diag analysis * using cell-centered fields in probe diag * removed a few typos * Interpolating to the point instead oof cell center * bug fix * improved a comment * updated documentation * Undone an outdated change * improving some variable names * improving the box extraction * making the interpolation order an input parameter * fix a typo * setting the field values to zero if the point is not in the domain * skipping the communication if probe proc is IO prcessor * Fixed typo in documentation Co-authored-by: Neïl Zaim <[email protected]> * Updating an header * Added a comment on the probe position * tidying up the analysis script * fixed a comment * removing an unused include * improving the parsing of parameters * fixing some comments * making some variables const * changed some ParticleReal into Real * using better tags in MPI communication * Making field probe work in 2D * making a variable const * initializing y_probe only in 3D * tidying up a line which is common to 2D and 3D * making a variable constexpr * adding a _rt * checking that the probe location is in one of the processors * removing a useless if condition * Fixing the initialization in 2D * Avoiding scrape particles in 2D (it segfaults) * Adding a test for 2D EB * Fixed the areas initialization * Initializing to zero some multifabs * Modified the ECT solver to make it work in 2D * Modified the cell extensions to make them work in 2D * Improved 2D cube test * Added 2D rotated cube test * Adding the 2d analysis script and CI * Removed an unused import from the analysis script * Ignoring some unused variables * Fixing the number of dimensions in the 2d test * Added missing analysis for ECT * Enabled again 2d particles scraping * Fixing the test_name with the general logic * Fixing the test_name with the general logic * Removed some commented code * Modified several preprocessor directives to check consistency EB-dimension * Added missing semicolons * Fixed a preprocessor directivew * Fix typo: WARPX_DIM_XZ * Improving some comments Co-authored-by: Axel Huebl <[email protected]> * Adding some more consistency checks * Adding some more consistency checks * Fixed a typo Co-authored-by: Neïl Zaim <[email protected]> Co-authored-by: Axel Huebl <[email protected]> * Fix Instability in PML with PSATD (BLAST-WarpX#2558) * Fix Instability in PML with PSATD Damping in PML should be applied before the communications between the regular grids and PML, and between PML grids take place, otherwise the ghost cells are filled with lagged information, which results in an instability. Closes BLAST-WarpX#2525. * Update checksum of the pml_psatd_dive_divb_cleaning test * Bugfix in load balancing routine (BLAST-WarpX#2555) * add remake of phi_fp during load balancing RemakeLevel * added phi_cp remake to RemakeLevel function * revert changes from previous commit * I/O performance hints for Summit (BLAST-WarpX#2495) * Fix conflict with upstream * Apply suggestions from code review * Remove space in the end of lines * Include suggestions from PR review * Generalize ROMIO Hints in Batch Scripts * Fix Comment * Fix Comment * Remove duplication * Formatting Co-authored-by: Axel Huebl <[email protected]> * AMReX/PICSAR: Weekly Update (BLAST-WarpX#2559) * AMReX: Weekly Update * PICSAR: Weekly Update * Docs: Fix .rst Label in PML, rm .tex (BLAST-WarpX#2537) Fix an auto-converted label in a `.rst` file for the manual. Remove the `PML.tex` file. * Add 2D circle EB test (BLAST-WarpX#2538) * Added embedded_circle test * Add embedded_circle test files * Removed diag files * removed PICMI input file * Update to use default regression analysis * Added line breaks for spacing * Added description * Fixed benchmark file * Added load balancing to test * Commented out load_balancing portion of test. This will be added back in once load balancing is fixed. Co-authored-by: Axel Huebl <[email protected]> * Fixes to the EB init (BLAST-WarpX#2565) * Avoid code duplications in ECT face extension (BLAST-WarpX#2557) * Refactoring the nborrow functions * Refactoring the one cell extension * Refactoring the eight cells extension * Enabling 2D * Bug fix * Some more improvements * Fixing templates * Switching the order of templates and AMREX_GPU_DEVICE * Adding the needed AMREX_GPU_DEVICE in WarpX.H * Fixing GPU related issues * Fixed a for loop bound * Making the new functions free * Suggestion from review * Suggestion from review Co-authored-by: Axel Huebl <[email protected]> * Suggestion from review Co-authored-by: Axel Huebl <[email protected]> * Improve loops over dimensions for 2D Co-authored-by: Axel Huebl <[email protected]> * Enhanced inline documentation of EB related data (BLAST-WarpX#2562) * Enhanced inline documentation of EB related data * Added ECT to the glossary * Made the EB documentation doxygen-compatible * Clean up input files for tests with MCC (BLAST-WarpX#2552) * Added embedded_circle test * Add embedded_circle test files * Removed diag files * removed PICMI input file * Update to use default regression analysis * Added line breaks for spacing Co-authored-by: Axel Huebl <[email protected]> * Added description * Added Ar and Xe to pre-defined particle types * added Boltzmann's constant to pre-defined constants and cleaned up the MCC CI test input * Added Boltzmann's constant to warpx parser * cleaned up embedded circle CI test input * Remove duplicate entry. Co-authored-by: kzhu-ME <[email protected]> Co-authored-by: Kevin Z. Zhu <[email protected]> Co-authored-by: Axel Huebl <[email protected]> * Cell Center Macroscopic Properties (BLAST-WarpX#2530) * Cell Center Macroscopic Properties * Commit Suggestions from PR Review * Fix Error for 2D Co-authored-by: Edoardo Zoni <[email protected]> * added superLU solver example to docs (BLAST-WarpX#2567) * Fix: GNUmake Python Link -g (BLAST-WarpX#2568) On CPU links of the GNUmake Python lib, we forgot our `-g`, which we add to all build and optimization types. THis is part of the `LINKFLAGS` variable. * Apply PEC to Split PML Fields (BLAST-WarpX#2541) * WarpXMovingWindow.cpp: Add `amrex::` Prefix (BLAST-WarpX#2579) * Bug fixes and cleanup in load balancing (BLAST-WarpX#2563) * added helper function to rebuild MultiFabs and iMultiFabs during load balancing and included rebuilding of EB multifabs * added redistribute call for the particle boundary buffer during load balancing * consistently use DistribtionMap rather than dmap in ElectrostaticSolver.cpp * applied suggested changes from code review by Phil Miller * removed default argument for redistribute in RemakeMultiFab * removed RemakeMultiFab() as a member of WarpX * Only remake EB multifabs if they are used Co-authored-by: Lorenzo Giacomel <[email protected]> * adapted existing particle scraping test (PICMI version) to also cover the redistribution of particle buffers from load balancing * added redeclaring of m_borrowing * Move redeclaring of m_borrow inside if statement for ECT solver algorihtm Co-authored-by: Lorenzo Giacomel <[email protected]> * added calls to MarkCells and ComputeFaceExtensions * fixed issue causing CI test to fail and copied conditionals from WarpXInitData.cpp to recompute EB quantities * Guard cells communication for EB data when re-gridding (#105) * Add 2D circle EB test (BLAST-WarpX#2538) * Added embedded_circle test * Add embedded_circle test files * Removed diag files * removed PICMI input file * Update to use default regression analysis * Added line breaks for spacing * Added description * Fixed benchmark file * Added load balancing to test * Commented out load_balancing portion of test. This will be added back in once load balancing is fixed. Co-authored-by: Axel Huebl <[email protected]> * Added guard cells communication for EB data in regridding Co-authored-by: Kevin Z. Zhu <[email protected]> Co-authored-by: Axel Huebl <[email protected]> * moved all EB grid data calculations to a new function InitializeEBGridData() which is now called by both WarpX::InitLevelData and WarpX::RemakeLevel * Fix typo in doc string. Co-authored-by: Phil Miller <[email protected]> Co-authored-by: Lorenzo Giacomel <[email protected]> Co-authored-by: Kevin Z. Zhu <[email protected]> Co-authored-by: Axel Huebl <[email protected]> Co-authored-by: Phil Miller <[email protected]> * WarpXComm.cpp: Use Explicit Types, not `auto` (BLAST-WarpX#2578) * WarpXComm.cpp: Use Explicit Types, not `auto` * Use MultiFab* const instead of MultiFab* const& * Add WARPX_PROFILE calls to each python callback. (BLAST-WarpX#2573) When python callbacks take some time, this is useful as otherwise many callbacks are lumped together in WarpX::Evolve::step. * LaserInjectionFromTXYEFile Test: Use MPI (BLAST-WarpX#2577) * WarpX tests: All MPI Enable MPI for the one regression test that does not use it. Still uses one rank there. This saves a compile per CI run. * add numprocs * Bug fix in postprocessing yt data and other small changes (#104) * fixed bug in post-processing of field diagnostic yt data * fixed issue causing post processing of field diagnostics unit test to fail * added helper function to rebuild MultiFabs and iMultiFabs during load balancing and included rebuilding of EB multifabs * added redistribute call for the particle boundary buffer during load balancing * consistently use DistribtionMap rather than dmap in ElectrostaticSolver.cpp * applied suggested changes from code review by Phil Miller * removed default argument for redistribute in RemakeMultiFab * added load balance intervals as an optional input parameter to diode_setup.py * removed RemakeMultiFab() as a member of WarpX * Only remake EB multifabs if they are used Co-authored-by: Lorenzo Giacomel <[email protected]> * changed plot_contours grid setting parameter from b to visible in accordance with matplotlib 3.5 changes * Revert change to WarpXRegrid.cpp * Suggested change from PS during code review Co-authored-by: Peter Scherpelz <[email protected]> Co-authored-by: Lorenzo Giacomel <[email protected]> Co-authored-by: Peter Scherpelz <[email protected]> Co-authored-by: Edoardo Zoni <[email protected]> Co-authored-by: Axel Huebl <[email protected]> Co-authored-by: Luca Fedeli <[email protected]> Co-authored-by: Remi Lehe <[email protected]> Co-authored-by: Phil Miller <[email protected]> Co-authored-by: Kevin Z. Zhu <[email protected]> Co-authored-by: Lorenzo Giacomel <[email protected]> Co-authored-by: Neïl Zaim <[email protected]> Co-authored-by: Weiqun Zhang <[email protected]> Co-authored-by: Jean Luca Bez <[email protected]> Co-authored-by: kzhu-ME <[email protected]> Co-authored-by: Revathi Jambunathan <[email protected]> Co-authored-by: Phil Miller <[email protected]> Co-authored-by: Peter Scherpelz <[email protected]>
* adding the FieldProbe * adding missing file * updating makefile * fixing host-device problem * Revert "fixing host-device problem" This reverts commit 801e6fc. * fixing host-device problem * making some variables const * adding a few comments * Adding the FieldProbe to the documentation * making the probe mpi-safe * added field probe to reduced diag test * added field probe to reduced diag analysis * using cell-centered fields in probe diag * removed a few typos * Interpolating to the point instead oof cell center * bug fix * improved a comment * updated documentation * Undone an outdated change * improving some variable names * improving the box extraction * making the interpolation order an input parameter * fix a typo * setting the field values to zero if the point is not in the domain * skipping the communication if probe proc is IO prcessor * Fixed typo in documentation Co-authored-by: Neïl Zaim <[email protected]> * Updating an header * Added a comment on the probe position * tidying up the analysis script * fixed a comment * removing an unused include * improving the parsing of parameters * fixing some comments * making some variables const * changed some ParticleReal into Real * using better tags in MPI communication * Making field probe work in 2D * making a variable const * initializing y_probe only in 3D * tidying up a line which is common to 2D and 3D * making a variable constexpr * adding a _rt * checking that the probe location is in one of the processors * removing a useless if condition * Fixing the initialization in 2D * Avoiding scrape particles in 2D (it segfaults) * Adding a test for 2D EB * Fixed the areas initialization * Initializing to zero some multifabs * Modified the ECT solver to make it work in 2D * Modified the cell extensions to make them work in 2D * Improved 2D cube test * Added 2D rotated cube test * Adding the 2d analysis script and CI * Removed an unused import from the analysis script * Ignoring some unused variables * Fixing the number of dimensions in the 2d test * Added missing analysis for ECT * Enabled again 2d particles scraping * Fixing the test_name with the general logic * Fixing the test_name with the general logic * Removed some commented code * Modified several preprocessor directives to check consistency EB-dimension * Added missing semicolons * Fixed a preprocessor directivew * Fix typo: WARPX_DIM_XZ * Improving some comments Co-authored-by: Axel Huebl <[email protected]> * Adding some more consistency checks * Adding some more consistency checks * Fixed a typo Co-authored-by: Neïl Zaim <[email protected]> Co-authored-by: Axel Huebl <[email protected]>
With this PR we adapt the EB initialization routines to make them work also in 2D (XZ).
Todo
This PR is supposed to fix #2390