Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lithium rebase #667

Merged
merged 81 commits into from
Nov 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
20f659b
added Li to metal database
davidfarinajr Sep 2, 2021
33a61dc
added electrocatThermo thermo library
davidfarinajr May 12, 2021
598b238
added electrochem kinetics families
davidfarinajr May 12, 2021
12b8743
modified O2 ads in Deutschmann lib
davidfarinajr Sep 1, 2021
e0cee2c
add adsorptionLi thermo groups
davidfarinajr Sep 1, 2021
ebd1505
add surfaceThermoLi thermo library
davidfarinajr Sep 2, 2021
fc0cf53
add 50:50 EC:DMC solvent parameters
mjohnson541 Sep 29, 2021
f4eb440
add Surface Carbonate 2F Decomposition family
mjohnson541 Sep 29, 2021
d520461
add Surface Carbonate CO 2F Decomposition family
mjohnson541 Sep 29, 2021
176beff
add Surface Carbonate CO Decomposition family
mjohnson541 Sep 29, 2021
bdeeac9
add Surface Carbonate Deposition family
mjohnson541 Sep 29, 2021
43699a7
add Surface Carbonate F CO Decomposition family
mjohnson541 Sep 29, 2021
7cb19a6
add new families to recommended
mjohnson541 Sep 29, 2021
898a1c0
*commented out carbonate families from recommended
mjohnson541 Mar 10, 2024
8c0f055
add Li thermo groups
mjohnson541 Dec 8, 2021
2406251
add LithiumPrimaryThermo Library
mjohnson541 Nov 30, 2021
58b69f0
add computationalLithiumElectrode library
davidfarinajr Nov 18, 2021
5971e00
add LithiumAdditionThermo library
mjohnson541 Dec 13, 2021
ade01d4
add LithiumPrimaryKinetics library
mjohnson541 Dec 10, 2021
713b31a
add LithiumPrimaryChargedKinetics library
mjohnson541 Dec 14, 2021
7430c6f
add Li groups for solute parameter predictions
mjohnson541 Dec 9, 2021
07ad8c8
add LithiumPrimaryThermo library solute parameters
mjohnson541 Dec 9, 2021
d1e3059
1,2_Elimination_LiR family
mjohnson541 Dec 14, 2021
6330468
1,2_Intra_Elimination_LiR family
mjohnson541 Dec 14, 2021
1c363bd
Cation_Addition_MultipleBond family
mjohnson541 Dec 14, 2021
3d0af74
Cation_Addition_MultipleBond_Disprop family
mjohnson541 Dec 14, 2021
7e6d49f
Cation_Li_Abstraction family
mjohnson541 Dec 14, 2021
9091ac0
Cation_NO_Ring_Opening family
mjohnson541 Dec 14, 2021
ca329be
Cation_NO_Substitution family
mjohnson541 Dec 14, 2021
dd4852f
Cation_R_Recombination initial family
mjohnson541 Dec 14, 2021
dda70d2
Li_Abstraction family
mjohnson541 Dec 14, 2021
2c74248
R_Addition_MultipleBond_Disprop family
mjohnson541 Dec 14, 2021
371b9ec
allow retroene for Li
mjohnson541 Dec 14, 2021
765b70b
allow Lirad for Substitution_O
mjohnson541 Dec 14, 2021
38050fb
add Li training reaction to H_Abstraction
mjohnson541 Dec 14, 2021
1e8dbaa
add training reaction to Intra_R_Add_Endocyclic
mjohnson541 Dec 14, 2021
d8f1062
add R_Addition_MultipleBond training reactions
mjohnson541 Dec 14, 2021
a7e8fd2
add Retroene training reaction
mjohnson541 Dec 14, 2021
33eb8ae
add Substitution_O training reactions
mjohnson541 Dec 14, 2021
cac0ab7
allow Lirad in R_Addition_MultipleBond
mjohnson541 Dec 14, 2021
acba8d0
Cation_Addition_MultipleBond reverse direction to improve estimation
mjohnson541 Dec 14, 2021
7358ffa
Cation_Addition_MultipleBond_Disprop reverse direction to improve est…
mjohnson541 Dec 14, 2021
506437f
Li_Abstraction reverse direction to improve estimation
mjohnson541 Dec 14, 2021
906feba
Cation_NO_Ring_Opening reverse direction to improve estimation
mjohnson541 Dec 14, 2021
82f65af
Cation_NO_Substitution reverse direction to improve estimation
mjohnson541 Dec 14, 2021
0f53141
don't allow Li to plate
mjohnson541 Jan 11, 2022
a1b1c86
globally forbid LiC[ONSFCl]
mjohnson541 Feb 14, 2022
5f3c854
forbid carbonate radical reactions
mjohnson541 Feb 14, 2022
fb7e3b4
Added Li families to recommended
mjohnson541 Jan 11, 2022
863c05a
bulk tree generation
mjohnson541 Jan 11, 2022
525a46a
add solvent parameters for ethylene carbonate
mjohnson541 Apr 3, 2022
8e40c5f
add LithiumPrimaryThermo2 library
mjohnson541 Apr 24, 2022
ffbd565
add LithiumPrimaryKinetics2 library
mjohnson541 Apr 24, 2022
5323bcd
add indices of refraction and dielectric constants
mjohnson541 Oct 7, 2022
a1b172b
add Lithium families
mjohnson541 May 10, 2023
92ddb03
add Yunsie's reaction solvation data
mjohnson541 May 10, 2023
3994f11
add LithiumAnalogKinetics library
mjohnson541 May 10, 2023
7c4acc7
add electrocatLithermo library
mjohnson541 May 10, 2023
daa05c1
remove redundant development families
mjohnson541 May 10, 2023
7d7a614
fix Surface Proton Electron Reduction families
mjohnson541 Jun 3, 2023
aee96c0
fix LithiumPrimaryKinetics
mjohnson541 Jun 3, 2023
bce2c51
fix LithiumPrimaryChargedKinetics
mjohnson541 Jun 3, 2023
6750114
fix LithiumPrimaryKinetics2
mjohnson541 Jun 4, 2023
5abda20
fix O2d-S6dd group
mjohnson541 Jun 3, 2023
0bc65db
fix CsOOOring group
mjohnson541 Jun 3, 2023
4c3faff
add training reactions for Cation_R_Recombination
mjohnson541 Mar 10, 2024
b23abeb
train Cation_R_Recombination
mjohnson541 Mar 10, 2024
4f09b7a
train R_Addition_MultipleBond_Disprop
mjohnson541 Mar 10, 2024
b28113f
forbid carbon toss in 1,2_Elimination_LiR
mjohnson541 Mar 10, 2024
1379ec6
forbid carbonatebreak in R_Addition_MultipleBond
mjohnson541 Mar 10, 2024
8e77e10
amend R_Addition_MultipleBond_Disprop training set
mjohnson541 Mar 10, 2024
09b38f3
amend LithiumPrimaryKinetics library based on new results
mjohnson541 Mar 10, 2024
3dc253e
add new Lithium analogy reactions
mjohnson541 Mar 10, 2024
9148f3b
integrate adsorption data from Pynta calculations
mjohnson541 Mar 10, 2024
7fd67a5
add LithiumSurface thermo library
mjohnson541 Mar 10, 2024
33f2211
add lithium surface kinetics libraries
mjohnson541 Mar 10, 2024
ce20ae3
Uncommented some PCET family rules
ssun30 Jul 12, 2024
b0c576b
Changed the sign of electrons in PCET families
ssun30 Aug 6, 2024
1c25ad1
Removed Electrons from PCET_Beta_vdW Groups
ssun30 Sep 24, 2024
2c02748
Allow `cat` of regression diff to fail
ssun30 Oct 9, 2024
41080ee
Tell CI to use for_rmg branch of RMS
ssun30 Nov 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
timeout-minutes: 120 # this usually takes 20-45 minutes (or hangs for 6+ hours).
run: |
python -c "import julia; julia.install(); import diffeqpy; diffeqpy.install()"
julia -e 'using Pkg; Pkg.add(PackageSpec(name="ReactionMechanismSimulator",rev="main")); using ReactionMechanismSimulator'
julia -e 'using Pkg; Pkg.add(PackageSpec(name="ReactionMechanismSimulator",rev="for_rmg")); using ReactionMechanismSimulator'

