-
-
Notifications
You must be signed in to change notification settings - Fork 395
Feature/fictive species #2043
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Feature/fictive species #2043
Conversation
Committer: pestre <[email protected]> On branch WIP/Merge_cantera-avbp Changes to be committed: new file: doc/doxygen/cantera-doxygen.css new file: doc/sphinx/develop/compiling/compilation-reqs.md new file: doc/sphinx/develop/compiling/config-options.rst new file: doc/sphinx/develop/compiling/configure-build.md new file: doc/sphinx/develop/compiling/dependencies.md new file: doc/sphinx/develop/compiling/source-code.md new file: doc/sphinx/develop/compiling/special-cases.md new file: doc/sphinx/develop/index.md new file: doc/sphinx/examples/index.md new file: doc/sphinx/favicon.png new file: doc/sphinx/index.md new file: doc/sphinx/install/conda.md new file: doc/sphinx/install/index.md new file: doc/sphinx/install/pip.md new file: doc/sphinx/python/ck_conversion.rst new file: doc/sphinx/python/constants.rst new file: doc/sphinx/python/cti_conversion.rst new file: doc/sphinx/python/ctml_conversion.rst new file: doc/sphinx/python/importing.rst new file: doc/sphinx/python/index.rst new file: doc/sphinx/python/kinetics.rst new file: doc/sphinx/python/onedim.rst new file: doc/sphinx/python/scripts.rst new file: doc/sphinx/python/thermo.rst new file: doc/sphinx/python/transport.rst new file: doc/sphinx/python/units.rst new file: doc/sphinx/python/utilities.rst new file: doc/sphinx/python/yaml_conversion.rst new file: doc/sphinx/python/zerodim.rst new file: doc/sphinx/reference/bibliography.md new file: doc/sphinx/reference/glossary.md new file: doc/sphinx/reference/index.md new file: doc/sphinx/reference/releasenotes/index.md new file: doc/sphinx/reference/science/reactors/controlreactor.md new file: doc/sphinx/reference/science/reactors/index.md new file: doc/sphinx/userguide/ck2yaml-tutorial.md new file: doc/sphinx/userguide/creating-mechanisms.md new file: doc/sphinx/userguide/faq.md new file: doc/sphinx/userguide/index.md new file: doc/sphinx/userguide/input-errors.md new file: doc/sphinx/userguide/input-tutorial.md new file: doc/sphinx/userguide/legacy2yaml-tutorial.md new file: doc/sphinx/userguide/python-tutorial.md new file: doc/sphinx/userguide/thermobuild.md
…fferences Committer: pestre <[email protected]> On branch WIP/Merge_cantera-avbp Changes to be committed: new file: doc/sphinx/_static/images/favicon.png new file: include/cantera/base/Parser.h modified: include/cantera/base/ct_defs.h new file: include/cantera/kinetics/CustomKinetics.h modified: include/cantera/kinetics/Kinetics.h modified: include/cantera/oneD/Boundary1D.h modified: include/cantera/oneD/Domain1D.h modified: include/cantera/oneD/DomainFactory.h new file: include/cantera/oneD/Flamelet.h modified: include/cantera/oneD/OneDim.h modified: include/cantera/oneD/Sim1D.h modified: include/cantera/oneD/StFlow.h modified: include/cantera/oneD/refine.h new file: include/cantera/transport/AVBPTransport.h
Committer: pestre <[email protected]> On branch WIP/Merge_cantera-avbp Changes to be committed: modified: include/cantera/clib/ctonedim.h modified: include/cantera/oneD/Sim1D.h
Committer: pestre <[email protected]> On branch WIP/Merge_cantera-avbp Changes to be committed: modified: interfaces/cython/cantera/_onedim.pxd modified: interfaces/cython/cantera/_onedim.pyx modified: interfaces/cython/cantera/composite.py modified: interfaces/cython/cantera/cti2yaml.py modified: interfaces/cython/cantera/kinetics.pxd modified: interfaces/cython/cantera/kinetics.pyx modified: interfaces/cython/cantera/onedim.py modified: interfaces/cython/setup.cfg.in modified: interfaces/python_minimal/setup.cfg.in modified: interfaces/python_sdist/SConscript modified: interfaces/python_sdist/pyproject.toml modified: interfaces/python_sdist/setup.cfg.in modified: interfaces/python_sdist/setup.py modified: interfaces/sourcegen/sourcegen/_orchestrate.py
Committer: pestre <[email protected]> On branch WIP/Merge_cantera-avbp Changes to be committed: new file: samples/clib/README.rst new file: samples/cxx/README.rst modified: samples/cxx/bvp/BoundaryValueProblem.h modified: samples/cxx/flamespeed/flamespeed.cpp new file: samples/f77/f77_demo.f new file: samples/f90/README.rst new file: samples/matlab_experimental/README.rst new file: samples/python/AVBP/1-runBurner.py new file: samples/python/AVBP/2-restoreBurner.py new file: samples/python/AVBP/3-plotBurner.py new file: samples/python/AVBP/ARC.py new file: samples/python/AVBP/FLAMELET.py new file: samples/python/AVBP/PEA.py new file: samples/python/AVBP/RESULTS/BISETTI.xml new file: samples/python/AVBP/RESULTS/BISETTI.yaml new file: samples/python/AVBP/RESULTS/CH4-O2-converged-flamelet-Lu.xml new file: samples/python/AVBP/RESULTS/CH4-O2-converged-flamelet-Lu.yaml new file: samples/python/AVBP/THICKENING.py new file: samples/python/AVBP/inputs/BFER_methane.cti new file: samples/python/AVBP/inputs/BFER_methane.yaml new file: samples/python/AVBP/inputs/BISETTI.cti new file: samples/python/AVBP/inputs/BISETTI.yaml new file: samples/python/AVBP/inputs/Lu.cti new file: samples/python/AVBP/inputs/Lu.yaml new file: samples/python/AVBP/inputs/Lu_ARC.cti new file: samples/python/AVBP/inputs/Lu_ARC.f90 new file: samples/python/AVBP/inputs/Lu_ARC.yaml new file: samples/python/AVBP/inputs/T_vs_x.dat new file: samples/python/AVBP/mech_lib/Makefile new file: samples/python/AVBP/mech_lib/customkinetics.f90 new file: samples/python/AVBP/mixture_database.dat new file: samples/python/AVBP/postproc.py new file: samples/python/AVBP/write_csv.py new file: samples/python/README.rst new file: samples/python/kinetics/README.rst new file: samples/python/multiphase/README.rst new file: samples/python/onedim/README.rst new file: samples/python/onedim/adiabatic_flame.csv new file: samples/python/onedim/adiabatic_flame.yaml new file: samples/python/reactors/README.rst new file: samples/python/surface_chemistry/README.rst new file: samples/python/thermo/README.rst new file: samples/python/transport/README.rst
Committer: pestre <[email protected]> On branch WIP/Merge_cantera-avbp Changes to be committed: new file: src/base/Parser.cpp modified: src/base/application.h modified: src/clib/ctonedim.cpp modified: src/extensions/pythonShim.cpp new file: src/kinetics/CustomKinetics.cpp modified: src/kinetics/Kinetics.cpp modified: src/kinetics/KineticsFactory.cpp modified: src/oneD/Boundary1D.cpp modified: src/oneD/Domain1D.cpp modified: src/oneD/DomainFactory.cpp new file: src/oneD/Flamelet.cpp modified: src/oneD/IonFlow.cpp modified: src/oneD/Sim1D.cpp modified: src/oneD/StFlow.cpp modified: src/oneD/refine.cpp new file: src/transport/AVBPTransport.cpp modified: src/transport/TransportFactory.cpp Conflicts: src/extensions/pythonShim.cpp Author: pestre <[email protected]> Date: Thu Jan 30 12:05:19 2025 +0100 On branch WIP/merge_CERFACS_devs You are currently cherry-picking commit 22c89db. Changes to be committed: new file: src/base/Parser.cpp modified: src/clib/ctonedim.cpp modified: src/extensions/pythonShim.cpp new file: src/kinetics/CustomKinetics.cpp modified: src/kinetics/Kinetics.cpp modified: src/kinetics/KineticsFactory.cpp modified: src/oneD/Boundary1D.cpp modified: src/oneD/Domain1D.cpp modified: src/oneD/DomainFactory.cpp new file: src/oneD/Flamelet.cpp modified: src/oneD/IonFlow.cpp modified: src/oneD/Sim1D.cpp modified: src/oneD/StFlow.cpp modified: src/oneD/refine.cpp new file: src/transport/AVBPTransport.cpp modified: src/transport/TransportFactory.cpp
Committer: pestre <[email protected]> On branch WIP/Merge_cantera-avbp Changes to be committed: modified: test/clib/test_ctonedim.cpp new file: test/data/surface2-gas.inp new file: test/data/surface2-thermo.dat new file: test/data/surface2.inp modified: test/oneD/test_oneD.cpp
On branch WIP/Merge_cantera-avbp Changes to be committed: modified: .gitignore modified: README.rst modified: SConstruct new file: install_cantera.py new file: main.yaml new file: run_compil new file: run_compil_kraken
On branch WIP/Merge_cantera-avbp Your branch is up to date with 'origin/WIP/Merge_cantera-avbp'. Changes to be committed: modified: ../../../interfaces/cython/cantera/composite.py
On branch WIP/merge_CERFACS_devs Changes to be committed: modified: .gitignore
call "registerChangedCallback" before transport setting if transportModel() is "none"
On branch WIP/merge_CERFACS_devs Changes to be committed: modified: ARC.py modified: inputs/Lu_ARC.yaml
Committer: pestre <[email protected]> Changes to be committed from rebase conflict: new file: doc/doxygen/cantera-doxygen.css new file: doc/sphinx/develop/compiling/compilation-reqs.md new file: doc/sphinx/develop/compiling/config-options.rst new file: doc/sphinx/develop/compiling/configure-build.md new file: doc/sphinx/develop/compiling/dependencies.md new file: doc/sphinx/develop/compiling/source-code.md new file: doc/sphinx/develop/compiling/special-cases.md new file: doc/sphinx/develop/index.md new file: doc/sphinx/examples/index.md new file: doc/sphinx/favicon.png new file: doc/sphinx/index.md new file: doc/sphinx/install/conda.md new file: doc/sphinx/install/index.md new file: doc/sphinx/install/pip.md new file: doc/sphinx/python/ck_conversion.rst new file: doc/sphinx/python/constants.rst new file: doc/sphinx/python/cti_conversion.rst new file: doc/sphinx/python/ctml_conversion.rst new file: doc/sphinx/python/importing.rst new file: doc/sphinx/python/index.rst new file: doc/sphinx/python/kinetics.rst new file: doc/sphinx/python/onedim.rst new file: doc/sphinx/python/scripts.rst new file: doc/sphinx/python/thermo.rst new file: doc/sphinx/python/transport.rst new file: doc/sphinx/python/units.rst new file: doc/sphinx/python/utilities.rst new file: doc/sphinx/python/yaml_conversion.rst new file: doc/sphinx/python/zerodim.rst new file: doc/sphinx/reference/bibliography.md new file: doc/sphinx/reference/glossary.md new file: doc/sphinx/reference/index.md new file: doc/sphinx/reference/releasenotes/index.md new file: doc/sphinx/reference/science/reactors/controlreactor.md new file: doc/sphinx/reference/science/reactors/index.md new file: doc/sphinx/userguide/ck2yaml-tutorial.md new file: doc/sphinx/userguide/creating-mechanisms.md new file: doc/sphinx/userguide/faq.md new file: doc/sphinx/userguide/index.md new file: doc/sphinx/userguide/input-errors.md new file: doc/sphinx/userguide/input-tutorial.md new file: doc/sphinx/userguide/legacy2yaml-tutorial.md new file: doc/sphinx/userguide/python-tutorial.md new file: doc/sphinx/userguide/thermobuild.md You are currently rebasing branch 'dev_cantera-avbp' on '7aec821a8'. Changes to be committed: new file: doc/sphinx/favicon.png new file: doc/sphinx/python/index.rst new file: doc/sphinx/reference/science/reactors/controlreactor.md new file: doc/sphinx/reference/science/reactors/index.md
…fferences Committer: pestre <[email protected]> On branch WIP/Merge_cantera-avbp Changes to be committed: new file: doc/sphinx/_static/images/favicon.png new file: include/cantera/base/Parser.h modified: include/cantera/base/ct_defs.h new file: include/cantera/kinetics/CustomKinetics.h modified: include/cantera/kinetics/Kinetics.h modified: include/cantera/oneD/Boundary1D.h modified: include/cantera/oneD/Domain1D.h modified: include/cantera/oneD/DomainFactory.h new file: include/cantera/oneD/Flamelet.h modified: include/cantera/oneD/OneDim.h modified: include/cantera/oneD/Sim1D.h modified: include/cantera/oneD/StFlow.h modified: include/cantera/oneD/refine.h new file: include/cantera/transport/AVBPTransport.h interactive rebase in progress; onto 7aec821 Last commands done (2 commands done): pick 43b1470 Add doc files from cantera-avbp pick dbacaad Add missing files in include directory from cantera-avbp and merge differences Next commands to do (12 remaining commands): pick 08696f0 Change refine_grid param type to string pick 20ede9d Merge differences in interfaces directory You are currently rebasing branch 'dev_cantera-avbp' on '7aec821a8'. Changes to be committed: new file: include/cantera/base/Parser.h modified: include/cantera/base/ct_defs.h new file: include/cantera/kinetics/CustomKinetics.h modified: include/cantera/kinetics/Kinetics.h modified: include/cantera/oneD/Boundary1D.h modified: include/cantera/oneD/Domain1D.h modified: include/cantera/oneD/DomainFactory.h new file: include/cantera/oneD/Flamelet.h modified: include/cantera/oneD/OneDim.h modified: include/cantera/oneD/Sim1D.h modified: include/cantera/oneD/StFlow.h modified: include/cantera/oneD/refine.h new file: include/cantera/transport/AVBPTransport.h
Committer: pestre <[email protected]> On branch WIP/Merge_cantera-avbp Changes to be committed: modified: include/cantera/clib/ctonedim.h modified: include/cantera/oneD/Sim1D.h
Committer: pestre <[email protected]> On branch WIP/Merge_cantera-avbp Changes to be committed: modified: interfaces/cython/cantera/_onedim.pxd modified: interfaces/cython/cantera/_onedim.pyx modified: interfaces/cython/cantera/composite.py modified: interfaces/cython/cantera/cti2yaml.py modified: interfaces/cython/cantera/kinetics.pxd modified: interfaces/cython/cantera/kinetics.pyx modified: interfaces/cython/cantera/onedim.py modified: interfaces/cython/setup.cfg.in modified: interfaces/python_minimal/setup.cfg.in modified: interfaces/python_sdist/SConscript modified: interfaces/python_sdist/pyproject.toml modified: interfaces/python_sdist/setup.cfg.in modified: interfaces/python_sdist/setup.py modified: interfaces/sourcegen/sourcegen/_orchestrate.py Author: pestre <[email protected]> interactive rebase in progress; onto 7aec821 Last commands done (4 commands done): pick 08696f0 Change refine_grid param type to string pick 20ede9d Merge differences in interfaces directory Next commands to do (10 remaining commands): pick 925ed42 Merge differences in samples directory pick 68a09c4 Merge differences in src directory You are currently rebasing branch 'dev_cantera-avbp' on '7aec821a8'. Changes to be committed: modified: interfaces/cython/cantera/_onedim.pxd modified: interfaces/cython/cantera/_onedim.pyx modified: interfaces/cython/cantera/composite.py modified: interfaces/cython/cantera/cti2yaml.py modified: interfaces/cython/cantera/kinetics.pxd modified: interfaces/cython/cantera/kinetics.pyx modified: interfaces/cython/cantera/onedim.py
Committer: pestre <[email protected]> On branch WIP/Merge_cantera-avbp Changes to be committed: new file: samples/clib/README.rst new file: samples/cxx/README.rst modified: samples/cxx/bvp/BoundaryValueProblem.h modified: samples/cxx/flamespeed/flamespeed.cpp new file: samples/f77/f77_demo.f new file: samples/f90/README.rst new file: samples/matlab_experimental/README.rst new file: samples/python/AVBP/1-runBurner.py new file: samples/python/AVBP/2-restoreBurner.py new file: samples/python/AVBP/3-plotBurner.py new file: samples/python/AVBP/ARC.py new file: samples/python/AVBP/FLAMELET.py new file: samples/python/AVBP/PEA.py new file: samples/python/AVBP/RESULTS/BISETTI.xml new file: samples/python/AVBP/RESULTS/BISETTI.yaml new file: samples/python/AVBP/RESULTS/CH4-O2-converged-flamelet-Lu.xml new file: samples/python/AVBP/RESULTS/CH4-O2-converged-flamelet-Lu.yaml new file: samples/python/AVBP/THICKENING.py new file: samples/python/AVBP/inputs/BFER_methane.cti new file: samples/python/AVBP/inputs/BFER_methane.yaml new file: samples/python/AVBP/inputs/BISETTI.cti new file: samples/python/AVBP/inputs/BISETTI.yaml new file: samples/python/AVBP/inputs/Lu.cti new file: samples/python/AVBP/inputs/Lu.yaml new file: samples/python/AVBP/inputs/Lu_ARC.cti new file: samples/python/AVBP/inputs/Lu_ARC.f90 new file: samples/python/AVBP/inputs/Lu_ARC.yaml new file: samples/python/AVBP/inputs/T_vs_x.dat new file: samples/python/AVBP/mech_lib/Makefile new file: samples/python/AVBP/mech_lib/customkinetics.f90 new file: samples/python/AVBP/mixture_database.dat new file: samples/python/AVBP/postproc.py new file: samples/python/AVBP/write_csv.py new file: samples/python/README.rst new file: samples/python/kinetics/README.rst new file: samples/python/multiphase/README.rst new file: samples/python/onedim/README.rst new file: samples/python/onedim/adiabatic_flame.csv new file: samples/python/onedim/adiabatic_flame.yaml new file: samples/python/reactors/README.rst new file: samples/python/surface_chemistry/README.rst new file: samples/python/thermo/README.rst new file: samples/python/transport/README.rst Author: pestre <[email protected]> interactive rebase in progress; onto 7aec821 Last commands done (5 commands done): pick 20ede9d Merge differences in interfaces directory pick 925ed42 Merge differences in samples directory Next commands to do (9 remaining commands): pick 68a09c4 Merge differences in src directory pick f298a7d Merge differences in test directory You are currently rebasing branch 'dev_cantera-avbp' on '7aec821a8'. Changes to be committed: modified: samples/cxx/bvp/BoundaryValueProblem.h modified: samples/cxx/flamespeed/flamespeed.cpp new file: samples/python/AVBP/1-runBurner.py new file: samples/python/AVBP/2-restoreBurner.py new file: samples/python/AVBP/3-plotBurner.py new file: samples/python/AVBP/ARC.py new file: samples/python/AVBP/FLAMELET.py new file: samples/python/AVBP/PEA.py new file: samples/python/AVBP/RESULTS/BISETTI.xml new file: samples/python/AVBP/RESULTS/BISETTI.yaml new file: samples/python/AVBP/RESULTS/CH4-O2-converged-flamelet-Lu.xml new file: samples/python/AVBP/RESULTS/CH4-O2-converged-flamelet-Lu.yaml new file: samples/python/AVBP/THICKENING.py new file: samples/python/AVBP/inputs/BFER_methane.cti new file: samples/python/AVBP/inputs/BFER_methane.yaml new file: samples/python/AVBP/inputs/BISETTI.cti new file: samples/python/AVBP/inputs/BISETTI.yaml new file: samples/python/AVBP/inputs/Lu.cti new file: samples/python/AVBP/inputs/Lu.yaml new file: samples/python/AVBP/inputs/Lu_ARC.cti new file: samples/python/AVBP/inputs/Lu_ARC.f90 new file: samples/python/AVBP/inputs/Lu_ARC.yaml new file: samples/python/AVBP/inputs/T_vs_x.dat new file: samples/python/AVBP/mech_lib/Makefile new file: samples/python/AVBP/mech_lib/customkinetics.f90 new file: samples/python/AVBP/mixture_database.dat new file: samples/python/AVBP/postproc.py new file: samples/python/AVBP/write_csv.py new file: samples/python/multiphase/README.rst new file: samples/python/onedim/adiabatic_flame.csv new file: samples/python/onedim/adiabatic_flame.yaml new file: samples/python/surface_chemistry/README.rst
Committer: pestre <[email protected]> On branch WIP/Merge_cantera-avbp Changes to be committed: new file: src/base/Parser.cpp modified: src/base/application.h modified: src/clib/ctonedim.cpp modified: src/extensions/pythonShim.cpp new file: src/kinetics/CustomKinetics.cpp modified: src/kinetics/Kinetics.cpp modified: src/kinetics/KineticsFactory.cpp modified: src/oneD/Boundary1D.cpp modified: src/oneD/Domain1D.cpp modified: src/oneD/DomainFactory.cpp new file: src/oneD/Flamelet.cpp modified: src/oneD/IonFlow.cpp modified: src/oneD/Sim1D.cpp modified: src/oneD/StFlow.cpp modified: src/oneD/refine.cpp new file: src/transport/AVBPTransport.cpp modified: src/transport/TransportFactory.cpp Conflicts: src/extensions/pythonShim.cpp Author: pestre <[email protected]> Date: Thu Jan 30 12:05:19 2025 +0100 On branch WIP/merge_CERFACS_devs You are currently cherry-picking commit 22c89db. Changes to be committed: new file: src/base/Parser.cpp modified: src/clib/ctonedim.cpp modified: src/extensions/pythonShim.cpp new file: src/kinetics/CustomKinetics.cpp modified: src/kinetics/Kinetics.cpp modified: src/kinetics/KineticsFactory.cpp modified: src/oneD/Boundary1D.cpp modified: src/oneD/Domain1D.cpp modified: src/oneD/DomainFactory.cpp new file: src/oneD/Flamelet.cpp modified: src/oneD/IonFlow.cpp modified: src/oneD/Sim1D.cpp modified: src/oneD/StFlow.cpp modified: src/oneD/refine.cpp new file: src/transport/AVBPTransport.cpp modified: src/transport/TransportFactory.cpp Author: pestre <[email protected]> interactive rebase in progress; onto 7aec821 Last commands done (6 commands done): pick 925ed42 Merge differences in samples directory pick 68a09c4 Merge differences in src directory Next commands to do (8 remaining commands): pick f298a7d Merge differences in test directory pick e118cf6 Merge differences for other files You are currently rebasing branch 'dev_cantera-avbp' on '7aec821a8'. Changes to be committed: new file: src/base/Parser.cpp modified: src/clib/ctonedim.cpp modified: src/extensions/pythonShim.cpp new file: src/kinetics/CustomKinetics.cpp modified: src/kinetics/Kinetics.cpp modified: src/kinetics/KineticsFactory.cpp modified: src/oneD/Boundary1D.cpp modified: src/oneD/Domain1D.cpp modified: src/oneD/DomainFactory.cpp new file: src/oneD/Flamelet.cpp modified: src/oneD/IonFlow.cpp modified: src/oneD/Sim1D.cpp modified: src/oneD/StFlow.cpp modified: src/oneD/refine.cpp new file: src/transport/AVBPTransport.cpp modified: src/transport/TransportFactory.cpp
Committer: pestre <[email protected]> On branch WIP/Merge_cantera-avbp Changes to be committed: modified: test/clib/test_ctonedim.cpp new file: test/data/surface2-gas.inp new file: test/data/surface2-thermo.dat new file: test/data/surface2.inp modified: test/oneD/test_oneD.cpp Author: pestre <[email protected]> interactive rebase in progress; onto 7aec821 Last commands done (7 commands done): pick 68a09c4 Merge differences in src directory pick f298a7d Merge differences in test directory Next commands to do (7 remaining commands): pick e118cf6 Merge differences for other files pick b0f7cbc Add missing part needed for compile_fortran import You are currently rebasing branch 'dev_cantera-avbp' on '7aec821a8'. Changes to be committed: modified: test/clib/test_ctonedim.cpp modified: test/data/surface2.inp modified: test/oneD/test_oneD.cpp
On branch WIP/Merge_cantera-avbp Changes to be committed: modified: .gitignore modified: README.rst modified: SConstruct new file: install_cantera.py new file: main.yaml new file: run_compil new file: run_compil_kraken Author: Antoine <[email protected]> interactive rebase in progress; onto 7aec821 Last commands done (8 commands done): pick f298a7d Merge differences in test directory pick e118cf6 Merge differences for other files Next commands to do (6 remaining commands): pick b0f7cbc Add missing part needed for compile_fortran import pick 8058ffb Add test files to the gitignore You are currently rebasing branch 'dev_cantera-avbp' on '7aec821a8'. Changes to be committed: modified: .gitignore modified: README.rst new file: install_cantera.py new file: main.yaml new file: run_compil new file: run_compil_kraken
On branch WIP/Merge_cantera-avbp Your branch is up to date with 'origin/WIP/Merge_cantera-avbp'. Changes to be committed: modified: ../../../interfaces/cython/cantera/composite.py interactive rebase in progress; onto 7aec821 Last commands done (9 commands done): pick e118cf6 Merge differences for other files pick b0f7cbc Add missing part needed for compile_fortran import Next commands to do (5 remaining commands): pick 8058ffb Add test files to the gitignore pick 1c91e26 [Bugfix] Segfault if no transport specified in the YAML file You are currently rebasing branch 'dev_cantera-avbp' on '7aec821a8'. Changes to be committed: modified: interfaces/cython/cantera/composite.py
On branch WIP/merge_CERFACS_devs Changes to be committed: modified: .gitignore interactive rebase in progress; onto 7aec821 Last commands done (10 commands done): pick b0f7cbc Add missing part needed for compile_fortran import pick 8058ffb Add test files to the gitignore Next commands to do (4 remaining commands): pick 1c91e26 [Bugfix] Segfault if no transport specified in the YAML file pick 5a9cde0 Bugfix : set the transport model in the file Lu_ARC.yaml You are currently rebasing branch 'dev_cantera-avbp' on '7aec821a8'. Changes to be committed: modified: .gitignore
call "registerChangedCallback" before transport setting if transportModel() is "none"
On branch WIP/merge_CERFACS_devs Changes to be committed: modified: ARC.py modified: inputs/Lu_ARC.yaml
…ms to work fine, except for computation On branch dev_cantera-avbp Changes to be committed: modified: include/cantera/kinetics/CustomKinetics.h modified: include/cantera/oneD/Flamelet.h modified: include/cantera/oneD/Flow1D.h deleted: include/cantera/oneD/StFlow.h modified: interfaces/cython/cantera/_onedim.pxd modified: interfaces/cython/cantera/_onedim.pyx modified: samples/python/AVBP/1-runBurner.py modified: samples/python/AVBP/2-restoreBurner.py deleted: samples/python/AVBP/RESULTS/BISETTI.xml deleted: samples/python/AVBP/RESULTS/BISETTI.yaml deleted: samples/python/AVBP/RESULTS/CH4-O2-converged-flamelet-Lu.xml deleted: samples/python/AVBP/RESULTS/CH4-O2-converged-flamelet-Lu.yaml modified: src/kinetics/CustomKinetics.cpp modified: src/oneD/Boundary1D.cpp modified: src/oneD/DomainFactory.cpp modified: src/oneD/Flamelet.cpp modified: src/oneD/Flow1D.cpp modified: src/oneD/IonFlow.cpp deleted: src/oneD/StFlow.cpp modified: test/oneD/test_oneD.cpp
On branch FEATURE/github_workflows Your branch is up to date with 'origin/FEATURE/github_workflows'. Changes to be committed: modified: .github/workflows/CERFACS_packaging.yml
On branch FEATURE/github_workflows Your branch is up to date with 'origin/FEATURE/github_workflows'. Changes to be committed: modified: .github/workflows/CERFACS_packaging.yml
On branch FEATURE/github_workflows Your branch is up to date with 'origin/FEATURE/github_workflows'. Changes to be committed: modified: .github/workflows/CERFACS_packaging.yml
On branch FEATURE/github_workflows Your branch is up to date with 'origin/FEATURE/github_workflows'. Changes to be committed: modified: .github/workflows/CERFACS_packaging.yml modified: SConstruct modified: interfaces/python_sdist/pyproject.toml.in
On branch FEATURE/github_workflows Your branch is up to date with 'origin/FEATURE/github_workflows'. Changes to be committed: modified: .github/workflows/CERFACS_packaging.yml
On branch FEATURE/github_workflows Your branch is up to date with 'origin/FEATURE/github_workflows'. Changes to be committed: modified: .github/workflows/CERFACS_packaging.yml
On branch FEATURE/github_workflows Your branch is up to date with 'origin/FEATURE/github_workflows'. Changes to be committed: modified: .github/workflows/CERFACS_packaging.yml
…n on github workflow On branch FEATURE/github_workflows Your branch is up to date with 'origin/FEATURE/github_workflows'. Changes to be committed: modified: src/base/Parser.cpp
On branch FEATURE/github_workflows Your branch is up to date with 'origin/FEATURE/github_workflows'. Changes to be committed: modified: .github/workflows/CERFACS_packaging.yml
Creation of Github workflow for cantera-avbp
The the soot distribution q[k] is local and is erased for each new position (not a 2D array) thus it cannot be computed for all point before evalSoot On branch BUGFIX/Soot_computation Changes to be committed: modified: src/oneD/Flow1D.cpp
I forgot to reset bounds for soot and spend the whole day trying to debug a bug that doesn't exist ! ==> At least soots are working now :') On branch BUGFIX/Soot_computation Changes to be committed: modified: ../../../src/oneD/Flow1D.cpp
Correction of Soot computation
Works on a 1D premixed flame using San Diego chemistry. A fictive species is put with the source term of a real species and both mass fractions works. Now to be checked on counterflow diff flames. Examples are being sets to play with fictives.
All seems to work !
|
Hi, thanks for sending this pull request! It would certainly be an interesting feature to add. I looked very briefly at some of the changes and many of them seem unrelated to the new feature, for example the new packaging workflow, some of the documentation changes, changing |
|
@Acoudray1 ... welcome! I likewise appreciate this pull request. Realizing that this is still in 'draft' mode, I did notice a rather large line count. As much of this appears to be caused by the inclusion of mechanism files, I wanted to point out that we started to move mechanisms to the dedicated cantera-example-data repository; we also no longer distribute cti files. Adding those mechanisms can be accomplished very quickly there. Beyond, I second what @bryanwweber mentioned - please avoid introducing code unrelated to the PR topic. As much as I want to see features developed by CERFACS consolidated, we may have to accomplish this one feature at a time. Regarding changes to the Cantera API, we follow a fairly robust deprecation cycle for anything that isn't marked as 'experimental'. I.e., changes of method names or argument types need to be introduced without breaking user code. Finally, I noticed a change to the legacy CLib (in |
|
Hello everyone, Thank you for all your inputs that are very valuable :) Should I close this merge request to avoid polluting ? Thank you ! |
|
@Acoudray1 ... I'll leave this up to you. From my perspective, I'd welcome seeing CERFACS features be added to the main Cantera branch, which should reduce the maintenance effort on the CERFACS fork significantly. |
|
I definitely aggree with you. For now I leave this draft as is and I will discuss with the guy in charge of cantera at cerfacs, that way we'll do things nicely, notably separating features ! |
- Add nfic to Flamelet class to be able to add nfic in Flow1D call - typo in _onedim.pyx - Display plot instead of saving picture in sample fictive_species.py - Add fictive parameter in construction of gas-flow and legacy-flow. Not really necessary but done as sections param for consistency - Add missing argument of Flow1D call in IonFlow.cpp On branch FEATURE/Fictive_species Changes to be committed: modified: include/cantera/oneD/Flamelet.h modified: interfaces/cython/cantera/_onedim.pyx modified: samples/python/AVBP/fictive_species.py modified: src/oneD/DomainFactory.cpp modified: src/oneD/Flamelet.cpp modified: src/oneD/IonFlow.cpp
…he same time. Should be possible if playing with offset_F
Changes proposed in this pull request
If applicable, fill in the issue number this pull request is fixing
Closes #
If applicable, provide an example illustrating new features this pull request is introducing
Checklist
scons build&scons test) and unit tests address code coverage