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

Overlap PR3 - Bulk of SCF cleanup #175

Merged
merged 4 commits into from
Jan 31, 2018

Conversation

ramirezfranciscof
Copy link
Collaborator

  • Reorganized the content of obtain_new_P so that it is no longer a necessary structure.
  • Variable cleanup inside SCF: xnano, znano, some rmmXX, etc.
  • Procedure cleanup inside SCF: externalized some details of the implementation of ECP and cubegen; reorganized together dovv (soon to be fockbias); eliminated dipole moment final calculation.

Also, separated the "modification" of non diagonal terms in density mat
that makes it STOP BEING THE DENSITY MATRIX in order to make it more
compatible with RMM. This needs to be one of the first things to fix.
clearer and more compact so there was no need to have this as a different
subroutine. Maybe a different grouping of subroutines may be appropriate,
but I suggest to do it after further eliminiation of RMM.
(2) Eliminated rmm5, rmm13 and rmm15 from SCF (where no longer used anywhere).
(3) Eliminated other unused variables and re-formated variable declarations.
- externalized procedures of ECP_mod (tested using ECP tests).
- externalized procedures of cubegen (not tested, there are currently no test for these).
- reorganized together dovv code.
- removed dipole moment calculation from inside of SCF.
- minor format adjustments.
Copy link
Collaborator

@fedepedron fedepedron left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just for the record, there is a cubegen test, but it is mixed with TD-DFT. See 2_hemo_TDDFT

@fedepedron fedepedron merged commit 5640f6f into MALBECC:rc Jan 31, 2018
@ramirezfranciscof
Copy link
Collaborator Author

DUDE! look at the title you use when you make the merges. I'll see if I can ammend it.

ramirezfranciscof pushed a commit that referenced this pull request Feb 1, 2018
* Reorganized the content of obtain_new_P so that it is no
  longer a necessary structure.

* Variable cleanup inside SCF: xnano, znano, some rmmXX, etc.

* Procedure cleanup inside SCF: externalized some details of
  the implementation of ECP and cubegen; reorganized together
  dovv (soon to be fockbias); eliminated dipole moment final
  calculation.
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.

2 participants