Skip to content

Commit ee66f8f

Browse files
authored
Merge branch 'main' into update_thermo
2 parents 82f1a12 + f48dae1 commit ee66f8f

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

.github/workflows/CI.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@ jobs:
8080
mamba info
8181
mamba list
8282
83+
- name: Make libtiff Symlink to Avoid Runner Bug
84+
run: | # This action may need to be removed/adjusted in future runs.
85+
if [ ! -f /usr/lib/x86_64-linux-gnu/libtiff.so.5 ] && [ -f /usr/lib/x86_64-linux-gnu/libtiff.so.6 ]; then sudo ln -s /usr/lib/x86_64-linux-gnu/libtiff.so.6 /usr/lib/x86_64-linux-gnu/libtiff.so.5; fi
86+
find /usr/lib -name libtiff*
87+
8388
# modify env variables as directed in the RMG installation instructions
8489
- name: Set Environment Variables
8590
run: |
@@ -130,7 +135,7 @@ jobs:
130135
# Upload Regression Results as Failed if above step failed
131136
- name: Upload Failed Results
132137
if: ${{ failure() && steps.regression-execution.conclusion == 'failure' }}
133-
uses: actions/upload-artifact@v3
138+
uses: actions/upload-artifact@v4
134139
with:
135140
name: failed_regression_results
136141
path: |
@@ -139,7 +144,7 @@ jobs:
139144
# Upload Regression Results as Dynamic if Push to non-main Branch
140145
- name: Upload Results as Dynamic
141146
if: ${{ env.REFERENCE_JOB == 'false' }}
142-
uses: actions/upload-artifact@v3
147+
uses: actions/upload-artifact@v4
143148
with:
144149
name: dynamic_regression_results
145150
path: |
@@ -269,14 +274,14 @@ jobs:
269274
270275
- name: Upload regression summary artifact
271276
# the annotate workflow uses this artifact to add a comment to the PR
272-
uses: actions/upload-artifact@v3
277+
uses: actions/upload-artifact@v4
273278
if : ${{ github.event_name == 'pull_request' }}
274279
with:
275280
name: regression_summary
276281
path: RMG-Py/summary.txt
277282

278283
- name: Upload Comparison Results
279-
uses: actions/upload-artifact@v3
284+
uses: actions/upload-artifact@v4
280285
with:
281286
name: regression_test_comparison_results
282287
path: |

input/kinetics/libraries/primaryH2O2/reactions.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,15 +460,17 @@
460460

461461
entry(
462462
index=45,
463-
label="H2 + O2 <=> O + H2O",
463+
label="H2 + O2 => O + H2O",
464+
reversible = False,
464465
kinetics=Arrhenius(A=(3e+13, 'cm^3/(mol*s)'), n=0, Ea=(69545, 'cal/mol'), T0=(1, 'K')),
465466
shortDesc=u"""[Konnov2015]""",
466467
longDesc=u"""Table 2, Reaction X2""",
467468
)
468469

469470
entry(
470471
index=46,
471-
label="H2 + O2 + O2 <=> HO2 + HO2",
472+
label="H2 + O2 + O2 => HO2 + HO2",
473+
reversible = False,
472474
kinetics=Arrhenius(A=(2e+17, 'cm^6/(mol^2*s)'), n=0, Ea=(25830, 'cal/mol'), T0=(1, 'K')),
473475
shortDesc=u"""[Konnov2015]""",
474476
longDesc=u"""Table 2, Reaction X3""",

input/quantum_corrections/data.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -544,6 +544,13 @@
544544
"C": -37.788504810868 + SOC["C"],
545545
"S": -397.666903000231 + SOC["S"],
546546
},
547+
"LevelOfTheory(method='ccsd(t)f12',basis='augccpvtzf12',software='molpro')": {
548+
'H': -0.499809811302 + SOC["H"],
549+
'N': -54.51301792591 + SOC["N"],
550+
'O': -74.970882177931 + SOC["O"],
551+
'C': -37.776086428513 + SOC["C"],
552+
'S': -397.649699183441 + SOC["S"],
553+
},
547554
"LevelOfTheory(method='ccsd(t)f12',basis='augccpvqz',software='molpro')": {
548555
"H": -0.499949526073 + SOC["H"],
549556
"N": -54.529569719016 + SOC["N"],

0 commit comments

Comments
 (0)