Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
8c3bfba
Added atom types for nitrogen.
bbuesser Feb 28, 2013
414fc01
Adding attributes to the class Atom describing the number of lone
bbuesser Mar 7, 2013
5918d4b
Removed a code section responsible for saturating the input adjacency
bbuesser Mar 7, 2013
7de9467
Added function searching for resonance isomers by radical-lone electron
bbuesser Mar 10, 2013
77997a7
Extended the symmetry number calculation to account for nitrogen atoms.
bbuesser Mar 11, 2013
6f799ee
Change removeH from True to False to enforce explicit hydrogens in
bbuesser Mar 11, 2013
bd662ec
I have added the atomic mass of nitrogen to the function loadGeometry
bbuesser Apr 25, 2013
1ef8c6e
Added the function saveChemkinFileEdge.
bbuesser May 6, 2013
379c50c
Extension for nitrogen molecule.py and molecule.pxd
bbuesser May 6, 2013
35b3cbe
Added functions to increment and decrement the number of lone electron
bbuesser May 6, 2013
14a8a88
Extending function isMoleculeForbidden()
bbuesser May 6, 2013
15618c5
Introduction of a new reaction family involving lone electron pairs
bbuesser May 6, 2013
f35e603
Simple extension to draw.py to draw the lone electron pairs as angular
bbuesser May 6, 2013
87b1243
Adding GAIN_PAIR and LOSE_PAIR actions to ReactionRecipe
bbuesser May 6, 2013
a362192
Adding lone electron pairs to group.py
bbuesser May 6, 2013
355bbc1
Improving performance of forbidding molecular ions
bbuesser May 8, 2013
3e3f1d9
Improving performance in atom symmetry number calculation
bbuesser May 8, 2013
1ca54d0
Merge remote-tracking branch 'GreenGroup/master'
bbuesser May 8, 2013
088f233
Merge remote-tracking branch 'GreenGroup/master'
bbuesser May 15, 2013
8249d4c
Introducing optional parameter in adjacency lists for lone electron
bbuesser May 15, 2013
c019e5d
Added functions to write the edge of the model as CHEMKIN files.
bbuesser Aug 2, 2013
d88d5a5
Merge remote-tracking branch 'GreenGroup/master'
bbuesser Aug 2, 2013
5cddb40
Merge remote-tracking branch 'GreenGroup/master'
bbuesser Aug 2, 2013
ea24a4f
Modified function toAdjacencyList to print the number of lone pair
bbuesser Aug 5, 2013
156da34
A new reaction family describing the conversion of nitro (RNO2) to
bbuesser Aug 5, 2013
79b3683
Update to prevent problems with nitrates and intra_NO2_ONO_conversion.
bbuesser Aug 11, 2013
23ab9d5
Merge remote-tracking branch 'GreenGroup/master'
bbuesser Oct 13, 2013
240b98f
Wrapping RDKit for non-standard valency
bbuesser Oct 17, 2013
9d79001
Additional Atom Energies and Bond Additivity Corrections
bbuesser Oct 24, 2013
176c216
Increase atomElectronStateWidth by +1
bbuesser Oct 24, 2013
906d504
Use OpenBabel for InChKey generation
bbuesser Oct 26, 2013
880460c
Do not remove hydrogen from thermoHBIcheck.txt
bbuesser Oct 26, 2013
b67b2c2
Exclude temporarily tetra-valent nitrogen from QM
bbuesser Oct 29, 2013
2678191
Change N4 to N5
bbuesser Nov 4, 2013
da085ec
Change N4 to N5
bbuesser Nov 4, 2013
08ce20a
Change N4 to N5
bbuesser Nov 4, 2013
6927c8d
Change N4 to N5
bbuesser Nov 4, 2013
2e3544e
Merge remote-tracking branch 'GreenGroup/master' into newTree
bbuesser Nov 5, 2013
cb2970a
Do not remove explicit hydrogen atoms
bbuesser Nov 5, 2013
5ce1b76
Exclude radicals with one heavy atom from maxRadicals limitation
bbuesser Nov 11, 2013
d944107
Add functions to determine if biradical is singlet and is triplet
bbuesser Nov 11, 2013
c3639e0
Addding function changing triplet radical to singlet radical
bbuesser Nov 11, 2013
f0d2f23
Function checking reverse reactions of CH2(S) for correct multiplicity
bbuesser Nov 11, 2013
ab3642a
Correct BAC for CCSD(T)-F12/cc-pVTZ-F12 'C-O'
bbuesser Nov 13, 2013
611f32a
toInChI: Fall back to openbabel of RDKit fails for nitrogen
bbuesser Nov 14, 2013
d92fa06
Merge remote-tracking branch 'GreenGroup/master'
bbuesser Nov 14, 2013
5d7d9be
Make OpenBabel requirement optional
bbuesser Nov 14, 2013
900142f
Merge remote-tracking branch 'GreenGroup/master'
bbuesser Nov 19, 2013
abe18eb
replace getformula() with SMILEwriter using openbabel for nitrogen
bbuesser Nov 19, 2013
118befd
Extend fingerprint generation to account for nitrogen atoms
bbuesser Nov 20, 2013
f71ccc9
Include NH(S) into quick fix for reverse reaction of singlet biradicals
bbuesser Nov 20, 2013
b4d8b86
fixing failing testToAdjacencyList()
bbuesser Nov 21, 2013
f313e8a
fixing the failing test testAdjacencyList()
bbuesser Nov 21, 2013
97192bc
add explicit hydrogen to setup test molecule to fix failing test
bbuesser Nov 21, 2013
d9425b0
fix testToAdjacencyList
bbuesser Nov 21, 2013
6bdd706
fix testToAdjacencyList() of speciesTest.py
bbuesser Nov 21, 2013
0714b4f
fix testSubgraphIsomorphismManyLabels() of moleculeTest.py
bbuesser Nov 21, 2013
dcdce81
fix testSetActions() in atomtypeTest.py
bbuesser Nov 21, 2013
2528de2
A preliminary solution for the reverse reaction of CH2(T) + CH
bbuesser Nov 21, 2013
65084ca
Example input for RMG-Py including nitrogen and lone electron pairs
bbuesser Nov 21, 2013
a575e4f
Add additional electronic states
bbuesser Nov 21, 2013
5ea2e40
Add function to set spin multiplicity of an atom
bbuesser Nov 22, 2013
59e0a7b
Finding all possible electronic states in product structures
bbuesser Nov 24, 2013
9ea1008
Improve extension to product structure generation
bbuesser Nov 26, 2013
b800aa9
Add function getRadicalAtoms to class Molecule
bbuesser Nov 26, 2013
76d9884
Correct the assertion of maximum number of radicals
bbuesser Nov 28, 2013
90b6b4e
Improving stability of resonance structure generation
bbuesser Nov 28, 2013
aa61f27
limit allyl resonance structure generation to monoradicals
bbuesser Nov 29, 2013
d71a1a0
Give the edge CHEMKIN files the same numbering as for the core ones
bbuesser Dec 2, 2013
95d7089
Merge remote-tracking branch 'GreenGroup/master'
bbuesser Dec 2, 2013
05c51b8
Update the reaction families used by the examples
bbuesser Dec 7, 2013
13297e3
Add missing function call to calculate transport properties for seed
bbuesser Dec 7, 2013
32cb930
Prevent RMG from crashing because of missing transport groups
bbuesser Dec 7, 2013
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
22 changes: 0 additions & 22 deletions .coveragerc

