Tweaks to simplify working with coding agents

.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

.gitignore

@@ -54,3 +54,6 @@ environment.y*
 coverage/
 coverage.info
 .coverage
+# pixi environments
+.pixi/*
+!.pixi/config.toml

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 "<unknown processor>"
     elif platform.system() == "Linux":
         command = "lscpu || cat /proc/cpuinfo"
         all_info = subprocess.check_output(command, shell=True).decode().strip()

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;
 

include/cantera/kinetics/Group.h

@@ -127,9 +127,6 @@ class Group
 
     std::ostream& fmt(std::ostream& s, const vector<string>& esymbols) const;
 
-    friend std::ostream& operator<<(std::ostream& s,
-                                    const Group& g);
-
 private:
     vector<int> m_comp;
     int m_sign;

src/base/stringUtils.cpp

@@ -121,8 +121,9 @@ Composition parseCompString(const string& ss, const vector<string>& 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;
 }

src/kinetics/Group.cpp

@@ -57,14 +57,4 @@ std::ostream& Group::fmt(std::ostream& s, const vector<string>& esymbols) const
     return s;
 }
 
-std::ostream& operator<<(std::ostream& s, const Group& g)
-{
-    if (g.valid()) {
-        s << g.m_comp;
-    } else {
-        s << "<none>";
-    }
-    return s;
-}
-
 }