aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/cuda.yml2
-rw-r--r--CMakeLists.txt2
-rw-r--r--Docs/source/conf.py4
-rw-r--r--LICENSE.txt2
-rw-r--r--Python/setup.py2
-rw-r--r--Regression/WarpX-GPU-tests.ini2
-rw-r--r--Regression/WarpX-tests.ini2
-rw-r--r--Source/FieldSolver/ElectrostaticSolver.cpp5
-rw-r--r--cmake/dependencies/AMReX.cmake4
-rw-r--r--cmake/dependencies/PICSAR.cmake2
-rwxr-xr-xrun_test.sh2
-rw-r--r--setup.py2
12 files changed, 17 insertions, 14 deletions
diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml
index 4dd0ceadd..6cd07be36 100644
--- a/.github/workflows/cuda.yml
+++ b/.github/workflows/cuda.yml
@@ -106,7 +106,7 @@ jobs:
which nvcc || echo "nvcc not in PATH!"
git clone https://github.com/AMReX-Codes/amrex.git ../amrex
- cd amrex && git checkout --detach 329f81b889a6ece31c67b1b70f207d6c6b2463b6 && cd -
+ cd amrex && git checkout --detach 22.05 && cd -
make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_PSATD=TRUE USE_CCACHE=TRUE -j 2
build_nvhpc21-11-nvcc:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72eae577a..147afd3ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
# Preamble ####################################################################
#
cmake_minimum_required(VERSION 3.18.0)
-project(WarpX VERSION 22.04)
+project(WarpX VERSION 22.05)
include(${WarpX_SOURCE_DIR}/cmake/WarpXFunctions.cmake)
diff --git a/Docs/source/conf.py b/Docs/source/conf.py
index ec8f40585..1eaa61fe4 100644
--- a/Docs/source/conf.py
+++ b/Docs/source/conf.py
@@ -71,9 +71,9 @@ author = 'WarpX collaboration'
# built documents.
#
# The short X.Y version.
-version = u'22.04'
+version = u'22.05'
# The full version, including alpha/beta/rc tags.
-release = u'22.04'
+release = u'22.05'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/LICENSE.txt b/LICENSE.txt
index 7e8f7cd3f..149aeec14 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-WarpX v22.04 Copyright (c) 2018-2022, The Regents of the University of California, through Lawrence Berkeley National Laboratory, and Lawrence Livermore National Security, LLC, for the operation of Lawrence Livermore National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy). All rights reserved.
+WarpX v22.05 Copyright (c) 2018-2022, The Regents of the University of California, through Lawrence Berkeley National Laboratory, and Lawrence Livermore National Security, LLC, for the operation of Lawrence Livermore National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy). All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
diff --git a/Python/setup.py b/Python/setup.py
index 734ebb0b9..ac230c573 100644
--- a/Python/setup.py
+++ b/Python/setup.py
@@ -54,7 +54,7 @@ else:
package_data = {}
setup(name = 'pywarpx',
- version = '22.04',
+ version = '22.05',
packages = ['pywarpx'],
package_dir = {'pywarpx': 'pywarpx'},
description = """Wrapper of WarpX""",
diff --git a/Regression/WarpX-GPU-tests.ini b/Regression/WarpX-GPU-tests.ini
index 08ccb20a3..aa2c4bdb7 100644
--- a/Regression/WarpX-GPU-tests.ini
+++ b/Regression/WarpX-GPU-tests.ini
@@ -60,7 +60,7 @@ emailBody = Check https://ccse.lbl.gov/pub/GpuRegressionTesting/WarpX/ for more
[AMReX]
dir = /home/regtester/git/amrex/
-branch = 329f81b889a6ece31c67b1b70f207d6c6b2463b6
+branch = 22.05
[source]
dir = /home/regtester/git/WarpX
diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini
index 946794ee4..cf07e0e8a 100644
--- a/Regression/WarpX-tests.ini
+++ b/Regression/WarpX-tests.ini
@@ -59,7 +59,7 @@ emailBody = Check https://ccse.lbl.gov/pub/RegressionTesting/WarpX/ for more det
[AMReX]
dir = /home/regtester/AMReX_RegTesting/amrex/
-branch = 329f81b889a6ece31c67b1b70f207d6c6b2463b6
+branch = 22.05
[source]
dir = /home/regtester/AMReX_RegTesting/warpx
diff --git a/Source/FieldSolver/ElectrostaticSolver.cpp b/Source/FieldSolver/ElectrostaticSolver.cpp
index 19615a04f..c2ec7d591 100644
--- a/Source/FieldSolver/ElectrostaticSolver.cpp
+++ b/Source/FieldSolver/ElectrostaticSolver.cpp
@@ -333,6 +333,7 @@ WarpX::computePhi (const amrex::Vector<std::unique_ptr<amrex::MultiFab> >& rho,
}
// Define the linear operator (Poisson operator)
MLEBNodeFDLaplacian linop( {geom_scaled[lev]}, {boxArray(lev)}, {DistributionMap(lev)}, info );
+ linop.setSigma({0._rt, 1._rt});
#else
// Set the value of beta
amrex::Array<amrex::Real,AMREX_SPACEDIM> beta_solver =
@@ -370,7 +371,9 @@ WarpX::computePhi (const amrex::Vector<std::unique_ptr<amrex::MultiFab> >& rho,
// With embedded boundary: extract EB info
MLEBNodeFDLaplacian linop( {Geom(lev)}, {boxArray(lev)}, {DistributionMap(lev)}, info, {&WarpX::fieldEBFactory(lev)});
-#ifndef WARPX_DIM_RZ
+#ifdef WARPX_DIM_RZ
+ linop.setSigma({0._rt, 1._rt});
+#else
// Note: this assumes that the beam is propagating along
// one of the axes of the grid, i.e. that only *one* of the Cartesian
// components of `beta` is non-negligible.
diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake
index 845d4440c..b5f8511c6 100644
--- a/cmake/dependencies/AMReX.cmake
+++ b/cmake/dependencies/AMReX.cmake
@@ -223,7 +223,7 @@ macro(find_amrex)
endif()
set(COMPONENT_PRECISION ${WarpX_PRECISION} P${WarpX_PRECISION})
- find_package(AMReX 22.04 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIM} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} TINYP LSOLVERS)
+ find_package(AMReX 22.05 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIM} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} TINYP LSOLVERS)
message(STATUS "AMReX: Found version '${AMReX_VERSION}'")
endif()
endmacro()
@@ -237,7 +237,7 @@ set(WarpX_amrex_src ""
set(WarpX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
CACHE STRING
"Repository URI to pull and build AMReX from if(WarpX_amrex_internal)")
-set(WarpX_amrex_branch "329f81b889a6ece31c67b1b70f207d6c6b2463b6"
+set(WarpX_amrex_branch "22.05"
CACHE STRING
"Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
diff --git a/cmake/dependencies/PICSAR.cmake b/cmake/dependencies/PICSAR.cmake
index ffb2c2202..fe66ee102 100644
--- a/cmake/dependencies/PICSAR.cmake
+++ b/cmake/dependencies/PICSAR.cmake
@@ -82,7 +82,7 @@ function(find_picsar)
#message(STATUS "PICSAR: Using version '${PICSAR_VERSION}'")
else()
# not supported by PICSAR (yet)
- #find_package(PICSAR 22.04 CONFIG REQUIRED QED)
+ #find_package(PICSAR 22.05 CONFIG REQUIRED QED)
#message(STATUS "PICSAR: Found version '${PICSAR_VERSION}'")
message(FATAL_ERROR "PICSAR: Cannot be used as externally installed "
"library yet. "
diff --git a/run_test.sh b/run_test.sh
index ea4477f9a..764b5863c 100755
--- a/run_test.sh
+++ b/run_test.sh
@@ -70,7 +70,7 @@ python3 -m pip install --upgrade -r warpx/Regression/requirements.txt
# Clone AMReX and warpx-data
git clone https://github.com/AMReX-Codes/amrex.git
-cd amrex && git checkout --detach 329f81b889a6ece31c67b1b70f207d6c6b2463b6 && cd -
+cd amrex && git checkout --detach 22.05 && cd -
# warpx-data contains various required data sets
git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git
diff --git a/setup.py b/setup.py
index 7e6f6bf0d..81757ab51 100644
--- a/setup.py
+++ b/setup.py
@@ -270,7 +270,7 @@ with open('./requirements.txt') as f:
setup(
name='pywarpx',
# note PEP-440 syntax: x.y.zaN but x.y.z.devN
- version = '22.04',
+ version = '22.05',
packages = ['pywarpx'],
package_dir = {'pywarpx': 'Python/pywarpx'},
author='Jean-Luc Vay, David P. Grote, Maxence Thévenet, Rémi Lehe, Andrew Myers, Weiqun Zhang, Axel Huebl, et al.',
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-13 03:07:20 +0000