Skip to content

Commit 0add9cd

Browse files
authored
Merge pull request #667 for Electrochemistry!
This brings in lots of electrochemistry work, both for CO2 reduction and for Lithium SEI work. See https://chemrxiv.org/engage/chemrxiv/article-details/6695ecaf5101a2ffa87f3953 for the Lithium stuff and https://doi.org/10.17760/D20467257}{10.17760/D20467257 for CO2 reduction. Requires updated RMG-Py to function. (merging that soon via ReactionMechanismGenerator/RMG-Py#2598 )
2 parents aceafa2 + 41080ee commit 0add9cd

File tree

142 files changed

+73622
-14449
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+73622
-14449
lines changed

.github/workflows/CI.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
timeout-minutes: 120 # this usually takes 20-45 minutes (or hangs for 6+ hours).
9999
run: |
100100
python -c "import julia; julia.install(); import diffeqpy; diffeqpy.install()"
101-
julia -e 'using Pkg; Pkg.add(PackageSpec(name="ReactionMechanismSimulator",rev="main")); using ReactionMechanismSimulator'
101+
julia -e 'using Pkg; Pkg.add(PackageSpec(name="ReactionMechanismSimulator",rev="for_rmg")); using ReactionMechanismSimulator'
102102
103103
- name: Install Q2DTor
104104
run: echo "" | make q2dtor
@@ -208,7 +208,7 @@ jobs:
208208
export FAILED=Yes
209209
fi
210210
echo "" # blank line so next block is interpreted as markdown
211-
cat "$regr_test-core.log"
211+
cat "$regr_test-core.log" || (echo "Dumping the whole log failed, please download it from GitHub actions. Here are the first 100 lines:" && head -n100 "$regr_test-core.log")
212212
echo "</details>"
213213
echo "<details>"
214214
if python-jl scripts/checkModels.py \
@@ -225,7 +225,7 @@ jobs:
225225
export FAILED=Yes
226226
fi
227227
echo "" # blank line so next block is interpreted as markdown
228-
cat "$regr_test-edge.log"
228+
cat "$regr_test-edge.log" || (echo "Dumping the whole log failed, please download it from GitHub actions. Here are the first 100 lines:" && head -n100 "$regr_test-core.log")
229229
echo "</details>"
230230
231231
# Check for Regression between Reference and Dynamic (skip superminimal)

input/forbiddenStructures.py

Lines changed: 42 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,28 @@
2424

2525
entry(
2626
label = "Od_rad",
27-
group =
27+
group =
2828
"""
2929
1 O u1 {2,D}
3030
2 R ux {1,D}
3131
""",
3232
shortDesc = u"""""",
33-
longDesc =
33+
longDesc =
3434
u"""
3535
3636
""",
3737
)
3838

3939
entry(
4040
label = "N_birad_triplet_2singleBonds",
41-
group =
41+
group =
4242
"""
4343
1 N u2 p0 {2,S} {3,S}
4444
2 R ux {1,S}
4545
3 R ux {1,S}
4646
""",
4747
shortDesc = u"""""",
48-
longDesc =
48+
longDesc =
4949
u"""
5050
5151
""",
@@ -58,7 +58,7 @@
5858
1 C u4 p0
5959
""",
6060
shortDesc = u"""""",
61-
longDesc =
61+
longDesc =
6262
u"""
6363
6464
""",
@@ -129,46 +129,46 @@
129129

130130
entry(
131131
label = "O3",
132-
group =
132+
group =
133133
"""
134134
1 O u[0,1] {2,S}
135135
2 O u0 {1,S} {3,S}
136136
3 O u[0,1] {2,S}
137137
""",
138138
shortDesc = u"""""",
139-
longDesc =
139+
longDesc =
140140
u"""
141141
142142
""",
143143
)
144144

145145
entry(
146146
label = "O4..",
147-
group =
147+
group =
148148
"""
149149
1 O u1 {2,S}
150150
2 O u0 {1,S} {3,S}
151151
3 O u0 {2,S} {4,S}
152152
4 O u1 {3,S}
153153
""",
154154
shortDesc = u"""""",
155-
longDesc =
155+
longDesc =
156156
u"""
157157
158158
""",
159159
)
160160

161161
entry(
162162
label = "cyclic-C3O",
163-
group =
163+
group =
164164
"""
165165
1 C u0 {2,D} {3,S} {4,S}
166166
2 O u0 {1,D}
167167
3 C u0 {1,S} {4,T}
168168
4 C u0 {1,S} {3,T}
169169
""",
170170
shortDesc = u"""""",
171-
longDesc =
171+
longDesc =
172172
u"""
173173
174174
""",
@@ -189,6 +189,23 @@
189189
""",
190190
)
191191

192+
193+
entry(
194+
label = "LiCONSFCl",
195+
group =
196+
"""
197+
1 Li u0 p0 c0 {2,S}
198+
2 C ux px c0 {3,[S,D,T]} {1,S}
199+
3 [O,N,S,F,Cl] ux px c0 {2,[S,D,T]}
200+
""",
201+
shortDesc = u"""""",
202+
longDesc =
203+
u"""
204+
In these species the other atom tends to take most of the charge from the Li
205+
so it isn't really bonded to C
206+
""",
207+
)
208+
192209
entry(
193210
label = "CO_birad",
194211
species =
@@ -492,6 +509,20 @@
492509
""",
493510
)
494511

512+
entry(
513+
label = "LiX",
514+
species =
515+
"""
516+
1 Li u0 p0 c0 {2,S}
517+
2 X u0 p0 c0 {1,S}
518+
""",
519+
shortDesc = u"""""",
520+
longDesc =
521+
u"""
522+
Don't allow Li to plate
523+
""",
524+
)
525+
495526
entry(
496527
label = "CO2X2",
497528
species =

0 commit comments

Comments
 (0)