Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 40b3d21
Author: Weiqun Zhang <WeiqunZhang@lbl.gov>
Date:   Wed Jul 13 13:24:15 2022 -0700

    Add extra braces in initialization of GpuArray (AMReX-Codes#2876)

    It should not be needed since C++14.  But some compilers seem to need the
    double braces.

commit a633d2b
Author: Luca Fedeli <luca.fedeli@cea.fr>
Date:   Fri Jul 8 20:34:18 2022 +0200

    Workaround to bypass issue observed at very large scale with Fujitsu MPI (AMReX-Codes#2874)

    We have observed some MPI issues at very large scale when WarpX is compiled using Fujitsu MPI (i.e., with the Fujitsu compiler). These issues seem to be related to the use of MPI Gatherv with MPI_Datatype. This PR implements a possible workaround, initially proposed by @WeiqunZhang . The idea is that, when WarpX is compiled with the Fujitsu compiler, simpler integer arrays instead of MPI_Datatype are used in the routine where the issue was observed.

commit 7660c88
Author: Weiqun Zhang <WeiqunZhang@lbl.gov>
Date:   Fri Jul 8 08:48:14 2022 -0700

    Allow zero components MultiFab and BaseFab (AMReX-Codes#2873)

    This is useful for particle I/O that does not have any mesh data.  yt needs
    a header file associated with a MultiFab.

commit c849dd1
Author: Weiqun Zhang <WeiqunZhang@lbl.gov>
Date:   Fri Jul 8 08:06:37 2022 -0700

    New EB optimization parameter: eb2.num_coarsen_opt (AMReX-Codes#2872)

    At the beginning of EB generation, we chop the entire finest domain into
    boxes and find out the type of the boxes.  We then collect the completely
    covered boxes and cut boxes into two BoxArrays.  This process can be costly
    because of the number of calls to the implicit functions.  In this commit,
    we have introduced a new ParmParse parameter, eb2.num_coarsen_opt with a
    default value of zero.  If for instance it is set to 3, we start the box
    type categorization at a resolution that is coarsened by a factor of 2^3.
    For the provisional cut boxes, we refine them by a factor of 2, Then we chop
    them into small boxes and categorize the new boxes.  This process is
    performed recursively until we are at the original finest resolution.

    The users should be aware that, if eb2.num_coaren_opt is too big, this could
    produce in erroneous results because evaluating the implicit function on
    coarse boxes could miss fine structures in the EB.

    Thank Robert Marskar for sharing this algorithm.

commit 557aae8
Author: Erik <epalmer@lbl.gov>
Date:   Wed Jul 6 08:54:24 2022 -0700

    point to new location of AMReX images, AMReX website repo (AMReX-Codes#2867)

commit cbdc658
Author: Axel Huebl <axel.huebl@plasma.ninja>
Date:   Tue Jul 5 01:41:03 2022 +0200

    SENSEI 4.0: Fix Build for Particles (AMReX-Codes#2869)

    ## Summary

    This part causes a compile error now in WarpX.

    cc  @burlen @kwryankrattiger

    ## Additional background

    X-ref: Blocks WarpX 22.07 release ECP-WarpX/WarpX#3211

    Follow-up to:
    - AMReX-Codes#2785
    - AMReX-Codes#2834

commit dc8b734
Author: Andrew Myers <atmyers2@gmail.com>
Date:   Fri Jul 1 17:19:20 2022 -0700

    Cache the neighbor comm tags for the CPU implementation of fillNeighbors. (AMReX-Codes#2862)

    * Cache the neighbor comm tags for the CPU implementation of fillNeighbors.

    * fix areMasksValid function

commit 2b42fb5
Author: drangara <69211175+drangara@users.noreply.github.com>
Date:   Fri Jul 1 18:44:35 2022 -0400

    Remove some hard checks in check_mvmc for 3D (AMReX-Codes#2864)

    Removing some hard checks in 3D coarsening logic as it appears that those are not necessarily bad states, and a soft failure to coarsen should suffice.

commit 19c7068
Author: Erik <epalmer@lbl.gov>
Date:   Fri Jul 1 18:24:24 2022 -0400

    Carry over fix for ngbxy.smallEnd typo (AMReX-Codes#2868)

    This a typo that got correct in other places but didn't get fixed here.

commit d736ef2
Author: Weiqun Zhang <WeiqunZhang@lbl.gov>
Date:   Fri Jul 1 11:00:15 2022 -0700

    Update CHANGES for 22.07 (AMReX-Codes#2866)

commit be813d0
Author: Weiqun Zhang <WeiqunZhang@lbl.gov>
Date:   Fri Jul 1 10:29:13 2022 -0700

    Hypre: add version check (AMReX-Codes#2865)

    These HYPRE_SetSp* are only available in hypre >= 22500.

commit 8fb23ec
Author: Jon Rood <jon.rood@nrel.gov>
Date:   Wed Jun 29 16:52:35 2022 -0600

    Refactor Make.nrel to use MPT for MPI with the Intel compiler on Eagle. (AMReX-Codes#2861)

commit 6f9a46c
Author: PaulMullowney <60452402+PaulMullowney@users.noreply.github.com>
Date:   Wed Jun 29 11:09:57 2022 -0600

    Adding control APIs and namespacing for core algorithm paths like SpGEMM, SpMV, and SpTrans. (AMReX-Codes#2859)

    Co-authored-by: Paul Mullowney <Paul.Mullowney@nrel.gov>

commit e4c83cf
Author: Jon Rood <jon.rood@nrel.gov>
Date:   Wed Jun 29 11:08:42 2022 -0600

    Add lib64 library location for ZFP since it may exist there instead of lib. (AMReX-Codes#2860)

commit b2b9150
Author: Burlen Loring <bloring@lbl.gov>
Date:   Tue Jun 28 13:42:41 2022 -0700

    update the SENSEI in situ coupling for SENSEI v4.0.0 (AMReX-Codes#2785)

    In this release, an install of VTK is no longer required.
    To compile AMReX w/ SENSEI use:

    ```cmake
    -DAMReX_SENSEI=ON -DSENSEI_DIR=<path to SENSEI install>/<lib dir>/cmake
    ```

    Note: <lib dir> may be `lib` or `lib64` or something else depending on
    your OS and is determined by CMake at configure time. See the CMake
    GNUInstallDirs documentation for more information.

commit 2c5f475
Author: Andrew Myers <atmyers2@gmail.com>
Date:   Tue Jun 28 12:51:19 2022 -0700

    Write runtime attribs to checkpoints on GPUs (AMReX-Codes#2856)

commit d2cb546
Author: Jon Rood <jon.rood@nrel.gov>
Date:   Tue Jun 28 13:27:02 2022 -0600

    Fix gnu make on Crusher for mpi_gtl_hsa (AMReX-Codes#2857)

    Update environment variable at OLCF for mpi_gtl_hsa.

commit 21fe4b3
Author: Axel Huebl <axel.huebl@plasma.ninja>
Date:   Tue Jun 28 19:53:09 2022 +0200

    CMake: FindDependency CUDAToolkit (AMReX-Codes#2849)

    If we install AMReX with CUDA support using a modern
    CMake, we need to repopulate targets such as `CUDA::curand`
    from `find_dependency` for downstream.
    Downstream users find us via `find_package` and that target
    link dependency showed up to be unpopulated in MFIX.

commit 027f2ff
Author: Weiqun Zhang <WeiqunZhang@lbl.gov>
Date:   Thu Jun 23 16:15:57 2022 -0700

    Fix make help (AMReX-Codes#2854)

    This reverts the change in AMReX-Codes#2845, which fixed an issue with `make print-%`, but broke
    `make help`.  This is now fixed in a different way.  Both `make print-%` and `make help`
    should work now.

commit 3d3ad21
Author: kngott <kngott@lbl.gov>
Date:   Thu Jun 23 13:39:59 2022 -0700

    NERSC Programming Environment prototype (AMReX-Codes#2848)

commit 4872676
Author: Weiqun Zhang <WeiqunZhang@lbl.gov>
Date:   Thu Jun 23 12:41:20 2022 -0700

    GNU Make: No need to query mpif90 if Fortran is not used. (AMReX-Codes#2852)

    This minimize potential issues.

commit fc0d646
Author: Weiqun Zhang <WeiqunZhang@lbl.gov>
Date:   Thu Jun 23 12:23:55 2022 -0700

    Remove f90doc (AMReX-Codes#2851)

    We no longer use it.

commit 5188a6a
Author: Weiqun Zhang <WeiqunZhang@lbl.gov>
Date:   Thu Jun 23 11:09:15 2022 -0700

    Explicitly invoke python3 (AMReX-Codes#2850)

    According to PEP 394, a python distributor may choose to not provide the
    python command.  In fact, that's what recent versions of macOS do.

commit 2d931f6
Author: Andrew Myers <atmyers2@gmail.com>
Date:   Wed Jun 22 15:03:50 2022 -0500

    Maintain the high end of the 'roundoff domain' in both float and double precision (AMReX-Codes#2839)

    * Maintain the high end of the 'roundoff domain' in both float and double precision

    * fix shadowing

    * fix warning

    * fix float conversion warning

    * fix logic

    * Update Src/Base/AMReX_Geometry.H

    * Update Src/Base/AMReX_Geometry.H
  • Loading branch information
atmyers committed Nov 2, 2022
1 parent af5d227 commit 4d9bf4c
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
1 change: 1 addition & 0 deletions Src/Base/AMReX_Geometry.H
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ public:
return roundoff_lo_d;
#endif
}

GpuArray<ParticleReal,AMREX_SPACEDIM> ProbHiArrayInParticleReal () const noexcept {
#ifdef AMREX_SINGLE_PRECISION_PARTICLES
return roundoff_hi_f;
Expand Down
1 change: 0 additions & 1 deletion Src/EB/AMReX_EB2.H
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ void Build (const Geometry& geom,
bool extend_domain_face = ExtendDomainFace(),
int num_coarsen_opt = NumCoarsenOpt());


void BuildFromChkptFile (std::string const& fname,
const Geometry& geom,
int required_coarsening_level,
Expand Down
2 changes: 1 addition & 1 deletion Src/Particle/AMReX_ParticleUtil.H
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ bool enforcePeriodic (P& p,
}
// clamp to avoid precision issues;
if (p.pos(idim) > rhi[idim]) {
p.pos(idim) = rhi[idim];
p.pos(idim) = static_cast<ParticleReal>(rhi[idim]);
}
shifted = true;
}
Expand Down

0 comments on commit 4d9bf4c

Please sign in to comment.