Skip to content

Commit

Permalink
Merge branch 'development' into pr_rad
Browse files Browse the repository at this point in the history
  • Loading branch information
baperry2 authored Dec 5, 2023
2 parents e760037 + fed0cb7 commit 2054fa3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Submodules/amrex
Submodule amrex updated 38 files
+4 −1 .github/workflows/cleanup-cache-postpr.yml
+8 −5 .github/workflows/cleanup-cache.yml
+1 −0 .github/workflows/codeql.yml
+44 −3 CHANGES
+6 −3 Docs/sphinx_documentation/source/LinearSolvers.rst
+1 −1 Docs/sphinx_documentation/source/conf.py
+1 −1 Src/AmrCore/AMReX_AmrMesh.cpp
+4 −4 Src/AmrCore/AMReX_FillPatcher.H
+2 −2 Src/AmrCore/AMReX_InterpFaceRegister.H
+1 −1 Src/Base/AMReX_BCRec.H
+48 −48 Src/Base/AMReX_BaseFab.H
+6 −6 Src/Base/AMReX_BoxArray.H
+1 −3 Src/Base/AMReX_FArrayBox.H
+62 −60 Src/Base/AMReX_FabArray.H
+6 −0 Src/Base/AMReX_FabArrayBase.H
+41 −45 Src/Base/AMReX_FabConv.H
+53 −43 Src/Base/AMReX_MultiFab.H
+28 −16 Src/Base/AMReX_MultiFabUtil.H
+1 −4 Src/Base/AMReX_MultiFabUtil.cpp
+4 −3 Src/Base/AMReX_OpenMP.cpp
+2 −2 Src/Base/AMReX_iMultiFab.H
+1 −1 Src/EB/AMReX_EB_utils.cpp
+1 −1 Src/F_Interfaces/Base/AMReX_parallel_mod.F90
+39 −29 Src/LinearSolvers/MLMG/AMReX_MLABecLaplacian.H
+3 −6 Src/LinearSolvers/MLMG/AMReX_MLCGSolver.H
+2 −2 Src/LinearSolvers/MLMG/AMReX_MLCellLinOp.H
+9 −4 Src/LinearSolvers/MLMG/AMReX_MLEBABecLap.H
+10 −0 Src/LinearSolvers/MLMG/AMReX_MLEBABecLap.cpp
+1 −1 Src/LinearSolvers/MLMG/AMReX_MLEBNodeFDLaplacian.H
+17 −17 Src/LinearSolvers/MLMG/AMReX_MLLinOp.H
+1 −1 Src/LinearSolvers/MLMG/AMReX_MLMG.H
+4 −4 Src/LinearSolvers/MLMG/AMReX_MLNodeLap_2D_K.H
+1 −1 Src/LinearSolvers/MLMG/AMReX_MLNodeLaplacian.H
+1 −1 Src/LinearSolvers/MLMG/AMReX_MLNodeLaplacian.cpp
+1 −1 Src/LinearSolvers/MLMG/AMReX_MLNodeLinOp.cpp
+14 −24 Src/Particle/AMReX_ParticleIO.H
+1 −5 Src/Particle/AMReX_ParticleUtil.H
+16 −3 Tools/Postprocessing/C_Src/particle_compare.cpp

0 comments on commit 2054fa3

Please sign in to comment.