From f6a1edc6ef56b960f5527f0d998d991193092400 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Mon, 9 Feb 2026 14:21:58 -0500 Subject: [PATCH 1/5] Remove unused ostream operator --- include/cantera/kinetics/Group.h | 3 --- src/kinetics/Group.cpp | 10 ---------- 2 files changed, 13 deletions(-) diff --git a/include/cantera/kinetics/Group.h b/include/cantera/kinetics/Group.h index 78f3cd8689d..a3f1bea2bb7 100644 --- a/include/cantera/kinetics/Group.h +++ b/include/cantera/kinetics/Group.h @@ -127,9 +127,6 @@ class Group std::ostream& fmt(std::ostream& s, const vector& esymbols) const; - friend std::ostream& operator<<(std::ostream& s, - const Group& g); - private: vector m_comp; int m_sign; diff --git a/src/kinetics/Group.cpp b/src/kinetics/Group.cpp index fdd18caaf24..fc4b6e8a083 100644 --- a/src/kinetics/Group.cpp +++ b/src/kinetics/Group.cpp @@ -57,14 +57,4 @@ std::ostream& Group::fmt(std::ostream& s, const vector& esymbols) const return s; } -std::ostream& operator<<(std::ostream& s, const Group& g) -{ - if (g.valid()) { - s << g.m_comp; - } else { - s << ""; - } - return s; -} - } From 4e3e073a8825dd31458e3f9106a518a21f76bba8 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Tue, 10 Feb 2026 13:47:28 -0500 Subject: [PATCH 2/5] [SCons] Add workaround for running sysctl in sandboxed environments This allows running scons in sandboxes like those used by OpenAI Codex. --- SConstruct | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index 459b95c82f4..222baa86a60 100644 --- a/SConstruct +++ b/SConstruct @@ -992,7 +992,10 @@ def get_processor_name(): elif platform.system() == "Darwin": os.environ['PATH'] = os.environ['PATH'] + os.pathsep + '/usr/sbin' command ="sysctl -n machdep.cpu.brand_string" - return subprocess.check_output(command, shell=True).decode().strip() + try: + return subprocess.check_output(command, shell=True).decode().strip() + except subprocess.CalledProcessError: + return "" elif platform.system() == "Linux": command = "lscpu || cat /proc/cpuinfo" all_info = subprocess.check_output(command, shell=True).decode().strip() From 8658dd4a980543d28ff031ee4cc293323cbdfe1b Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Tue, 10 Feb 2026 13:49:21 -0500 Subject: [PATCH 3/5] Fix slowdowns in sandboxed environments Repeated calls to 'locale' in the OpenAI Codex sandbox are very slow. Making this static resolves the problem, and also modestly speeds up input parsing in general. --- src/base/stringUtils.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/base/stringUtils.cpp b/src/base/stringUtils.cpp index b7f4d823269..1590b1dd807 100644 --- a/src/base/stringUtils.cpp +++ b/src/base/stringUtils.cpp @@ -121,8 +121,9 @@ Composition parseCompString(const string& ss, const vector& names) double fpValue(const string& val) { double rval; + static const auto locale = std::locale("C"); std::stringstream ss(val); - ss.imbue(std::locale("C")); + ss.imbue(locale); ss >> rval; return rval; } From 650dedcd279f731291b6cc1698e7b6e040ae0d47 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Tue, 10 Feb 2026 13:51:21 -0500 Subject: [PATCH 4/5] Add some project config for compatibility with Pixi --- .gitattributes | 2 ++ .gitignore | 3 +++ 2 files changed, 5 insertions(+) diff --git a/.gitattributes b/.gitattributes index d7c17bf9db8..eac3fe624f8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,5 @@ *.hdf binary *.hdf5 binary *.h5 binary +# SCM syntax highlighting & preventing 3-way merges +pixi.lock merge=binary linguist-language=YAML linguist-generated=true -diff diff --git a/.gitignore b/.gitignore index 8c8ba65bae8..d616ae5bbaa 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,6 @@ environment.y* coverage/ coverage.info .coverage +# pixi environments +.pixi/* +!.pixi/config.toml From 46e6bc1bd75ac478b935636b3e2d3016d4ac7143 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Tue, 10 Feb 2026 14:13:15 -0500 Subject: [PATCH 5/5] [Doc] Fix outdated docstring for vcs_volPhase::getFormulaMatrix --- include/cantera/equil/vcs_VolPhase.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/cantera/equil/vcs_VolPhase.h b/include/cantera/equil/vcs_VolPhase.h index 2e01ffc2209..97d32cc451f 100644 --- a/include/cantera/equil/vcs_VolPhase.h +++ b/include/cantera/equil/vcs_VolPhase.h @@ -368,8 +368,8 @@ class vcs_VolPhase //! Get a constant form of the Species Formula Matrix /*! - * Returns a `double**` pointer such that `fm[e][f]` is the formula - * matrix entry for element `e` for species `k` + * Returns a matrix `M` where `M(k, e)` is the entry for element `e` and + * species `k`. */ const Array2D& getFormulaMatrix() const;