Skip to content

Commit

Permalink
Release 21.12 (ECP-WarpX#2614)
Browse files Browse the repository at this point in the history
* AMReX: 21.12

* PICSAR: 21.12

* WarpX: 21.12
  • Loading branch information
ax3l authored Dec 2, 2021
1 parent a72c291 commit 0e80973
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Preamble ####################################################################
#
cmake_minimum_required(VERSION 3.15.0)
project(WarpX VERSION 21.11)
project(WarpX VERSION 21.12)

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

Expand Down
4 changes: 2 additions & 2 deletions Docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@
# built documents.
#
# The short X.Y version.
version = u'21.11'
version = u'21.12'
# The full version, including alpha/beta/rc tags.
release = u'21.11'
release = u'21.12'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
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.
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.


Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Expand Down
2 changes: 1 addition & 1 deletion Python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
package_data = {}

setup(name = 'pywarpx',
version = '21.11',
version = '21.12',
packages = ['pywarpx'],
package_dir = {'pywarpx': 'pywarpx'},
description = """Wrapper of WarpX""",
Expand Down
4 changes: 2 additions & 2 deletions Regression/WarpX-GPU-tests.ini
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ emailBody = Check https://ccse.lbl.gov/pub/GpuRegressionTesting/WarpX/ for more

[AMReX]
dir = /home/regtester/git/amrex/
branch = 1d50bfc1c1da79614c853f9823efdf33f9003cc5
branch = 21.12

[source]
dir = /home/regtester/git/WarpX
branch = development

[extra-PICSAR]
dir = /home/regtester/git/picsar/
branch = 8ff12fbf118b9aba7cfe602cb1a5e6da32bf7eef
branch = 7b5449f92a4b30a095cc4a67f0a8b1fc69680e15

# individual problems follow

Expand Down
4 changes: 2 additions & 2 deletions Regression/WarpX-tests.ini
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ emailBody = Check https://ccse.lbl.gov/pub/RegressionTesting/WarpX/ for more det

[AMReX]
dir = /home/regtester/AMReX_RegTesting/amrex/
branch = 1d50bfc1c1da79614c853f9823efdf33f9003cc5
branch = 21.12

[source]
dir = /home/regtester/AMReX_RegTesting/warpx
branch = development

[extra-PICSAR]
dir = /home/regtester/AMReX_RegTesting/picsar/
branch = 8ff12fbf118b9aba7cfe602cb1a5e6da32bf7eef
branch = 7b5449f92a4b30a095cc4a67f0a8b1fc69680e15

# individual problems follow

Expand Down
4 changes: 2 additions & 2 deletions cmake/dependencies/AMReX.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ macro(find_amrex)
endif()
set(COMPONENT_PRECISION ${WarpX_PRECISION} P${WarpX_PRECISION})

find_package(AMReX 21.11 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIM} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} TINYP LSOLVERS)
find_package(AMReX 21.12 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()
Expand All @@ -239,7 +239,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 "1d50bfc1c1da79614c853f9823efdf33f9003cc5"
set(WarpX_amrex_branch "21.12"
CACHE STRING
"Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")

Expand Down
4 changes: 2 additions & 2 deletions cmake/dependencies/PICSAR.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ function(find_picsar)
#message(STATUS "PICSAR: Using version '${PICSAR_VERSION}'")
else()
# not supported by PICSAR (yet)
#find_package(PICSAR 21.11 CONFIG REQUIRED QED)
#find_package(PICSAR 21.12 CONFIG REQUIRED QED)
#message(STATUS "PICSAR: Found version '${PICSAR_VERSION}'")
message(FATAL_ERROR "PICSAR: Cannot be used as externally installed "
"library yet. "
Expand All @@ -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 "8ff12fbf118b9aba7cfe602cb1a5e6da32bf7eef"
set(WarpX_picsar_branch "7b5449f92a4b30a095cc4a67f0a8b1fc69680e15"
CACHE STRING
"Repository branch for WarpX_picsar_repo if(WarpX_picsar_internal)")

Expand Down
4 changes: 2 additions & 2 deletions run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ echo "cd $PWD"

# Clone PICSAR, AMReX and warpx-data
git clone https://github.com/AMReX-Codes/amrex.git
cd amrex && git checkout --detach 1d50bfc1c1da79614c853f9823efdf33f9003cc5 && cd -
cd amrex && git checkout --detach 21.12 && cd -
# Use QED brach for QED tests
git clone https://github.com/ECP-WarpX/picsar.git
cd picsar && git checkout --detach 8ff12fbf118b9aba7cfe602cb1a5e6da32bf7eef && cd -
cd picsar && git checkout --detach 7b5449f92a4b30a095cc4a67f0a8b1fc69680e15 && cd -
# warpx-data contains various required data sets
git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ def build_extension(self, ext):
setup(
name='pywarpx',
# note PEP-440 syntax: x.y.zaN but x.y.z.devN
version = '21.11',
version = '21.12',
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.',
Expand Down

0 comments on commit 0e80973

Please sign in to comment.