Skip to content

Commit 352fafe

Browse files
committed
RMG-Py v2.1.4 release
2 parents 3f4b028 + e74b704 commit 352fafe

File tree

132 files changed

+6840
-1532
lines changed

Some content is hidden

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

132 files changed

+6840
-1532
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ before_install:
3333
install:
3434
- conda env create -f environment_linux.yml
3535
- source activate rmg_env
36+
- pip install codecov
3637
- yes 'Yes' | $HOME/miniconda/envs/rmg_env/bin/mopac $MOPACKEY > /dev/null
3738
- make
3839

@@ -41,4 +42,5 @@ script:
4142
- make test-database
4243

4344
after_success:
45+
- codecov
4446
- bash ./deploy.sh

CODE_OF_CONDUCT.md

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# RMG Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to making participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, gender identity and expression, level of experience,
9+
nationality, personal appearance, race, religion, or sexual identity and
10+
orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies both within project spaces and in public spaces
49+
when an individual is representing the project or its community. Examples of
50+
representing a project or community include using an official project e-mail
51+
address, posting via an official social media account, or acting as an appointed
52+
representative at an online or offline event. Representation of a project may be
53+
further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team at rmg_dev@mit.edu. All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an incident.
62+
Further details of specific enforcement policies may be posted separately.
63+
64+
Project maintainers who do not follow or enforce the Code of Conduct in good
65+
faith may face temporary or permanent repercussions as determined by other
66+
members of the project's leadership.
67+
68+
## Attribution
69+
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71+
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct/
72+
73+
[homepage]: https://www.contributor-covenant.org
74+

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Gaussian, MOPAC, QChem, and MOLPRO.
1717
- [RMG-database Github Repository](https://github.com/ReactionMechanismGenerator/RMG-database): contains source code for the latest version of the database
1818

1919
## Latest Stable Release
20-
**RMG v2.1.3**
20+
**RMG v2.1.4**
2121
[![Anaconda-Server Badge](https://anaconda.org/rmg/rmg/badges/version.svg)](https://anaconda.org/rmg/rmg)
2222

2323
View the [Release Notes](http://reactionmechanismgenerator.github.io/RMG-Py/users/rmg/releaseNotes.html).

documentation/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ setup_github_pages:
3939
# Turn the build/html directory into a git repository linked to github ready to push to gh-pages branch!
4040
# Should only need to be run once.
4141
rm -rf $(BUILDDIR)/html
42-
mkdir -p $(BUILDDIR)/html
43-
git clone --shared --branch gh-pages --config remote.official.url=git@github.com:ReactionMechanismGenerator/RMG-Py.git --config remote.official.fetch=+refs/heads/*:refs/remotes/official/* --config branch.gh-pages.remote=official --config branch.gh-pages.merge=refs/heads/gh-pages ../.git $(BUILDDIR)/html
42+
git clone --single-branch --branch gh-pages --origin official git@github.com:ReactionMechanismGenerator/RMG-Py.git build/html
4443

4544
publish: $(BUILDDIR)/html/.git
4645
# Commit changes to gh-pages and push to github, to publish the results!

documentation/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
# General information about the project.
4545
project = u'RMG Py'
46-
copyright = u'2002-2015, William H. Green, Richard H. West, and the RMG Team'
46+
copyright = u'2002-2017, William H. Green, Richard H. West, and the RMG Team'
4747

4848
# The version info for the project you're documenting, acts as replacement for
4949
# |version| and |release|, also used in various other places throughout the

documentation/source/users/rmg/database/kinetics.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ Below is a list of pre-packaged kinetics library reactions in RMG:
101101
+---------------------------------------+------------------------------------------------------------------------------------------+
102102
|JetSurF2.0 |Jet Surrogate Fuel model up tp C12 (excited species removed) |
103103
+---------------------------------------+------------------------------------------------------------------------------------------+
104+
|Klippenstein_Glarborg2016 |Methane oxidation at high pressures and intermediate temperatures |
105+
+---------------------------------------+------------------------------------------------------------------------------------------+
104106
|Mebel_C6H5_C2H2 |Pathways from benzene to naphthalene |
105107
+---------------------------------------+------------------------------------------------------------------------------------------+
106108
|Mebel_Naphthyl |Reactions of naphthyl-1 and naphthyl-2 |

documentation/source/users/rmg/input.rst

Lines changed: 54 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,24 @@ Because the ODE simulation is always interrupted, no pruning is performed.
365365

366366
Please find more details about the theory behind pruning at :ref:`Pruning Theory <prune>`.
367367

368+
Advanced Setting: Taking Multiple Species At A Time
369+
----------------------------------------------------
370+
Taking multiple objects (species, reactions or pdepNetworks) during a given simulation can often decrease your overall model generation time
371+
over only taking one. For this purpose there is a maxNumObjsPerIter parameter that allows RMG to take
372+
that many species, reactions or pdepNetworks from a given simulation. This is done in the order they trigger their respective criteria.
373+
374+
For example ::
375+
376+
model(
377+
toleranceKeepInEdge=0.0,
378+
toleranceMoveToCore=0.1,
379+
toleranceInterruptSimulation=0.1,
380+
maxNumObjsPerIter=2,
381+
)
382+
383+
Note that this can also result in larger models, however, sometimes these larger models (from taking more than one
384+
object at a time) pick up chemistry that would otherwise have been missed.
385+
368386
.. _ontheflyquantumcalculations:
369387

370388
On the fly Quantum Calculations
@@ -522,6 +540,9 @@ Miscellaneous Options
522540
Miscellaneous options::
523541

524542
options(
543+
name='Seed',
544+
generateSeedEachIteration=True,
545+
saveSeedToDatabase=True,
525546
units='si',
526547
saveRestartPeriod=(1,'hour'),
527548
generateOutputHTML=True,
@@ -531,6 +552,12 @@ Miscellaneous options::
531552
saveEdgeSpecies=True,
532553
)
533554

555+
The ``name`` field is the name of any generated seed mechanisms
556+
557+
Setting ``generateSeedEachIteration`` to ``True`` tells RMG to save and update a seed mechanism and thermo library during the current run
558+
559+
Setting ``saveSeedToDatabase`` to ``True`` tells RMG (if generating a seed) to also save that seed mechanism and thermo library directly into the database
560+
534561
The ``units`` field is set to ``si``. Currently there are no other unit options.
535562

536563
The ``saveRestartPeriod`` indictes how frequently you wish to save restart files. For very large/long RMG jobs, this process can take a significant amount of time. In such cases, the user may wish to increase the time period for saving these restart files.
@@ -559,13 +586,15 @@ all of RMG's reaction families. ::
559586
generatedSpeciesConstraints(
560587
allowed=['input species','seed mechanisms','reaction libraries'],
561588
maximumCarbonAtoms=10,
562-
maximumHydrogenAtoms=10,
563-
maximumOxygenAtoms=10,
564-
maximumNitrogenAtoms=10,
565-
maximumSiliconAtoms=10,
566-
maximumSulfurAtoms=10,
589+
maximumOxygenAtoms=2,
590+
maximumNitrogenAtoms=2,
591+
maximumSiliconAtoms=2,
592+
maximumSulfurAtoms=2,
567593
maximumHeavyAtoms=10,
568-
maximumRadicalElectrons=10,
594+
maximumRadicalElectrons=2,
595+
maximumSingletCarbenes=1,
596+
maximumCarbeneRadicals=0,
597+
maximumIsotopicAtoms=2,
569598
allowSingletO2 = False,
570599
)
571600

@@ -581,3 +610,22 @@ forbidden groups.
581610
By default, the ``allowSingletO2`` flag is set to ``False``. See :ref:`representing_oxygen` for more information.
582611

583612

613+
Staging
614+
========
615+
616+
It is now possible to concatenate different model and simulator blocks into the same run in stages. Any given stage will terminate when the RMG run terminates and then the current group of model and simulator parameters will be switched out with the next group and the run will continue until that stage terminates. Once the last stage terminates the run ends normally. This is currently enabled only for the model and simulator blocks.
617+
618+
There must be the same number of each of these blocks (although only having one simulator block and many model blocks is enabled as well) and RMG will enter each stage these define in the order they were put in the input file.
619+
620+
To enable easier manipulation of staging a new parameter in the model block was developed maxNumSpecies that is the number of core species at which that stage (or if it is the last stage the entire model generation process) will terminate.
621+
622+
For example ::
623+
624+
model(
625+
toleranceKeepInEdge=0.0,
626+
toleranceMoveToCore=0.1,
627+
toleranceInterruptSimulation=0.1,
628+
maximumEdgeSpecies=100000,
629+
maxNumSpecies=100
630+
)
631+

documentation/source/users/rmg/releaseNotes.rst

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,61 @@
44
Release Notes
55
*************
66

7+
RMG-Py Version 2.1.4
8+
====================
9+
Date: September 08, 2017
10+
11+
- Accelerator tools:
12+
- Dynamics criterion provides another method to expand the mechanism by adding reactions to the core
13+
- Surface algorithm enables better control of species movement to the core when using the dynamics criterion
14+
- Multiple sets of model parameters can now be specified in a input file to allow different stages of model generation
15+
- A species number termination criterion can now be set to limit model size
16+
- Multiple items can now be added per iteration to speed up model construction
17+
- New ModelSettings and SimulatorSettings classes for storing input parameters
18+
19+
- New features:
20+
- Kinetics libraries can now be automatically generated during RMG runs to be used as seeds for subsequent runs
21+
- Loading automatically generated seed mechanisms recreates the original template reaction objects to allow restarting runs from the seed mechanism
22+
- Carbene constraints can now be set in the species constraint block using maxSingletCarbenes and maxCarbeneRadicals
23+
- Chirality is now considered for determining symmetry numbers
24+
- Thermodynamic pruning has been added to allow removal of edge species with unfavorable free energy (beta)
25+
26+
- Other changes:
27+
- RMG-Py exception classes have been consolidated in the rmgpy.exceptions module
28+
- Species labels will now inherit the label from a matched thermo library entry
29+
- Sensitivity analysis is now available for LiquidReactor
30+
31+
- Fixes:
32+
- Fixed sensitivity analysis following changes to the simulate method
33+
- Add memory handling when generating collision matrix for pressure dependence
34+
- Improved error checking for MOPAC
35+
- Prevent infinite loops when retrieving thermo groups
36+
37+
- Known issues:
38+
- Seed mechanisms cannot be loaded if the database settings are different from the original ones used to generate the seed
39+
40+
RMG-database Version 2.1.4
41+
==========================
42+
Date: September 08, 2017
43+
44+
- New kinetics families for propargyl recombination route to benzene:
45+
- Singlet_Carbene_Intra_Disproportionation
46+
- Intra_5_membered_conjugated_C=C_C=C_addition
47+
- Intra_Diels_alder_monocyclic
48+
- Concerted_Intra_Diels_alder_monocyclic_1,2_shift
49+
- Intra_2+2_cycloaddition_Cd
50+
- Cyclopentadiene_scission
51+
- 6_membered_central_C-C_shift
52+
53+
- Renamed kinetics families:
54+
- Intra_Diels_Alder --> Intra_Retro_Diels_alder_bicyclic
55+
- H_shift_cyclopentadiene --> Intra_ene_reaction
56+
57+
- Other additions:
58+
- Klippenstein_Glarborg2016 kinetics and thermo libraries
59+
- Group additivity values added for singlet carbenes, which are no longer forbidden
60+
61+
762
RMG-Py Version 2.1.3
863
====================
964
Date: July 27, 2017

documentation/source/users/rmg/thermo.rst

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,14 @@ Chiral molecules belong to point groups that lack a superposable mirror image
266266
(i.e. point groups lacking :math:`\sigma_h`, :math:`\sigma_d`, :math:`\sigma_v`, and :math:`S_n`
267267
symmetry elements).
268268

269+
In RMG, chirality is incorportated into the symmetry attribute by dividing the symmetry by
270+
two which will increase entropy by :math:`+R * ln(2)`. RMG currently checks for each chiral
271+
center, defined by 4 different groups attached to a carbon, and halves the symmetry
272+
for each chiral center.
273+
274+
The effect of cis-trans isomers is currently not accounted for in RMG.
275+
276+
269277
References
270278
==========
271279

@@ -283,4 +291,4 @@ References
283291
284292
.. [RDKit] Landrum, G. (2012). RDKit, http://rdkit.org.
285293
286-
.. [Benson] Benson, S.W. (1965), https://en.wikipedia.org/wiki/Benson_group_increment_theory
294+
.. [Benson] Benson, S.W. (1965), https://en.wikipedia.org/wiki/Benson_group_increment_theory

0 commit comments

Comments
 (0)