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
Create YAML file outputs in RMG for use in Cantera #2321
base: main
Are you sure you want to change the base?
Commits on Apr 1, 2024
-
Rename yml to rms, becuase it was specific to RMS
This allows the Cantera yaml writer to live alongside it
Configuration menu - View commit details
-
Copy full SHA for f511c4a - Browse repository at this point
Copy the full SHA f511c4aView commit details -
Creating yml_test.py file, looks exactly like yml.py but with 'rms' s…
…ubstituted for 'yml' Attach the YAMLWriter listener Work on the yaml writing for cantera Renaming yml_test to cantera This is for writing Cantera yaml files updated set_cantera_kinetics in falloff.py spelled "high" wrong in set_cantera_kinetics added write_cantera_inputs to falloff.pyx for Troe reactions Fixing Lindemann and Troe deleted write_cantera_inputs, restructured using to_cantera > set_cantera_kinetics > to_cantera_kinetics for Lindemann and Troe reactions added efficiencies restructured cantera.py, now includes MultiArrhenius reactions added Chebyshev restructured and added in RMG equations added in Surface Arrhenius added sticking coefficient :) use_chemkin_identifier=True when making Cantera objects This uses the correct species names Dump yaml in the order of the dict, not alphabetical remove quotes from species names Handle duplicate reactions For MultiArrhenius and MultiPDepArrhenius kinetics we need to make more than one reaction in the list of reactions for Cantera yaml. (at least until this is implemented: Cantera/enhancements#132 ) added the beginnings of the catalysis edits still need to edit 'state' and fix 'vector<double>' error fixed for catalysis. Separates gas and surface reactions in the "reactions" section. Now just need to fix the bug with the C.Pt(22) stuff. Stay strong, shortie wip changes for stickingcoeffcient issue fixed "sites" v. "size" problem, yaml_writer now works for catalysis and gas phase. Time for pull request? Removing comments Trying cantera 2.5+ from conda-forge in environment.yml I suspected that the unit tests are failing because the new code can't work with cantera 2.3 from the RMG channel Trying Cantera 2.5+ from cantera channel in environment.yml Added in doc strings to methods. Removed unused imports Removed unused import from reaction.py renamed cantera.py to cantera_.py. Edited import statement in main.py to reflect this name change. Edited reaction.py so depreciated Cantera term is not used. Edited reactionTest.py so that test_falloff is successful for third body reactions Edited high_rate, low_rate in set_cantera_kinetics() for Lindemann reactions. Can now extract the high & low rate from the Cantera Lindemann object, which is necessary for reactionTest.py to pass successfully. restructed set_cantera_kinetics() and to_cantera_kinetics() for Lindemann reactions in falloff.pyx. Added Lindemann reaction checks in falloff.pyx Minor stylish change in falloff.py/ troe to cantera cleaning up falloff.pyx after rebase conflicts
Configuration menu - View commit details
-
Copy full SHA for 0698a1e - Browse repository at this point
Copy the full SHA 0698a1eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 54640e3 - Browse repository at this point
Copy the full SHA 54640e3View commit details -
Configuration menu - View commit details
-
Copy full SHA for ef5f568 - Browse repository at this point
Copy the full SHA ef5f568View commit details -
Creating yml_test.py file, looks exactly like yml.py but with 'rms' s…
…ubstituted for 'yml'
Configuration menu - View commit details
-
Copy full SHA for c5dd3a3 - Browse repository at this point
Copy the full SHA c5dd3a3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1717e75 - Browse repository at this point
Copy the full SHA 1717e75View commit details -
Configuration menu - View commit details
-
Copy full SHA for 971f624 - Browse repository at this point
Copy the full SHA 971f624View commit details -
This is for writing Cantera yaml files
Configuration menu - View commit details
-
Copy full SHA for 135a640 - Browse repository at this point
Copy the full SHA 135a640View commit details -
Configuration menu - View commit details
-
Copy full SHA for 81db64b - Browse repository at this point
Copy the full SHA 81db64bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 586f91d - Browse repository at this point
Copy the full SHA 586f91dView commit details -
Configuration menu - View commit details
-
Copy full SHA for f6bfe02 - Browse repository at this point
Copy the full SHA f6bfe02View commit details -
deleted write_cantera_inputs, restructured using to_cantera > set_cantera_kinetics > to_cantera_kinetics for Lindemann and Troe reactions
Configuration menu - View commit details
-
Copy full SHA for e3d8715 - Browse repository at this point
Copy the full SHA e3d8715View commit details -
Configuration menu - View commit details
-
Copy full SHA for 244c712 - Browse repository at this point
Copy the full SHA 244c712View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4be337c - Browse repository at this point
Copy the full SHA 4be337cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0bbf4b3 - Browse repository at this point
Copy the full SHA 0bbf4b3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4949ddc - Browse repository at this point
Copy the full SHA 4949ddcView commit details -
Configuration menu - View commit details
-
Copy full SHA for 34e962b - Browse repository at this point
Copy the full SHA 34e962bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0ab1834 - Browse repository at this point
Copy the full SHA 0ab1834View commit details -
use_chemkin_identifier=True when making Cantera objects
This uses the correct species names
Configuration menu - View commit details
-
Copy full SHA for 175d3b8 - Browse repository at this point
Copy the full SHA 175d3b8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 190f360 - Browse repository at this point
Copy the full SHA 190f360View commit details -
Configuration menu - View commit details
-
Copy full SHA for 846c0b8 - Browse repository at this point
Copy the full SHA 846c0b8View commit details -
For MultiArrhenius and MultiPDepArrhenius kinetics we need to make more than one reaction in the list of reactions for Cantera yaml. (at least until this is implemented: Cantera/enhancements#132 )
Configuration menu - View commit details
-
Copy full SHA for 6ef7b87 - Browse repository at this point
Copy the full SHA 6ef7b87View commit details -
added the beginnings of the catalysis edits
still need to edit 'state' and fix 'vector<double>' error
Configuration menu - View commit details
-
Copy full SHA for 837e307 - Browse repository at this point
Copy the full SHA 837e307View commit details -
Separates gas and surface reactions in the "reactions" section. Now just need to fix the bug with the C.Pt(22) stuff. Stay strong, shortie
Configuration menu - View commit details
-
Copy full SHA for a8bc559 - Browse repository at this point
Copy the full SHA a8bc559View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6e1ed58 - Browse repository at this point
Copy the full SHA 6e1ed58View commit details -
fixed "sites" v. "size" problem, yaml_writer now works for catalysis …
…and gas phase. Time for pull request?
Configuration menu - View commit details
-
Copy full SHA for 28f80c8 - Browse repository at this point
Copy the full SHA 28f80c8View commit details -
Configuration menu - View commit details
-
Copy full SHA for bab0f16 - Browse repository at this point
Copy the full SHA bab0f16View commit details -
Trying cantera 2.5+ from conda-forge in environment.yml
I suspected that the unit tests are failing because the new code can't work with cantera 2.3 from the RMG channel
Configuration menu - View commit details
-
Copy full SHA for 5c61b42 - Browse repository at this point
Copy the full SHA 5c61b42View commit details -
Configuration menu - View commit details
-
Copy full SHA for c39cb50 - Browse repository at this point
Copy the full SHA c39cb50View commit details -
Configuration menu - View commit details
-
Copy full SHA for 899ef2e - Browse repository at this point
Copy the full SHA 899ef2eView commit details -
Configuration menu - View commit details
-
Copy full SHA for da17893 - Browse repository at this point
Copy the full SHA da17893View commit details -
renamed cantera.py to cantera_.py. Edited import statement in main.py…
… to reflect this name change. Edited reaction.py so depreciated Cantera term is not used. Edited reactionTest.py so that test_falloff is successful for third body reactions
Configuration menu - View commit details
-
Copy full SHA for bd23fdd - Browse repository at this point
Copy the full SHA bd23fddView commit details -
Edited high_rate, low_rate in set_cantera_kinetics() for Lindemann re…
…actions. Can now extract the high & low rate from the Cantera Lindemann object, which is necessary for reactionTest.py to pass successfully.
Configuration menu - View commit details
-
Copy full SHA for 0759ccc - Browse repository at this point
Copy the full SHA 0759cccView commit details -
restructed set_cantera_kinetics() and to_cantera_kinetics() for Linde…
…mann reactions in falloff.pyx. Added Lindemann reaction checks in falloff.pyx
Configuration menu - View commit details
-
Copy full SHA for 0c5a304 - Browse repository at this point
Copy the full SHA 0c5a304View commit details -
Configuration menu - View commit details
-
Copy full SHA for e110aab - Browse repository at this point
Copy the full SHA e110aabView commit details -
Configuration menu - View commit details
-
Copy full SHA for 43bd964 - Browse repository at this point
Copy the full SHA 43bd964View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6692742 - Browse repository at this point
Copy the full SHA 6692742View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1366709 - Browse repository at this point
Copy the full SHA 1366709View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0925dc5 - Browse repository at this point
Copy the full SHA 0925dc5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3fdb6e1 - Browse repository at this point
Copy the full SHA 3fdb6e1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8428b92 - Browse repository at this point
Copy the full SHA 8428b92View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9345a3a - Browse repository at this point
Copy the full SHA 9345a3aView commit details -
Trying to fix yaml (via cantera 2.6) for Lindemann kinetics
The call rate = ct.LindemannRate(low_rate, high_rate, falloff) was causing TypeError: Argument 'rate' has incorrect type (expected cantera._cantera.Arrhenius, got cantera._cantera.ArrheniusRate) I think the ct.LindemannRate expects an Arrhenius not an ArrheniusRate. Thdis was with cantera 2.6.0 py37hb93dfd8_0 cantera running on the Ubuntu CI
Configuration menu - View commit details
-
Copy full SHA for 5d35216 - Browse repository at this point
Copy the full SHA 5d35216View commit details -
Tidy up cantera yaml writer. Trying to avoid major changes.
Still doing things mostly the same way, just renaming variables, combining some blocks, removing X from the gas phase,
Configuration menu - View commit details
-
Copy full SHA for b2677f4 - Browse repository at this point
Copy the full SHA b2677f4View commit details -
Tidying the cantera yaml writer
Renamed some functions and (i think) simplified some loops
Configuration menu - View commit details
-
Copy full SHA for 4ff908a - Browse repository at this point
Copy the full SHA 4ff908aView commit details -
Trying to fix yaml (via cantera 2.6) for Lindemann kinetics
The call rmgpy/reaction.py:339: in rmgpy.reaction.Reaction.to_cantera rate = ct.TroeRate( was causing TypeError: Argument 'rate' has incorrect type (expected cantera._cantera.Arrhenius, got cantera._cantera.ArrheniusRate) I think the ct.LindemannRate expects an Arrhenius not an ArrheniusRate. Thdis was with cantera 2.6.0 py37hb93dfd8_0 cantera running on the Ubuntu CI
Configuration menu - View commit details
-
Copy full SHA for 3d8a6cf - Browse repository at this point
Copy the full SHA 3d8a6cfView commit details -
Removed the extra rmgpy/rectionTest.py
This was moved into the testing folder. I don't think any of the other changes were deliberate.
Configuration menu - View commit details
-
Copy full SHA for 43202b1 - Browse repository at this point
Copy the full SHA 43202b1View commit details -
Redefine gas inside reactionTest. (needed?)
This had been done on a branch. Not sure if it is needed as things got moved in a confusing rebase.
Configuration menu - View commit details
-
Copy full SHA for a6cf636 - Browse repository at this point
Copy the full SHA a6cf636View commit details -
Restore rmgpy/kinetics/falloff.pyx to the version on main branch.
I think final edits to this file were mostly just accidents in rebasing, and the version on main is probably ok.
Configuration menu - View commit details
-
Copy full SHA for 46946a1 - Browse repository at this point
Copy the full SHA 46946a1View commit details -
Restore rmgpy/reaction.pxd to version on main
I think this was a rebasing error.
Configuration menu - View commit details
-
Copy full SHA for 72db235 - Browse repository at this point
Copy the full SHA 72db235View commit details -
Tidy up reaction.py, removing fix_reaction
This function is only used in one place for one very specific thing so I inlined it. It also had a vague name. I then commented it out, because I'm not clear why it's needed. If it is needed, we can restore it (and put a comment as to why)
Configuration menu - View commit details
-
Copy full SHA for 8096877 - Browse repository at this point
Copy the full SHA 8096877View commit details -
Revert "Redefine gas inside reactionTest. (needed?)"
The reactionTest.py is failing. From the failure I can't see why this would be the cause, but in the idea of change-one-thing-at-a-time I'm reverting the most recent change since I think the tests USED to pass. This reverts commit a8eaa3b.
Configuration menu - View commit details
-
Copy full SHA for 68dc922 - Browse repository at this point
Copy the full SHA 68dc922View commit details