Skip to content

Commit 6d2d756

Browse files
authored
Release 21.11 (#2518)
* Update: AMReX/PICSAR to 21.11 AMReX is a post 21.11 release, due to a needed bugfix in compGrad with EB that landed 4hrs after release. * WarpX: 21.11
1 parent 957262b commit 6d2d756

File tree

9 files changed

+11
-11
lines changed

9 files changed

+11
-11
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Preamble ####################################################################
22
#
33
cmake_minimum_required(VERSION 3.15.0)
4-
project(WarpX VERSION 21.10)
4+
project(WarpX VERSION 21.11)
55

66
include(${WarpX_SOURCE_DIR}/cmake/WarpXFunctions.cmake)
77

Docs/source/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@
6666
# built documents.
6767
#
6868
# The short X.Y version.
69-
version = u'21.10'
69+
version = u'21.11'
7070
# The full version, including alpha/beta/rc tags.
71-
release = u'21.10'
71+
release = u'21.11'
7272

7373
# The language for content autogenerated by Sphinx. Refer to documentation
7474
# for a list of supported languages.

LICENSE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
WarpX v21.10 Copyright (c) 2018-2021, 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.
1+
WarpX v21.11 Copyright (c) 2018-2021, 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.
22

33

44
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

Python/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
package_data = {}
5555

5656
setup(name = 'pywarpx',
57-
version = '21.10',
57+
version = '21.11',
5858
packages = ['pywarpx'],
5959
package_dir = {'pywarpx': 'pywarpx'},
6060
description = """Wrapper of WarpX""",

Regression/WarpX-GPU-tests.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ emailBody = Check https://ccse.lbl.gov/pub/GpuRegressionTesting/WarpX/ for more
4848

4949
[AMReX]
5050
dir = /home/regtester/git/amrex/
51-
branch = 614b9ebbbf04eb5b4532029ff4a7ae40e6663042
51+
branch = aca6926e0a85a0fad4087bd47016edad0885252f
5252

5353
[source]
5454
dir = /home/regtester/git/WarpX

Regression/WarpX-tests.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ emailBody = Check https://ccse.lbl.gov/pub/RegressionTesting/WarpX/ for more det
4848

4949
[AMReX]
5050
dir = /home/regtester/AMReX_RegTesting/amrex/
51-
branch = 614b9ebbbf04eb5b4532029ff4a7ae40e6663042
51+
branch = aca6926e0a85a0fad4087bd47016edad0885252f
5252

5353
[source]
5454
dir = /home/regtester/AMReX_RegTesting/warpx

cmake/dependencies/AMReX.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ macro(find_amrex)
225225
endif()
226226
set(COMPONENT_PRECISION ${WarpX_PRECISION} P${WarpX_PRECISION})
227227

228-
find_package(AMReX 21.10 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIM} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} TINYP LSOLVERS)
228+
find_package(AMReX 21.11 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIM} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} TINYP LSOLVERS)
229229
message(STATUS "AMReX: Found version '${AMReX_VERSION}'")
230230
endif()
231231
endmacro()
@@ -239,7 +239,7 @@ set(WarpX_amrex_src ""
239239
set(WarpX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
240240
CACHE STRING
241241
"Repository URI to pull and build AMReX from if(WarpX_amrex_internal)")
242-
set(WarpX_amrex_branch "614b9ebbbf04eb5b4532029ff4a7ae40e6663042"
242+
set(WarpX_amrex_branch "aca6926e0a85a0fad4087bd47016edad0885252f"
243243
CACHE STRING
244244
"Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
245245

run_test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ echo "cd $PWD"
5151

5252
# Clone PICSAR, AMReX and warpx-data
5353
git clone https://github.com/AMReX-Codes/amrex.git
54-
cd amrex && git checkout --detach 614b9ebbbf04eb5b4532029ff4a7ae40e6663042 && cd -
54+
cd amrex && git checkout --detach aca6926e0a85a0fad4087bd47016edad0885252f && cd -
5555
# Use QED brach for QED tests
5656
git clone https://github.com/ECP-WarpX/picsar.git
5757
cd picsar && git checkout --detach a78be127f66adc1558f527edc8964e37e3a055ff && cd -

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ def build_extension(self, ext):
253253
setup(
254254
name='pywarpx',
255255
# note PEP-440 syntax: x.y.zaN but x.y.z.devN
256-
version = '21.10',
256+
version = '21.11',
257257
packages = ['pywarpx'],
258258
package_dir = {'pywarpx': 'Python/pywarpx'},
259259
author='Jean-Luc Vay, David P. Grote, Maxence Thévenet, Rémi Lehe, Andrew Myers, Weiqun Zhang, Axel Huebl, et al.',

0 commit comments

Comments
 (0)