Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
43b1470
Add doc files from cantera-avbp
Jan 8, 2025
dbacaad
Add missing files in include directory from cantera-avbp and merge di…
Jan 13, 2025
08696f0
Change refine_grid param type to string
Jan 17, 2025
20ede9d
Merge differences in interfaces directory
Jan 17, 2025
925ed42
Merge differences in samples directory
Jan 24, 2025
68a09c4
Merge differences in src directory
Jan 30, 2025
f298a7d
Merge differences in test directory
Mar 5, 2025
e118cf6
Merge differences for other files
AntoinePestre Mar 5, 2025
b0f7cbc
Add missing part needed for compile_fortran import
AntoinePestre Apr 4, 2025
8058ffb
Add test files to the gitignore
AntoinePestre Apr 22, 2025
1c91e26
[Bugfix] Segfault if no transport specified in the YAML file
joebarteam11 Dec 29, 2023
5a9cde0
Bugfix : set the transport model in the file Lu_ARC.yaml
AntoinePestre Apr 22, 2025
a73dda2
Update README.rst for cantera installation
AntoinePestre Apr 29, 2025
fc6c3ac
Change repository name
AntoinePestre Apr 29, 2025
9591ec3
Correction of git clone link
AntoinePestre Apr 30, 2025
683ddb8
Rebase dev_cantera-avbp onto v3.1.0a4
Jan 8, 2025
cd7e6a7
Add missing files in include directory from cantera-avbp and merge di…
Jan 13, 2025
e3787ef
Change refine_grid param type to string
Jan 17, 2025
a42110a
Merge differences in interfaces directory
Jan 17, 2025
a11b566
Merge differences in samples directory
Jan 24, 2025
b3e371b
Merge differences in src directory
Jan 30, 2025
399bdcb
Merge differences in test directory
Mar 5, 2025
3d0dea8
Merge differences for other files
AntoinePestre Mar 5, 2025
192c265
Add missing part needed for compile_fortran import
AntoinePestre Apr 4, 2025
bfbe028
Add test files to the gitignore
AntoinePestre Apr 22, 2025
80273c1
[Bugfix] Segfault if no transport specified in the YAML file
joebarteam11 Dec 29, 2023
c434656
Bugfix : set the transport model in the file Lu_ARC.yaml
AntoinePestre Apr 22, 2025
49d3ee3
Update README.rst for cantera installation
AntoinePestre Apr 29, 2025
19b3468
Change repository name
AntoinePestre Apr 29, 2025
b4cfc51
Several bugfixes after rebase on cantera3.1.0a4 Tests and samples see…
AntoinePestre Jul 7, 2025
d28d617
Merge branch 'dev_cantera-avbp' of github.com:cerfacs/cantera-avbp in…
AntoinePestre Jul 7, 2025
46d63f3
Small bugfixes following merge
AntoinePestre Jul 8, 2025
9a2fa5e
Merge cantera main 3.1 (commit '429c59135e3594c22f728a2830aedd77d94f0…
AntoinePestre Jul 9, 2025
64fd9a1
Change stflow_solveEnergyEqn to flow1D_solveEnergyEqn because stflow.…
AntoinePestre Jul 9, 2025
3d90593
Remove grid variable that is deprecated (changed by z) + add missing …
AntoinePestre Jul 9, 2025
b5500fe
Bugfixes for TestOnedim.test_width_grid + avoid crashed due to canter…
AntoinePestre Jul 9, 2025
6e19c61
Remove samples/python/AVBP/RESULTS directory from .gitignore
AntoinePestre Jul 22, 2025
1936cef
Create an additional .gitignore file in samples/python/AVBP/RESULTS/ …
AntoinePestre Jul 22, 2025
02f4896
Update the pip install in install_cantera.py script
AntoinePestre Jul 22, 2025
5ab8cb0
Update doc for install
AntoinePestre Jul 22, 2025
3f818a2
Add instal for CALYPSO
AntoinePestre Jul 29, 2025
2e8dc24
Add load_cantera function for .bashrc
AntoinePestre Jul 30, 2025
74ba61f
Add install for KRAKEN
AntoinePestre Aug 1, 2025
a9c1280
Clean install_cantera.py + update doc for installation
AntoinePestre Aug 4, 2025
3d9272c
Display correction
AntoinePestre Aug 4, 2025
4efd8f9
Deactivate automatic workflows from cantera without removing them
AntoinePestre Aug 26, 2025
80c124f
Add new workflow for python package generation
AntoinePestre Aug 26, 2025
e72b127
Correction of cerfacs workflows (tested on local machine only)
AntoinePestre Aug 27, 2025
87ea235
Merge pull request #2 from cerfacs/FEATURE/github_workflows
AntoinePestre Aug 27, 2025
804fd40
Modify secret token name
AntoinePestre Aug 27, 2025
e558dc5
Update github secret with personal acces token
AntoinePestre Aug 27, 2025
0cd27a4
Change macOS version to macos-13 for macos-wheel workflow
AntoinePestre Aug 29, 2025
03dc305
Update upload-artifact version to v4
AntoinePestre Aug 29, 2025
a851692
Add libomp hdf5 and doxygen to brew install
AntoinePestre Aug 29, 2025
3f3bcd4
Force hdf5 static library for wheel creation
AntoinePestre Aug 29, 2025
13f88f7
Bugfix incompatible options
AntoinePestre Aug 29, 2025
6f73cb6
bugfix in CIBW_ENVIRONMENT declarations (only the first line was read…
AntoinePestre Aug 29, 2025
029ad39
Try to force HDF5 lib in CIBW
AntoinePestre Aug 29, 2025
2ba8aed
Test imposing CMake3.31.6 version
AntoinePestre Aug 29, 2025
d4402f5
Test
AntoinePestre Aug 29, 2025
f4613fa
test
AntoinePestre Aug 29, 2025
4bf6c61
Bugfix in CIBW_ENVIRONMENT
AntoinePestre Aug 29, 2025
7bd4039
Comment print info job
AntoinePestre Aug 29, 2025
c9b264e
Adapted MACOS wheel workflow from cantera official wheel generator (h…
AntoinePestre Sep 4, 2025
5c4a50a
Boost lib not available for MACOS13 and arm34 architecture -> switche…
AntoinePestre Sep 4, 2025
9ab56fc
Trying to find *.sh in my repo
AntoinePestre Sep 9, 2025
5dfd512
Add debug step to get more info where .sh files are
AntoinePestre Sep 9, 2025
e9acd2c
Add a new job to save .sh scripts to artifacts
AntoinePestre Sep 9, 2025
b4cef6c
Print info for debug
AntoinePestre Sep 9, 2025
1d817c8
Bugfix path for .sh scripts
AntoinePestre Sep 9, 2025
da72fc5
Give explicitetly the name of the .sh
AntoinePestre Sep 9, 2025
8c476ed
Add download step to get .sh from artifacts
AntoinePestre Sep 9, 2025
cf86cf0
Bugfix: wrong path
AntoinePestre Sep 9, 2025
72953a7
Need to uninstall cmake before installing brew cmake version
AntoinePestre Sep 9, 2025
6675830
Try to force cython version to 3.1.1
AntoinePestre Sep 9, 2025
60b6dd0
Set cython version directly into cantera sources
AntoinePestre Sep 9, 2025
2d14bba
Add cython version into the pyproject.toml.in of python_sdist directory
AntoinePestre Sep 9, 2025
dde15be
Imposing cython==3.1.1
AntoinePestre Sep 9, 2025
c711aee
derniers test en rajoutant CIBW_BEFORE_BUILD
AntoinePestre Sep 9, 2025
d6b8a13
test
AntoinePestre Sep 9, 2025
22eda0f
Bugfix CIBW_BEFORE_BUILD
AntoinePestre Sep 10, 2025
536511e
Forcing clang compiler and correction on CIBW_ENVIRONMENT_MACOS
AntoinePestre Sep 10, 2025
2178e2e
Add SDKROOT env
AntoinePestre Sep 10, 2025
b680bbc
Change python minimal version to 3.9
AntoinePestre Sep 10, 2025
77be164
Deactivate pytest after wheel creation by CIBW
AntoinePestre Sep 10, 2025
9dcaa41
Cleaning
AntoinePestre Sep 18, 2025
278892c
Add linux wheels workflow (not tested)
AntoinePestre Sep 18, 2025
275e979
Switch to x86 architecture
AntoinePestre Sep 23, 2025
1e233b9
Set ubuntu-24.04 for job runner
AntoinePestre Sep 23, 2025
b7ebe43
Test on python 3.12
AntoinePestre Sep 23, 2025
b825a8a
Update pyproject.toml.in with CIBW setup
AntoinePestre Sep 23, 2025
7b4c3a5
Add cstring and algorithm includes in Parser.cpp to enable compilatio…
AntoinePestre Sep 23, 2025
00f0fc2
Clean CERFACS github workflows
AntoinePestre Oct 13, 2025
b847876
Merge pull request #4 from cerfacs/FEATURE/github_workflows
AntoinePestre Oct 13, 2025
a057795
Move getDistributionOrdre0 into evalSoot
AntoinePestre Oct 17, 2025
a077a37
Fuck, I want to kill myself...
AntoinePestre Oct 17, 2025
7fb4687
Cleanning
AntoinePestre Oct 20, 2025
2ce77ef
Merge pull request #5 from cerfacs/BUGFIX/Soot_computation
AntoinePestre Oct 20, 2025
5218f5f
Added fictive as in AVBP.
Nov 7, 2025
19d9175
Added an example script to run fictive species on premixed flames
Acoudray1 Nov 12, 2025
5e05a1e
Several bugfixes
AntoinePestre Dec 2, 2025
dad83d0
Added an error if one wants to use both fictive species and soot at t…
Acoudray1 Dec 3, 2025
b11d968
remove warnign fictive+soots in onedim.py and moved to Flow1D.cpp
Acoudray1 Dec 3, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 88 additions & 0 deletions .github/build_dependencies.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
#!/bin/bash
pushd ${RUNNER_TEMP}

curl -fsSLO "https://github.com/HDFGroup/hdf5/releases/download/hdf5_${HDF5_VERSION}/hdf5-${HDF5_VERSION}.tar.gz"
tar -xzf hdf5-${HDF5_VERSION}.tar.gz
mkdir -p hdf5-${HDF5_VERSION}/build
pushd hdf5-${HDF5_VERSION}/build

cmake -G "$GENERATOR" \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX="${HDF5_DIR}" \
-DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON \
-DHDF5_ENABLE_SZIP_SUPPORT:BOOL=ON \
-DHDF5_BUILD_EXAMPLES:BOOL=OFF \
-DHDF5_BUILD_TOOLS:BOOL=OFF \
-DBUILD_TESTING:BOOL=OFF \
-DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING=TGZ \
-DZLIB_PACKAGE_NAME:STRING=zlib \
-DZLIB_TGZ_NAME:STRING=zlib-${ZLIB_VERSION}.tar.gz \
-DZLIB_TGZ_ORIGPATH:STRING=https://github.com/madler/zlib/releases/download/v${ZLIB_VERSION} \
-DZLIB_USE_LOCALCONTENT:BOOL=OFF \
-DLIBAEC_PACKAGE_NAME:STRING=libaec \
-DLIBAEC_TGZ_NAME:STRING=libaec-${LIBAEC_VERSION}.tar.gz \
-DLIBAEC_TGZ_ORIGPATH:STRING=https://github.com/MathisRosenhauer/libaec/releases/download/v${LIBAEC_VERSION} \
-DLIBAEC_USE_LOCALCONTENT:BOOL=OFF \
-DHDF_PACKAGE_NAMESPACE:STRING=ct_ \
..

cmake --build . --target install --config Release
popd

curl -fsSLO https://github.com/BlueBrain/HighFive/archive/refs/tags/v${HIGHFIVE_VERSION}.tar.gz
tar -xzf v${HIGHFIVE_VERSION}.tar.gz
mkdir -p HighFive-${HIGHFIVE_VERSION}/build
pushd HighFive-${HIGHFIVE_VERSION}/build

cmake -G "$GENERATOR" \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DCMAKE_BUILD_TYPE=Release \
-DHDF5_ROOT="${HDF5_DIR}" \
-DCMAKE_INSTALL_PREFIX="${HIGHFIVE_DIR}" \
-DHIGHFIVE_USE_BOOST:BOOL=OFF \
-DHIGHFIVE_UNIT_TESTS:BOOL=OFF \
-DHIGHFIVE_EXAMPLES:BOOL=OFF \
-DHIGHFIVE_BUILD_DOCS:BOOL=OFF \
..

cmake --build . --target install --config Release
popd

curl -fsSLO https://github.com/LLNL/sundials/releases/download/v${SUNDIALS_VERSION}/sundials-${SUNDIALS_VERSION}.tar.gz
tar -xzf sundials-${SUNDIALS_VERSION}.tar.gz
mkdir -p sundials-${SUNDIALS_VERSION}/build
pushd sundials-${SUNDIALS_VERSION}/build

cmake -G "$GENERATOR" \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX="${SUNDIALS_DIR}" \
-DEXAMPLES_INSTALL=OFF \
-DEXAMPLES_ENABLE_C=OFF \
-DBUILD_ARKODE=OFF \
-DBUILD_CVODE=OFF \
-DBUILD_IDA=OFF \
-DBUILD_KINSOL=OFF \
-DBUILD_CPODES=OFF \
-DBUILD_FORTRAN_MODULE_INTERFACE=OFF \
"${SUNDIALS_BUILD_OPTIONS[@]}" \
..

cmake --build . --target install --config Release
popd

curl -fsSLO https://github.com/jbeder/yaml-cpp/archive/refs/tags/${YAML_CPP_VERSION}.tar.gz
tar -xzf ${YAML_CPP_VERSION}.tar.gz
mkdir -p yaml-cpp-${YAML_CPP_VERSION}/build
pushd yaml-cpp-${YAML_CPP_VERSION}/build
cmake -G "$GENERATOR" \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DCMAKE_INSTALL_PREFIX="${YAML_CPP_DIR}" \
-DCMAKE_BUILD_TYPE:STRING=Release \
-DCMAKE_INSTALL_LIBDIR:STRING=lib \
-DYAML_CPP_FORMAT_SOURCE:BOOL=OFF \
-DBUILD_TESTING:BOOL=OFF \
-DBUILD_SHARED_LIBS:BOOL=ON \
..

cmake --build . --target install --config Release
popd
97 changes: 97 additions & 0 deletions .github/cibw_before_all_macos.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
#!/bin/bash
# Adapted from h5py. Licensed under the BSD 3-Clause license.
# Copyright (c) 2008 Andrew Collette and contributors
# All rights reserved.

# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:

# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.

# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the
# distribution.

# 3. Neither the name of the copyright holder nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.

# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

set -eo pipefail # Option pour que le script exit si une erreur est détecté dans l'un des pipeline
set +x # set -x correspond au mode debug qui permet de print les commende avant de les exécuter, set -x permet d'éviter ça (utile pour éviter que les token github apparaissent dans les log)

function setup_github_env {
echo "HDF5_ROOT=${HDF5_DIR}" | tee -a $GITHUB_ENV
echo "HighFive_ROOT=${HIGHFIVE_DIR}" | tee -a $GITHUB_ENV
echo "SUNDIALS_ROOT=${SUNDIALS_DIR}" | tee -a $GITHUB_ENV
echo "MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET}" | tee -a $GITHUB_ENV
echo "DYLD_FALLBACK_LIBRARY_PATH=${HDF5_DIR}/lib:${YAML_CPP_DIR}/lib" | tee -a $GITHUB_ENV
echo "yaml-cpp_ROOT=${YAML_CPP_DIR}" | tee -a $GITHUB_ENV
}

# Check if the current script ($0) is called with the correct option ($1) which should correspond to the project path
if [[ "$1" == "" ]] ; then
echo "Usage: $0 <PROJECT_PATH>"
exit 1
fi

PROJECT_PATH="$1"
ARCH=$(uname -m) # Récupère l'architecture du système (arm64 / x86_64 ...)
GENERATOR="Ninja"
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )

source "${SCRIPT_DIR}/dependencies.sh"

HDF5_DIR="${PROJECT_PATH}/cache/hdf5/${HDF5_VERSION}-${ARCH}"
HIGHFIVE_DIR="${PROJECT_PATH}/cache/highfive/${HIGHFIVE_VERSION}-${ARCH}"
SUNDIALS_DIR="${PROJECT_PATH}/cache/sundials/${SUNDIALS_VERSION}-${ARCH}"
SUNDIALS_BUILD_OPTIONS=(
"-DENABLE_LAPACK=ON"
"-DBLA_VENDOR=Apple"
"-DSUNDIALS_LAPACK_CASE=LOWER"
"-DSUNDIALS_LAPACK_UNDERSCORES=NONE"
)
YAML_CPP_DIR="${PROJECT_PATH}/cache/yaml-cpp/${YAML_CPP_VERSION}-${ARCH}"

# When compiling HDF5, we should use the minimum across all Python versions for a given
# arch, for versions see for example a more updated version of the following:
# https://github.com/pypa/cibuildwheel/blob/9c75ea15c2f31a77e6043b80b1b7081372319d85/cibuildwheel/macos.py#L302-L315
if [[ "${ARCH}" == "arm64" ]]; then
export MACOSX_DEPLOYMENT_TARGET="11.0"
else
# This is the minimum version for Cantera
export MACOSX_DEPLOYMENT_TARGET="10.15"
fi

lib_name=libhdf5.dylib
inc_name=highfive.hpp

if [ -f ${HDF5_DIR}/lib/${lib_name} ] && [ -f ${HIGHFIVE_DIR}/include/highfive/${inc_name} ]; then
echo "using cached build"
setup_github_env
exit 0
else
echo "building dependencies"
fi

brew uninstall cmake

brew install ninja cmake --formula

source "${SCRIPT_DIR}/build_dependencies.sh" # Build here hdf5, highFive, sundials, yaml_cpp

setup_github_env
6 changes: 6 additions & 0 deletions .github/dependencies.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export HDF5_VERSION="1.14.5"
export LIBAEC_VERSION="1.1.3"
export ZLIB_VERSION="1.3.1"
export HIGHFIVE_VERSION="2.10.0"
export SUNDIALS_VERSION="7.1.1"
export YAML_CPP_VERSION="0.8.0"
Loading