- name: Install Q2DTor
run: echo "" | make q2dtor
Expand Down Expand Up @@ -208,7 +208,7 @@ jobs:
export FAILED=Yes
fi
echo "" # blank line so next block is interpreted as markdown
cat "$regr_test-core.log"
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")
echo "</details>"
echo "<details>"
if python-jl scripts/checkModels.py \
Expand All @@ -225,7 +225,7 @@ jobs:
export FAILED=Yes
fi
echo "" # blank line so next block is interpreted as markdown
cat "$regr_test-edge.log"
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")
echo "</details>"

# Check for Regression between Reference and Dynamic (skip superminimal)
Expand Down
53 changes: 42 additions & 11 deletions input/forbiddenStructures.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,28 +24,28 @@

entry(
label = "Od_rad",
group =
group =
"""
1 O u1 {2,D}
2 R ux {1,D}
""",
shortDesc = u"""""",
longDesc =
longDesc =
u"""

""",
)

entry(
label = "N_birad_triplet_2singleBonds",
group =
group =
"""
1 N u2 p0 {2,S} {3,S}
2 R ux {1,S}
3 R ux {1,S}
""",
shortDesc = u"""""",
longDesc =
longDesc =
u"""

""",
Expand All @@ -58,7 +58,7 @@
1 C u4 p0
""",
shortDesc = u"""""",
longDesc =
longDesc =
u"""

""",
Expand Down Expand Up @@ -129,46 +129,46 @@

entry(
label = "O3",
group =
group =
"""
1 O u[0,1] {2,S}
2 O u0 {1,S} {3,S}
3 O u[0,1] {2,S}
""",
shortDesc = u"""""",
longDesc =
longDesc =
u"""

""",
)

entry(
label = "O4..",
group =
group =
"""
1 O u1 {2,S}
2 O u0 {1,S} {3,S}
3 O u0 {2,S} {4,S}
4 O u1 {3,S}
""",
shortDesc = u"""""",
longDesc =
longDesc =
u"""

""",
)

entry(
label = "cyclic-C3O",
group =
group =
"""
1 C u0 {2,D} {3,S} {4,S}
2 O u0 {1,D}
3 C u0 {1,S} {4,T}
4 C u0 {1,S} {3,T}
""",
shortDesc = u"""""",
longDesc =
longDesc =
u"""

""",
Expand All @@ -189,6 +189,23 @@
""",
)


entry(
label = "LiCONSFCl",
group =
"""
1 Li u0 p0 c0 {2,S}
2 C ux px c0 {3,[S,D,T]} {1,S}
3 [O,N,S,F,Cl] ux px c0 {2,[S,D,T]}
""",
shortDesc = u"""""",
longDesc =
u"""
In these species the other atom tends to take most of the charge from the Li
so it isn't really bonded to C
""",
)

entry(
label = "CO_birad",
species =
Expand Down Expand Up @@ -492,6 +509,20 @@
""",
)

entry(
label = "LiX",
species =
"""
1 Li u0 p0 c0 {2,S}
2 X u0 p0 c0 {1,S}
""",
shortDesc = u"""""",
longDesc =
u"""
Don't allow Li to plate
""",
)

entry(
label = "CO2X2",
species =
Expand Down
Loading
Loading