Commit Graph

21 Commits

Author SHA1 Message Date
giannozz 9423a35d01 More PW-CP variable-name unification:
nnr/nnrx (CP) => nrxx ; nnrs/nnrsx (CP) => nrxxs
(the other way round would have been preferrable but it was too much work)


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@7143 c92efa57-630b-4861-b058-cf58834340f0
2010-10-13 18:28:46 +00:00
umari 62b7e17ab7 Bug corrected for cg and ensemble dft calculations.
P.U.


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@5027 c92efa57-630b-4861-b058-cf58834340f0
2008-06-27 10:45:32 +00:00
umari 8f07f632c8 Some cleaning 8-->dp, and dynamic allocations introduced
P.U.


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@4369 c92efa57-630b-4861-b058-cf58834340f0
2007-10-26 00:48:51 +00:00
cavazzon 0aa4ca8c94 - as usual PGI does not catch all the syntax error!?
git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@3920 c92efa57-630b-4861-b058-cf58834340f0
2007-04-26 09:42:09 +00:00
cavazzon 483cd73f98 - changes for CP ensemble-dft parallelizatio
- clean up in subroutine from_restart
- more interfaces


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@3919 c92efa57-630b-4861-b058-cf58834340f0
2007-04-26 09:24:37 +00:00
umari 1662434a5a Added new control options for conjugate gradient in cp and
for ensemble dft
In ensemble dft only for cold smearing

P.U.


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@3871 c92efa57-630b-4861-b058-cf58834340f0
2007-03-21 23:46:22 +00:00
umari 3e0bbeed32 Added new file inner_loop_cold containing routines for
cold-smearing treatment of metallic systems in cp
with conjugate gradient

P.U.


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@3720 c92efa57-630b-4861-b058-cf58834340f0
2007-01-26 10:58:11 +00:00
umari e4eacc639e Clean-up of ensemble-DFT routines
P.U.


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@3632 c92efa57-630b-4861-b058-cf58834340f0
2006-12-30 15:48:33 +00:00
giannozz 3a98e2d9d4 More patches from Axel:
- correct an unquoted string (iosys) in PW/input.f90:483
(this was the cause of tonight compilation failere)
- correct a few incorrect format strings
- make more use of the constants module and thus
  provide more consistent units. NOTE, this has some
  numerical changes in the outputs, as in some places
  rather low precision and inconsistent numbers were
  used for unit conversion.
- convert all(?) single precision constants to double
  using the attached little perl program.
  exceptions: efermi.f90 (as it is supposed to be rewritten
  anyways), plotbands.f90 (it uses single precision everywhere,
  which may result in saving a significant amount of memory,
  so i converted the two double precision constants to single).
Unused routine 'set_fft_grid' removed


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@3602 c92efa57-630b-4861-b058-cf58834340f0
2006-12-14 08:53:47 +00:00
umari 02a45216cf If eDFT prints on screen infos
P.U.


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@3493 c92efa57-630b-4861-b058-cf58834340f0
2006-10-25 17:19:06 +00:00
umari 3cdcd1cb50 Added two new options:l_blockocc and n_blockocc
to keep fixed the occupation of  the lowest states
in enrgy while performing MD with ensemble DFT

P.U.


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@3391 c92efa57-630b-4861-b058-cf58834340f0
2006-09-14 16:33:24 +00:00
cavazzon e92ac1f08a - static array substituted with dynamic array, to reduce
memory requirements


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@2951 c92efa57-630b-4861-b058-cf58834340f0
2006-03-23 18:00:12 +00:00
giannozz f533b052d5 dbl => DP (defined as previously dbl was)
syntax for declarations: real(DP), without "kind="


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@2135 c92efa57-630b-4861-b058-cf58834340f0
2005-08-28 14:09:42 +00:00
giannozz bf4bfe222f General cleanup of intrinsic functions:
conversion to real    => DBLE
(including real part of a complex number)
conversion to complex => CMPLX
complex conjugate     => CONJG
imaginary part        => AIMAG

All functions are uppercase.
CMPLX is preprocessed by f_defs.h and performs an explicit cast:
#define CMPLX(a,b)  cmplx(a,b,kind=DP)
This implies that 1) f_defs.h must be included whenever a CMPLX is present,
2) CMPLX should stay in a single line, 3) DP must be defined.

All occurrences of real, float, dreal, dfloat, dconjg, dimag, dcmplx
removed - please do not reintroduce any of them.
Tested only with ifc7 and g95 - beware unintended side effects

Maybe not the best solution (explicit casts everywhere would be better)
but it can be easily changed with a script if the need arises.
The following code might be used to test for possible trouble:

program test_intrinsic

  implicit none
  integer, parameter :: dp = selected_real_kind(14,200)
  real (kind=dp) :: a = 0.123456789012345_dp
  real (kind=dp) :: b = 0.987654321098765_dp
  complex (kind=dp) :: c = ( 0.123456789012345_dp, 0.987654321098765_dp)

  print *, '      A = ', a
  print *, ' DBLE(A)= ', DBLE(a)
  print *, '      C = ', c
  print *, 'CONJG(C)= ', CONJG(c)
  print *, 'DBLE(c),AIMAG(C)  = ', DBLE(c), AIMAG(c)
  print *, 'CMPLX(A,B,kind=dp)= ', CMPLX( a, b, kind=dp)

end program test_intrinsic

Note that CMPLX and REAL without a cast yield single precision numbers on
ifc7 and g95 !!!


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@2133 c92efa57-630b-4861-b058-cf58834340f0
2005-08-26 17:44:42 +00:00
umari 4a1257ab72 Change in allocate_enseble_dft nat to natx. P.U.
git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@1913 c92efa57-630b-4861-b058-cf58834340f0
2005-05-25 14:46:50 +00:00
ballabio fcc1f4d437 end module --> end module name [Gerardo]
git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@1875 c92efa57-630b-4861-b058-cf58834340f0
2005-05-18 14:24:56 +00:00
ballabio cc9d7d7b52 end subroutine --> end subroutine name [Gerardo]
git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@1871 c92efa57-630b-4861-b058-cf58834340f0
2005-05-18 08:49:38 +00:00
sbraccia a00aac0e25 header containing the GPL license added where missing and made omogeneous.
C.S.


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@1865 c92efa57-630b-4861-b058-cf58834340f0
2005-05-16 19:19:04 +00:00
cavazzon 8467802af8 - fix for sintax odd constructs, pointed out by ifort
git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@1672 c92efa57-630b-4861-b058-cf58834340f0
2005-03-02 10:30:19 +00:00
cavazzon 878a9ebece - more cpv/fpmd merging
- FFT grid (nr1,nr2,nr3 nr1s,nr2s,nr3s) now can be specified in the
  input


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@1671 c92efa57-630b-4861-b058-cf58834340f0
2005-03-02 10:03:55 +00:00
cavazzon 56322ee7d7 - added ensemble dft
- added ensemble dft / conjugate gradient / electric field
  from Paolo Umari / Marzari code
- NOT YET TESTED!!


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@1524 c92efa57-630b-4861-b058-cf58834340f0
2004-12-21 15:48:19 +00:00