Skip to content

Conversation

amandadumi
Copy link

Hello, to resolve the conflict in data.py, i merged with the master branch. This will introduce a lot of commits, but essentially the only lines changing that is relevant is the change in data.py line 170-171 which changes the name and attribute path for the rotational constants related attributes (rocons -> roconsts, and rotemp -> rottemp) and fixes these in the nwchem parser. I realize this is a lot of commits to filter through, so if its too much let me know and I can find a better approach to resolving the conflict. (I am still learning the best way to manage conflicts that are further back in history.)

oliver-s-lee and others added 30 commits June 24, 2022 16:29
Updated current core devs in development docs
Convert to wavenumber units to standardize with mopac parser
oliver-s-lee and others added 29 commits February 8, 2023 21:04
install pyquante2 with Python 3 fixes
Parse CPU and wall time for ORCA and Turbomole; estimate timing for Gaussian
…overwrites excited state data that has been previously parsed (previously broke SOC calcs)
…pectra is now ignored for etenergies and etoscs (as these are spin-mixed states). Other spectra are parsed as normal
Gaussian: increase specificity of Moller-Plesset checks
use 'is not None' instead of '!= None'
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants