Skip to content

Commit e39f2b2

Browse files
authored
Release 21.06 (#1996)
* AMReX/PICSAR: 21.06 * WarpX: 21.06
1 parent 080d4bd commit e39f2b2

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
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.05)
4+
project(WarpX VERSION 21.06)
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.05'
69+
version = u'21.06'
7070
# The full version, including alpha/beta/rc tags.
71-
release = u'21.05'
71+
release = u'21.06'
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.05 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.06 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.05',
57+
version = '21.06',
5858
packages = ['pywarpx'],
5959
package_dir = {'pywarpx': 'pywarpx'},
6060
description = """Wrapper of WarpX""",

cmake/dependencies/AMReX.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ macro(find_amrex)
178178
endif()
179179
set(COMPONENT_PRECISION ${WarpX_PRECISION} P${WarpX_PRECISION})
180180

181-
find_package(AMReX 21.05 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIM} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} TINYP LSOLVERS)
181+
find_package(AMReX 21.06 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIM} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} TINYP LSOLVERS)
182182
message(STATUS "AMReX: Found version '${AMReX_VERSION}'")
183183
endif()
184184
endmacro()
@@ -192,7 +192,7 @@ set(WarpX_amrex_src ""
192192
set(WarpX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
193193
CACHE STRING
194194
"Repository URI to pull and build AMReX from if(WarpX_amrex_internal)")
195-
set(WarpX_amrex_branch "646d5f63445ff46e4df23cbdb1fbe662ca1708fb"
195+
set(WarpX_amrex_branch "21.06"
196196
CACHE STRING
197197
"Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
198198

cmake/dependencies/PICSAR.cmake

Lines changed: 1 addition & 1 deletion
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.05 CONFIG REQUIRED QED)
85+
#find_package(PICSAR 21.06 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. "

run_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ echo "cd $PWD"
5151

5252
# Clone PICSAR and AMReX
5353
git clone https://github.com/AMReX-Codes/amrex.git
54-
cd amrex && git checkout 646d5f63445ff46e4df23cbdb1fbe662ca1708fb && cd -
54+
cd amrex && git checkout 21.06 && cd -
5555
# Use QED brach for QED tests
5656
git clone https://github.com/ECP-WarpX/picsar.git
5757
cd picsar && git checkout c16b642e3dcf860480dd1dd21cefa3874f395773 && cd -

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ def build_extension(self, ext):
233233
setup(
234234
name='pywarpx',
235235
# note PEP-440 syntax: x.y.zaN but x.y.z.devN
236-
version = '21.05',
236+
version = '21.06',
237237
packages = ['pywarpx'],
238238
package_dir = {'pywarpx': 'Python/pywarpx'},
239239
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)