aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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--cmake/dependencies/AMReX.cmake4
-rw-r--r--cmake/dependencies/PICSAR.cmake4
-rwxr-xr-xrun_test.sh2
-rw-r--r--setup.py2
11 files changed, 14 insertions, 14 deletions
diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml
index 2e5c6c9a1..d376a3b1d 100644
--- a/.github/workflows/cuda.yml
+++ b/.github/workflows/cuda.yml
@@ -78,7 +78,7 @@ jobs:
which nvcc || echo "nvcc not in PATH!"
git clone https://github.com/AMReX-Codes/amrex.git ../amrex
- cd amrex && git checkout --detach 89153db246e4193526210363bf5a0f1719ea40c3 && cd -
+ cd amrex && git checkout --detach 22.02 && cd -
make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_PSATD=TRUE -j 2
build_nvhpc21-9-nvcc:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ff2d64ad..18bdba935 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
# Preamble ####################################################################
#
cmake_minimum_required(VERSION 3.18.0)
-project(WarpX VERSION 22.01)
+project(WarpX VERSION 22.02)
include(${WarpX_SOURCE_DIR}/cmake/WarpXFunctions.cmake)
diff --git a/Docs/source/conf.py b/Docs/source/conf.py
index 33655d5e8..4921d28a9 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.01'
+version = u'22.02'
# The full version, including alpha/beta/rc tags.
-release = u'22.01'
+release = u'22.02'
# 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 2cb938cbb..2f02d20b0 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-WarpX v22.01 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.02 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 f4b38ebc2..fbf680d7a 100644
--- a/Python/setup.py
+++ b/Python/setup.py
@@ -54,7 +54,7 @@ else:
package_data = {}
setup(name = 'pywarpx',
- version = '22.01',
+ version = '22.02',
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 f92abd4ad..d91587504 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 = 89153db246e4193526210363bf5a0f1719ea40c3
+branch = 22.02
[source]
dir = /home/regtester/git/WarpX
diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini
index eb05945ee..a19da31dd 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 = 89153db246e4193526210363bf5a0f1719ea40c3
+branch = 22.02
[source]
dir = /home/regtester/AMReX_RegTesting/warpx
diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake
index b7b69a947..d7b6822fb 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.01 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIM} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} TINYP LSOLVERS)
+ find_package(AMReX 22.02 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 "89153db246e4193526210363bf5a0f1719ea40c3"
+set(WarpX_amrex_branch "22.02"
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 37c40c455..0f1244388 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.01 CONFIG REQUIRED QED)
+ #find_package(PICSAR 22.02 CONFIG REQUIRED QED)
#message(STATUS "PICSAR: Found version '${PICSAR_VERSION}'")
message(FATAL_ERROR "PICSAR: Cannot be used as externally installed "
"library yet. "
@@ -103,7 +103,7 @@ if(WarpX_QED)
set(WarpX_picsar_repo "https://github.com/ECP-WarpX/picsar.git"
CACHE STRING
"Repository URI to pull and build PICSAR from if(WarpX_picsar_internal)")
- set(WarpX_picsar_branch "7b5449f92a4b30a095cc4a67f0a8b1fc69680e15"
+ set(WarpX_picsar_branch "15651b072cd9a45a5a5061d8cf7b928d136e39f3"
CACHE STRING
"Repository branch for WarpX_picsar_repo if(WarpX_picsar_internal)")
diff --git a/run_test.sh b/run_test.sh
index 878d3fb75..2cb03b667 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 89153db246e4193526210363bf5a0f1719ea40c3 && cd -
+cd amrex && git checkout --detach 22.02 && 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 81b246ad4..d087e8a77 100644
--- a/setup.py
+++ b/setup.py
@@ -253,7 +253,7 @@ with open('./requirements.txt') as f:
setup(
name='pywarpx',
# note PEP-440 syntax: x.y.zaN but x.y.z.devN
- version = '22.01',
+ version = '22.02',
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.',