Skip to content

Commit 734fd70

Browse files
authored
Release 23.05 (#3887)
* AMReX: 23.05 * PICSAR: 23.05 * WarpX: 23.05 * Update ES EB RZ Tests - slightly relaxed Phi - better selection of r outside cutcells
1 parent 8d08142 commit 734fd70

File tree

14 files changed

+25
-23
lines changed

14 files changed

+25
-23
lines changed

.github/workflows/cuda.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
which nvcc || echo "nvcc not in PATH!"
111111
112112
git clone https://github.com/AMReX-Codes/amrex.git ../amrex
113-
cd ../amrex && git checkout --detach 9d2f762f4897b5f585544baf87a19edd0f0c9560 && cd -
113+
cd ../amrex && git checkout --detach 23.05 && cd -
114114
make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_PSATD=TRUE USE_CCACHE=TRUE -j 2
115115
116116
build_nvhpc21-11-nvcc:

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.20.0)
4-
project(WarpX VERSION 23.04)
4+
project(WarpX VERSION 23.05)
55

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

Docs/source/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@
7878
# built documents.
7979
#
8080
# The short X.Y version.
81-
version = u'23.04'
81+
version = u'23.05'
8282
# The full version, including alpha/beta/rc tags.
83-
release = u'23.04'
83+
release = u'23.05'
8484

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

Examples/Tests/electrostatic_sphere_eb/analysis_rz.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@
2020
import sys
2121

2222
import numpy as np
23+
from unyt import m
2324
import yt
2425

2526
sys.path.insert(1, '../../../../warpx/Regression/Checksum/')
2627
import checksumAPI
2728

28-
tolerance = 0.004
29+
tolerance = 0.0041
2930

3031
fn = sys.argv[1]
3132
ds = yt.load( fn )
@@ -47,7 +48,8 @@
4748
errmax_phi = 0.0
4849
errmax_Er = 0.0
4950
for i in range(len(r)):
50-
if r[i]>=0.1:
51+
# outside EB and last cutcell
52+
if r[i] > 0.1*m + dr:
5153
phi_theory = A+B*np.log(r[i])
5254
Er_theory = -B/float(r[i])
5355
err = abs( phi_theory - phi[i,:] ).max() / phi_theory

LICENSE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
WarpX v23.04 Copyright (c) 2018-2023, 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 v23.05 Copyright (c) 2018-2023, 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 = '23.04',
57+
version = '23.05',
5858
packages = ['pywarpx'],
5959
package_dir = {'pywarpx': 'pywarpx'},
6060
description = """Wrapper of WarpX""",
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"lev=0": {
3-
"Er": 8497.669853722688,
4-
"phi": 2035.6618484435153
3+
"Er": 8487.661571728835,
4+
"phi": 2036.0428085209824
55
}
6-
}
6+
}
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"lev=0": {
3-
"Er": 8497.669853733625,
4-
"phi": 2035.6618484451055
3+
"Er": 8487.661571739109,
4+
"phi": 2036.0428085225362
55
},
66
"lev=1": {
7-
"Er": 19546.08010855407,
8-
"phi": 3290.7266050322164
7+
"Er": 19519.172334977942,
8+
"phi": 3291.0262856782897
99
}
10-
}
10+
}

Regression/WarpX-GPU-tests.ini

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

6161
[AMReX]
6262
dir = /home/regtester/git/amrex/
63-
branch = 9d2f762f4897b5f585544baf87a19edd0f0c9560
63+
branch = 23.05
6464

6565
[source]
6666
dir = /home/regtester/git/WarpX

Regression/WarpX-tests.ini

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

6060
[AMReX]
6161
dir = /home/regtester/AMReX_RegTesting/amrex/
62-
branch = 9d2f762f4897b5f585544baf87a19edd0f0c9560
62+
branch = 23.05
6363

6464
[source]
6565
dir = /home/regtester/AMReX_RegTesting/warpx

cmake/dependencies/AMReX.cmake

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

229-
find_package(AMReX 23.04 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIM} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} TINYP LSOLVERS)
229+
find_package(AMReX 23.05 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIM} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} TINYP LSOLVERS)
230230
message(STATUS "AMReX: Found version '${AMReX_VERSION}'")
231231
endif()
232232
endmacro()
@@ -240,7 +240,7 @@ set(WarpX_amrex_src ""
240240
set(WarpX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
241241
CACHE STRING
242242
"Repository URI to pull and build AMReX from if(WarpX_amrex_internal)")
243-
set(WarpX_amrex_branch "9d2f762f4897b5f585544baf87a19edd0f0c9560"
243+
set(WarpX_amrex_branch "23.05"
244244
CACHE STRING
245245
"Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
246246

cmake/dependencies/PICSAR.cmake

+1-1
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 23.04 CONFIG REQUIRED QED)
85+
#find_package(PICSAR 23.05 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

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ python3 -m pip install --upgrade -r warpx/Regression/requirements.txt
7171

7272
# Clone AMReX and warpx-data
7373
git clone https://github.com/AMReX-Codes/amrex.git
74-
cd amrex && git checkout --detach 9d2f762f4897b5f585544baf87a19edd0f0c9560 && cd -
74+
cd amrex && git checkout --detach 23.05 && cd -
7575
# warpx-data contains various required data sets
7676
git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git
7777
# openPMD-example-datasets contains various required data sets

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ def build_extension(self, ext):
272272
setup(
273273
name='pywarpx',
274274
# note PEP-440 syntax: x.y.zaN but x.y.z.devN
275-
version = '23.04',
275+
version = '23.05',
276276
packages = ['pywarpx'],
277277
package_dir = {'pywarpx': 'Python/pywarpx'},
278278
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)