← Back to branch summary

~ubuntu-branches/ubuntu/trusty/nwchem/trusty-proposed

« back to all changes in this revision

Viewing changes to src/nwdft/scf_dft_cg/dft_roks_nr_solve.F

  • Committer: Package Import Robot
  • Author(s): Michael Banck, Daniel Leidert, Andreas Tille, Michael Banck
  • Date: 2013-07-04 12:14:55 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20130704121455-5tvsx2qabor3nrui
Tags: 6.3-1
http://bugs.debian.org/696361
* New upstream release.
* Fixes anisotropic properties (Closes: #696361).
* New features include:
  + Multi-reference coupled cluster (MRCC) approaches
  + Hybrid DFT calculations with short-range HF 
  + New density-functionals including Minnesota (M08, M11) and HSE hybrid
    functionals
  + X-ray absorption spectroscopy (XAS) with TDDFT
  + Analytical gradients for the COSMO solvation model
  + Transition densities from TDDFT 
  + DFT+U and Electron-Transfer (ET) methods for plane wave calculations
  + Exploitation of space group symmetry in plane wave geometry optimizations
  + Local density of states (LDOS) collective variable added to Metadynamics
  + Various new XC functionals added for plane wave calculations, including
    hybrid and range-corrected ones
  + Electric field gradients with relativistic corrections 
  + Nudged Elastic Band optimization method
  + Updated basis sets and ECPs 

[ Daniel Leidert ]
* debian/watch: Fixed.

[ Andreas Tille ]
* debian/upstream: References

[ Michael Banck ]
* debian/upstream (Name): New field.
* debian/patches/02_makefile_flags.patch: Refreshed.
* debian/patches/06_statfs_kfreebsd.patch: Likewise.
* debian/patches/07_ga_target_force_linux.patch: Likewise.
* debian/patches/05_avoid_inline_assembler.patch: Removed, no longer needed.
* debian/patches/09_backported_6.1.1_fixes.patch: Likewise.
* debian/control (Build-Depends): Added gfortran-4.7 and gcc-4.7.
* debian/patches/10_force_gcc-4.7.patch: New patch, explicitly sets
  gfortran-4.7 and gcc-4.7, fixes test suite hang with gcc-4.8 (Closes:
  #701328, #713262).
* debian/testsuite: Added tests for COSMO analytical gradients and MRCC.
* debian/rules (MRCC_METHODS): New variable, required to enable MRCC methods.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/nwdft/scf_dft_cg/dft_roks_nr_solve.F
1
1
      logical function dft_roks_nr_solve(rtdb, energy, eone, etwo, exc,
2
 
     +                                   enrep, nexc)
3
 
c     $Id: dft_roks_nr_solve.F 21176 2011-10-10 06:35:49Z d3y133 $
 
2
     +                                   enrep, edisp, nexc)
 
3
c     $Id: dft_roks_nr_solve.F 23981 2013-04-07 09:22:57Z d3y133 $
4
4
      implicit none
5
5
#include "errquit.fh"
6
6
#include "mafdecls.fh"
24
24
      double precision energy   ! Return ROKS energy
25
25
      double precision eone, etwo, enrep ! Return ROKS energy contribs
26
26
      double precision exc(2) ! Return DFT energy contribs
 
27
      double precision edisp
27
28
      integer nexc
28
29
c     
29
30
c     Local GA handles 
240
241
            if (ga_nodeid().eq.0) call util_flush(6)
241
242
 
242
243
            call dft_roks_step_energy(rtdb, step, g_search,
243
 
     $           eone, etwo, exc, enrep, energy, g_grad, nexc)
 
244
     $           eone, etwo, exc, enrep, energy, edisp, g_grad, nexc)
244
245
            gnorm = sqrt(ga_ddot(g_grad, g_grad))
245
246
c
246
247
            if(odbug) then