← Back to branch summary

~ubuntu-branches/ubuntu/utopic/nwchem/utopic

« back to all changes in this revision

Viewing changes to src/tce/diis3/tce_jacobi_ir1.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/tce/diis3/tce_jacobi_ir1.F
1
1
      subroutine tce_jacobi_ir1(d_r1,d_t1,k_t1_offset,omega,
2
2
     1                          shift,damping)
3
3
c
4
 
c $Id: tce_jacobi_ir1.F 19706 2010-10-29 17:52:31Z d3y133 $
 
4
c $Id: tce_jacobi_ir1.F 24183 2013-05-03 23:47:08Z edo $
5
5
c
6
6
      implicit none
7
7
#include "global.fh"
26
26
      integer nprocs
27
27
      integer count
28
28
      integer next
29
 
      integer nxtval
30
 
      external nxtval
 
29
      integer nxtask
 
30
      external nxtask
31
31
      logical noloadbalance
32
32
      logical nodezero         ! True if node 0
33
33
      double precision shift,omega,damping
42
42
     1                ((ioalg.eq.6).and.(.not.fileisga(d_r1))))
43
43
      nprocs = ga_nnodes()
44
44
      count = 0
45
 
      next = nxtval(nprocs)
 
45
      next = nxtask(nprocs,1)
46
46
      do p1b = noab+1,noab+nvab
47
47
        do h2b = 1,noab
48
48
          if (noloadbalance.or.(next.eq.count)) then
80
80
            endif
81
81
            endif
82
82
            endif
83
 
            next = nxtval(nprocs)
 
83
            next = nxtask(nprocs,1)
84
84
          endif
85
85
          count = count + 1
86
86
        enddo
87
87
      enddo
88
 
      next = nxtval(-nprocs)
 
88
      next = nxtask(-nprocs,1)
89
89
      call ga_sync()
90
90
      return
91
91
      end