Merge remote-tracking branch 'upstream/main' into feature/mixedPolytrope

# Conflicts: # .gitignore # build-config/meson.build # meson.build # meson_options.txt # src/composition/public/composition.h # src/config/public/config.h # src/constants/public/const.h # src/meson.build # tests/composition_sandbox/comp.cpp
2025-06-11 15:05:11 -04:00
parent 2586adba59 144e8e2e08
commit 72f08238b6
37 changed files with 839 additions and 39 deletions
--- a/assets/logo/serifLogo.png
+++ b/assets/logo/serifLogo.png
--- a/assets/logo/serifLogo.svg
+++ b/assets/logo/serifLogo.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="500mm"
+   height="300mm"
+   viewBox="0 0 500 300"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="serifLogo.svg"
+   inkscape:version="1.4 (e7c3feb1, 2024-10-09)"
+   inkscape:export-filename="serifLogo.png"
+   inkscape:export-xdpi="300"
+   inkscape:export-ydpi="300"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     inkscape:zoom="0.31892609"
+     inkscape:cx="801.12605"
+     inkscape:cy="660.02753"
+     inkscape:window-width="1728"
+     inkscape:window-height="962"
+     inkscape:window-x="0"
+     inkscape:window-y="38"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1">
+    <inkscape:page
+       x="0"
+       y="0"
+       width="500"
+       height="300"
+       id="page2"
+       margin="0"
+       bleed="0" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="font-weight:500;font-size:225.583px;font-family:Federation;-inkscape-font-specification:'Federation Medium';fill:#4c7cbc;stroke:#000000;stroke-width:0.263773"
+       d="m 390.37455,205.22986 h 35.41653 l 24.81413,-56.39575 h 45.34218 l 12.18148,-28.19787 h -80.08196 z"
+       transform="scale(0.93412862,1.0705164)"
+       id="path7" />
+    <path
+       style="font-weight:500;font-size:225.583px;font-family:Federation;-inkscape-font-specification:'Federation Medium';fill:#3d907f;stroke:#000000;stroke-width:0.263773;fill-opacity:1"
+       d="m 437.29581,99.205852 h 80.53313 l 12.18148,-28.197874 h -80.08196 z"
+       transform="scale(0.93412862,1.0705164)"
+       id="path6" />
+    <path
+       style="font-weight:500;font-size:225.583px;font-family:Federation;-inkscape-font-specification:'Federation Medium';fill:#408496;stroke:#000000;stroke-width:0.263773;fill-opacity:1"
+       d="m 394.09472,72.246105 -11.02484,25.386289 25.07976,0.08255 10.85491,-25.534574 z"
+       transform="scale(0.93412862,1.0705164)"
+       id="path5" />
+    <path
+       style="font-weight:500;font-size:225.583px;font-family:Federation;-inkscape-font-specification:'Federation Medium';fill:#4c7cbc;stroke:#000000;stroke-width:0.263773"
+       d="m 336.23478,205.22986 h 25.71646 l 36.10165,-84.0768 h -24.84286 z"
+       transform="scale(0.93412862,1.0705164)"
+       id="path4" />
+    <path
+       id="path3"
+       style="font-weight:500;font-size:225.583px;font-family:Federation;-inkscape-font-specification:'Federation Medium';fill:#4c7cbc;stroke:#000000;stroke-width:0.263773"
+       d="m 363.96719,101.97552 -35.27484,0.004 c -1.8739,4.3543 -3.83937,8.67994 -5.7669,13.01714 -2.48141,3.83491 -5.41412,5.63967 -9.24903,5.63967 H 260.4388 l -37.67213,84.59358 h 35.41617 l 24.81455,-56.39572 h 16.46724 c 1.57908,0.45117 2.93248,1.12801 3.83481,2.03034 0.90234,0.90233 1.3537,2.03006 1.3537,3.15798 l -0.45087,2.03034 -22.33287,49.17706 h 35.19101 l 17.82094,-39.02585 c 1.12792,-2.03025 1.57884,-4.2859 1.57884,-6.76731 0,-2.48141 -0.67633,-4.73755 -2.25541,-6.7678 -1.57908,-1.80466 -2.93274,-3.15801 -4.28623,-3.83476 1.57908,0 3.38366,-0.45123 5.86507,-1.35356 2.48142,-0.90233 3.83494,-1.35341 4.06052,-1.57899 4.06049,-2.25583 6.99295,-5.63955 8.79762,-10.15121 z"
+       transform="scale(0.93412862,1.0705164)"
+       sodipodi:nodetypes="cccscccccscccccsccsccc" />
+    <path
+       id="path16"
+       style="font-weight:500;font-size:225.583px;font-family:Federation;-inkscape-font-specification:'Federation Medium';fill:#947abe;stroke:#000000;stroke-width:0.263773;fill-opacity:1"
+       d="M 282.32026 71.007785 L 269.68783 99.205645 L 320.44381 99.205645 C 320.5261 99.214788 320.60289 99.235115 320.68445 99.245711 L 320.65624 99.229781 L 365.21632 99.221575 L 371.87691 84.542893 L 372.55348 81.158995 C 372.55348 78.226417 371.20007 75.74515 368.71866 73.714903 C 366.23725 71.910239 363.30492 71.007785 360.14676 71.007785 L 282.32026 71.007785 z "
+       transform="scale(0.93412862,1.0705164)" />
+    <path
+       style="font-weight:500;font-size:225.583px;font-family:Federation;-inkscape-font-specification:'Federation Medium';fill:#4c7cbc;stroke:#000000;stroke-width:0.263773"
+       d="m 124.63791,205.22986 h 80.75871 L 218.9316,173.64824 H 173.815 l 11.05357,-24.81413 h 45.34218 l 12.18148,-28.19787 h -80.08196 z"
+       transform="scale(0.93412862,1.0705164)"
+       id="path2" />
+    <path
+       style="font-weight:500;font-size:225.583px;font-family:Federation;-inkscape-font-specification:'Federation Medium';fill:#7a7cc1;stroke:#000000;stroke-width:0.263773;fill-opacity:1"
+       d="M 171.55917,99.205852 H 252.0923 L 264.27378,71.007978 H 184.19182 Z"
+       transform="scale(0.93412862,1.0705164)"
+       id="path1" />
+    <path
+       style="font-weight:500;font-size:225.583px;font-family:Federation;-inkscape-font-specification:'Federation Medium';fill:#4c7cbc;stroke:#000000;stroke-width:0.263773"
+       d="M 19.06486,173.64824 4.4019656,205.22986 H 72.302446 c 16.467559,0 29.776954,-5.41399 40.379354,-16.01639 10.37682,-10.6024 15.56523,-23.46064 15.56523,-38.12353 0,-14.66289 -6.54191,-24.13738 -19.40014,-28.19787 -13.083812,-3.83491 -19.625719,-7.89541 -19.625719,-11.9559 0,-4.96283 1.127915,-8.12099 3.609328,-9.70007 2.481413,-1.353499 6.541906,-2.030248 12.407061,-2.030248 h 29.10021 L 146.51925,71.007978 H 88.544422 c -13.760563,0 -23.009465,3.834911 -28.197874,11.730315 -5.188409,7.895405 -7.669822,17.595477 -7.669822,29.325787 0,13.53498 6.316324,22.78388 19.174554,27.74671 12.632648,4.96283 18.948972,10.6024 18.948972,16.91872 0,6.54191 -2.030247,11.05357 -6.316324,13.53498 -4.962826,2.25583 -11.053567,3.38375 -18.272222,3.38375 z"
+       transform="scale(0.93412862,1.0705164)"
+       id="text1" />
+  </g>
+</svg>
--- a/assets/static/atomic/include/atomicSpecies.h
+++ b/assets/static/atomic/include/atomicSpecies.h
@@ -1,5 +1,4 @@
-#ifndef SPECIES_MASS_DATA_H
-#define SPECIES_MASS_DATA_H
+#pragma once
 #include <unordered_map>
 #include <string_view>
 #include <string>
@@ -7205,4 +7204,3 @@ namespace chemSpecies {
        {"Og-295", Og_295},
    };
 }; // namespace chemSpecies
-#endif // SPECIES_MASS_DATA_H