This file was deleted.

2 changes: 1 addition & 1 deletion examples/rmg/1,3-hexadiene/input.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
reactionLibraries = [],
seedMechanisms = [],
kineticsDepositories = ['training'], # 'all', 'default'==['training'], [],
kineticsFamilies = ['!Intra_Disproportionation'],
kineticsFamilies = ['!Intra_Disproportionation','!Substitution_O'],
kineticsEstimator = 'rate rules',
)

Expand Down
2 changes: 1 addition & 1 deletion examples/rmg/TEOS/input.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
reactionLibraries = [],
seedMechanisms = [],
kineticsDepositories = ['training'],
kineticsFamilies = ['!Intra_Disproportionation'],
kineticsFamilies = ['!Intra_Disproportionation','!Substitution_O'],
kineticsEstimator = 'rate rules',
)

Expand Down
6 changes: 3 additions & 3 deletions examples/rmg/c3h4/input.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Data sources
database(
thermoLibraries = ['primaryThermoLibrary', 'GRI-Mech3.0'],
thermoLibraries = ['primaryThermoLibrary', 'GRI-Mech3.0-N'],
reactionLibraries = [],
seedMechanisms = [],
seedMechanisms = ['GRI-Mech3.0-N'],
kineticsDepositories = ['training'], # 'all', 'default'==['training'], [],
kineticsFamilies = ['!Intra_Disproportionation'],
kineticsFamilies = ['!Intra_Disproportionation','!Substitution_O'],
kineticsEstimator = 'rate rules',
)

