Skip to content

Commit 0e80973

Browse files
authored
Release 21.12 (#2614)
* AMReX: 21.12 * PICSAR: 21.12 * WarpX: 21.12
1 parent a72c291 commit 0e80973

File tree

10 files changed

+16
-16
lines changed

10 files changed

+16
-16
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
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.11)
4+
project(WarpX VERSION 21.12)
55

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

Docs/source/conf.py

Lines changed: 2 additions & 2 deletions
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.11'
69+
version = u'21.12'
7070
# The full version, including alpha/beta/rc tags.
71-
release = u'21.11'
71+
release = u'21.12'
7272

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

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
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.
1+
WarpX v21.12 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
package_data = {}
5555

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

Regression/WarpX-GPU-tests.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ emailBody = Check https://ccse.lbl.gov/pub/GpuRegressionTesting/WarpX/ for more
4848

4949
[AMReX]
5050
dir = /home/regtester/git/amrex/
51-
branch = 1d50bfc1c1da79614c853f9823efdf33f9003cc5
51+
branch = 21.12
5252

5353
[source]
5454
dir = /home/regtester/git/WarpX
5555
branch = development
5656

5757
[extra-PICSAR]
5858
dir = /home/regtester/git/picsar/
59-
branch = 8ff12fbf118b9aba7cfe602cb1a5e6da32bf7eef
59+
branch = 7b5449f92a4b30a095cc4a67f0a8b1fc69680e15
6060

6161
# individual problems follow
6262

Regression/WarpX-tests.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ emailBody = Check https://ccse.lbl.gov/pub/RegressionTesting/WarpX/ for more det
4848

4949
[AMReX]
5050
dir = /home/regtester/AMReX_RegTesting/amrex/
51-
branch = 1d50bfc1c1da79614c853f9823efdf33f9003cc5
51+
branch = 21.12
5252

5353
[source]
5454
dir = /home/regtester/AMReX_RegTesting/warpx
5555
branch = development
5656

5757
[extra-PICSAR]
5858
dir = /home/regtester/AMReX_RegTesting/picsar/
59-
branch = 8ff12fbf118b9aba7cfe602cb1a5e6da32bf7eef
59+
branch = 7b5449f92a4b30a095cc4a67f0a8b1fc69680e15
6060

6161
# individual problems follow
6262

cmake/dependencies/AMReX.cmake

Lines changed: 2 additions & 2 deletions
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.11 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIM} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} TINYP LSOLVERS)
228+
find_package(AMReX 21.12 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 "1d50bfc1c1da79614c853f9823efdf33f9003cc5"
242+
set(WarpX_amrex_branch "21.12"
243243
CACHE STRING
244244
"Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
245245

cmake/dependencies/PICSAR.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ function(find_picsar)
8282
#message(STATUS "PICSAR: Using version '${PICSAR_VERSION}'")
8383
else()
8484
# not supported by PICSAR (yet)
85-
#find_package(PICSAR 21.11 CONFIG REQUIRED QED)
85+
#find_package(PICSAR 21.12 CONFIG REQUIRED QED)
8686
#message(STATUS "PICSAR: Found version '${PICSAR_VERSION}'")
8787
message(FATAL_ERROR "PICSAR: Cannot be used as externally installed "
8888
"library yet. "
@@ -103,7 +103,7 @@ if(WarpX_QED)
103103
set(WarpX_picsar_repo "https://github.com/ECP-WarpX/picsar.git"
104104
CACHE STRING
105105
"Repository URI to pull and build PICSAR from if(WarpX_picsar_internal)")
106-
set(WarpX_picsar_branch "8ff12fbf118b9aba7cfe602cb1a5e6da32bf7eef"
106+
set(WarpX_picsar_branch "7b5449f92a4b30a095cc4a67f0a8b1fc69680e15"
107107
CACHE STRING
108108
"Repository branch for WarpX_picsar_repo if(WarpX_picsar_internal)")
109109

run_test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ 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 1d50bfc1c1da79614c853f9823efdf33f9003cc5 && cd -
54+
cd amrex && git checkout --detach 21.12 && cd -
5555
# Use QED brach for QED tests
5656
git clone https://github.com/ECP-WarpX/picsar.git
57-
cd picsar && git checkout --detach 8ff12fbf118b9aba7cfe602cb1a5e6da32bf7eef && cd -
57+
cd picsar && git checkout --detach 7b5449f92a4b30a095cc4a67f0a8b1fc69680e15 && cd -
5858
# warpx-data contains various required data sets
5959
git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git
6060

setup.py

Lines changed: 1 addition & 1 deletion
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.11',
256+
version = '21.12',
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)