← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nwchem/saucy

« back to all changes in this revision

Viewing changes to src/nwpw/pspw/task_pspw.F

  • Committer: Package Import Robot
  • Author(s): Michael Banck, Michael Banck, Daniel Leidert
  • Date: 2012-02-09 20:02:41 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20120209200241-jgk03qfsphal4ug2
Tags: 6.1-1
http://bugs.debian.org/632611
https://launchpad.net/bugs/791308
* New upstream release.

[ Michael Banck ]
* debian/patches/02_makefile_flags.patch: Updated.
* debian/patches/02_makefile_flags.patch: Use internal blas and lapack code.
* debian/patches/02_makefile_flags.patch: Define GCC4 for LINUX and LINUX64
  (Closes: #632611 and LP: #791308).
* debian/control (Build-Depends): Added openssh-client.
* debian/rules (USE_SCALAPACK, SCALAPACK): Removed variables (Closes:
  #654658).
* debian/rules (LIBDIR, USE_MPIF4, ARMCI_NETWORK): New variables.
* debian/TODO: New file.
* debian/control (Build-Depends): Removed libblas-dev, liblapack-dev and
  libscalapack-mpi-dev.
* debian/patches/04_show_testsuite_diff_output.patch: New patch, shows the
  diff output for failed tests.
* debian/patches/series: Adjusted.
* debian/testsuite: Optionally run all tests if "all" is passed as option.
* debian/rules: Run debian/testsuite with "all" if DEB_BUILD_OPTIONS
  contains "checkall".

[ Daniel Leidert ]
* debian/control: Used wrap-and-sort. Added Vcs-Svn and Vcs-Browser fields.
  (Priority): Moved to extra according to policy section 2.5.
  (Standards-Version): Bumped to 3.9.2.
  (Description): Fixed a typo.
* debian/watch: Added.
* debian/patches/03_hurd-i386_define_path_max.patch: Added.
  - Define MAX_PATH if not defines to fix FTBFS on hurd.
* debian/patches/series: Adjusted.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/nwpw/pspw/task_pspw.F
1
1
*
2
 
* $Id: task_pspw.F,v 1.15 2008-11-03 06:06:10 bylaska Exp $
 
2
* $Id: task_pspw.F 19707 2010-10-29 17:59:36Z d3y133 $
3
3
*
4
4
 
5
5
      logical function task_pspw(rtdb)
44
44
      logical  psp_formatter,wvfnc_init,cpsdv5,cpmdv5,cgsdv5,cgmdv5
45
45
      logical  v_wvfnc_init,wvfnc_expander,cell_optimize,mmsdv1,mmmdv1
46
46
      logical  pspw_dplot,pspw_stress,pspw_noit_energy,cpmdv6
47
 
      logical  pspw_wannier,expand_cell,wvfnc_ionize
 
47
      logical  pspw_wannier,pspw_wannier_old,expand_cell,wvfnc_ionize
48
48
      logical  wvfnc_convert_restricted,nwpw_rdf
49
49
      external psp_formatter,wvfnc_init,cpsdv5,cpmdv5,cgsdv5,cgmdv5
50
50
      external v_wvfnc_init,wvfnc_expander,cell_optimize,mmsdv1,mmmdv1
51
51
      external pspw_dplot,pspw_stress,pspw_noit_energy,cpmdv6
52
 
      external pspw_wannier,expand_cell,wvfnc_ionize
 
52
      external pspw_wannier,pspw_wannier_old,expand_cell,wvfnc_ionize
53
53
      external wvfnc_convert_restricted,nwpw_rdf
54
54
c
55
55
c
253
253
 1400 if (ga_nodeid().eq.MASTER) then
254
254
        write(*,*)  ">>>> PSPW Parallel Module - Wannier <<<<"
255
255
      end if
 
256
      if (.not.rtdb_get(rtdb,'nwpw:wannier_old',mt_log,1,dummy))
 
257
     >  dummy = .false.
256
258
      value = .true.
257
259
      value = rtdb_parallel(.true.)
258
 
      value = pspw_wannier(rtdb)
 
260
      if (dummy) then
 
261
         value = pspw_wannier_old(rtdb)
 
262
      else
 
263
         value = pspw_wannier(rtdb)
 
264
      end if
259
265
      call ga_sync()
260
266
      goto 9999
261
267