From 36420ba1233b6fee32b32fb2748cfa40b6ed77ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxence=20Th=C3=A9venet?= Date: Fri, 8 Mar 2024 10:18:20 +0100 Subject: [PATCH] Prepare for release 24.03 (#1077) * update release number and set to proper amrex branch * try AMReX 24.02 instead? Not sure it's recent enough * revert to proper amrex version although it has not been released yet * try specify commit directly * use corresponding amrex release --- CMakeLists.txt | 2 +- cmake/dependencies/AMReX.cmake | 4 ++-- docs/source/conf.py | 4 ++-- license.txt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a166a8a9b..bca6e7b8e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ # Preamble #################################################################### # cmake_minimum_required(VERSION 3.18.0) -project(HiPACE VERSION 23.11) +project(HiPACE VERSION 24.03) # helper functions include(${HiPACE_SOURCE_DIR}/cmake/HiPACEFunctions.cmake) diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index 6aa434d84f..5dd599e075 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/cmake/dependencies/AMReX.cmake @@ -143,7 +143,7 @@ macro(find_amrex) else() message(STATUS "Searching for pre-installed AMReX ...") set(COMPONENT_PRECISION ${HiPACE_PRECISION} P${HiPACE_PRECISION}) - find_package(AMReX 23.11 CONFIG REQUIRED COMPONENTS 3D ${COMPONENT_PRECISION} PARTICLES) + find_package(AMReX 24.03 CONFIG REQUIRED COMPONENTS 3D ${COMPONENT_PRECISION} PARTICLES) # note: TINYP skipped because user-configured and optional # AMReX CMake helper scripts @@ -162,7 +162,7 @@ set(HiPACE_amrex_src "" set(HiPACE_amrex_repo "https://github.com/AMReX-Codes/amrex.git" CACHE STRING "Repository URI to pull and build AMReX from if(HiPACE_amrex_internal)") -set(HiPACE_amrex_branch "development" +set(HiPACE_amrex_branch "24.03" CACHE STRING "Repository branch for HiPACE_amrex_repo if(HiPACE_amrex_internal)") diff --git a/docs/source/conf.py b/docs/source/conf.py index 1cc21b5765..94681fdaea 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -26,8 +26,8 @@ project = 'HiPACE++' copyright = '2021, Severin Diederichs, Axel Huebl, Remi Lehe, Andrew Myers, Alexander Sinn, Maxence Thevenet, Weiqun Zhang' author = 'Severin Diederichs, Axel Huebl, Remi Lehe, Andrew Myers, Alexander Sinn, Maxence Thevenet, Weiqun Zhang' -version = u'23.11' -release = u'23.11' +version = u'24.03' +release = u'24.03' # -- General configuration --------------------------------------------------- diff --git a/license.txt b/license.txt index 671559b065..6a47d43dcb 100644 --- a/license.txt +++ b/license.txt @@ -1,4 +1,4 @@ -HiPACE++ v23.11 Copyright (c) 2021-2023, The Regents of the University of California, +HiPACE++ v24.03 Copyright (c) 2021-2024, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy) and Deutsches Elektronen-Synchrotron (DESY). All rights reserved.