Expand Down
86 changes: 86 additions & 0 deletions examples/rmg/ch3no2/input.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
# Data sources
database(
thermoLibraries = ['KlippensteinH2O2', 'primaryThermoLibrary','DFT_QCI_thermo','CH','CHN','CHO','CHON','CN','NISTThermoLibrary','thermo_DFT_CCSDTF12_BAC','GRI-Mech3.0-N'],
reactionLibraries = [('Nitrogen_Dean_and_Bozelli',False)],
seedMechanisms = ['ERC-FoundationFuelv0.9'],
kineticsDepositories = ['training'],
kineticsFamilies = ['!Intra_Disproportionation', '!Substitution_O'],
kineticsEstimator = 'rate rules',
)

# Constraints on generated species
generatedSpeciesConstraints(
#maximumCarbonAtoms = 7,
#maximumHydrogenAtoms = 8,
#maximumOxygenAtoms = 5,
maximumNitrogenAtoms = 2,
#maximumSiliconAtoms = 0,
#maximumSulfurAtoms = 0,
#maximumHeavyAtoms = 3,
maximumRadicalElectrons = 2,
)

# List of species
species(
label='CH3NO2',
reactive=True,
structure=adjacencyList(
"""
1 C 0 0 {2,S} {3,S} {4,S} {5,S}
2 H 0 0 {1,S}
3 H 0 0 {1,S}
4 H 0 0 {1,S}
5 N 0 0 {1,S} {6,D} {7,S}
6 O 0 2 {5,D}
7 O 0 3 {5,S}
"""),
)

species(
label='O2',
reactive=True,
structure=adjacencyList(
"""
1 O 1 2 {2,S}
2 O 1 2 {1,S}
"""),
)

species(
label='N2',
reactive=True,
structure=adjacencyList(
"""
1 N 1 1 {2,T}
2 N 1 1 {1,T}
"""),
)

# Reaction systems

simpleReactor(
temperature=(1500,'K'),
pressure=(10.0,'bar'),
initialMoleFractions={
"CH3NO2": 0.1,
"O2": 0.21,
"N2": 0.69,
},
terminationConversion={
'CH3NO2': 0.1,
},
)

model(
toleranceKeepInEdge=1e-5,
toleranceMoveToCore=0.1,
toleranceInterruptSimulation=0.1,
maximumEdgeSpecies=10000
)

options(
units='si',
saveRestartPeriod=None,
drawMolecules=False,
generatePlots=False,
)
2 changes: 1 addition & 1 deletion examples/rmg/diesel/input.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
reactionLibraries = [],
seedMechanisms = [],
kineticsDepositories = ['training'], # 'all', 'default'==['training'], [],
kineticsFamilies = ['!Intra_Disproportionation'],
kineticsFamilies = ['!Intra_Disproportionation','!Substitution_O'],
kineticsEstimator = 'rate rules',
)

Expand Down
2 changes: 1 addition & 1 deletion examples/rmg/e85/input.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
reactionLibraries = [],
seedMechanisms = ['GRI-Mech3.0'],
kineticsDepositories = ['training'],
kineticsFamilies = ['!Intra_Disproportionation'],
kineticsFamilies = ['!Intra_Disproportionation','!Substitution_O'],
kineticsEstimator = 'rate rules',
)

Expand Down
2 changes: 1 addition & 1 deletion examples/rmg/liquid_phase/input.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
reactionLibraries = [],
seedMechanisms = [],
kineticsDepositories = ['training'],
kineticsFamilies = ['!Intra_Disproportionation'],
kineticsFamilies = ['!Intra_Disproportionation','!Substitution_O'],
kineticsEstimator = 'rate rules',
)

Expand Down
2 changes: 1 addition & 1 deletion examples/rmg/methylformate/input.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
reactionLibraries = [('Methylformate',False),('Glarborg/highP',False)],
seedMechanisms = ['Glarborg/C2'],
kineticsDepositories = ['training'],
kineticsFamilies = ['!Intra_Disproportionation'],
kineticsFamilies = ['!Intra_Disproportionation','!Substitution_O'],
kineticsEstimator = 'rate rules',
)

Expand Down
2 changes: 1 addition & 1 deletion examples/rmg/minimal/input.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
reactionLibraries = [],
seedMechanisms = [],
kineticsDepositories = ['training'],
kineticsFamilies = ['!Intra_Disproportionation'],
kineticsFamilies = ['!Intra_Disproportionation','!Substitution_O'],
kineticsEstimator = 'rate rules',
)

Expand Down
2 changes: 1 addition & 1 deletion examples/rmg/minimal_sensitivity/input.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
reactionLibraries = [],
seedMechanisms = [],
kineticsDepositories = ['training'],
kineticsFamilies = ['!Intra_Disproportionation'],
kineticsFamilies = ['!Intra_Disproportionation','!Substitution_O'],
kineticsEstimator = 'rate rules',
)

Expand Down
Loading