Gentoo Archives: gentoo-commits

From: Horea Christian <horea.christ@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/bigdft-abi/, sci-libs/bigdft-abi/files/
Date: Mon, 28 Sep 2020 10:23:56
Message-Id: 1601288072.129927cbab940016c13063f83a43995743079b2c.chymera@gentoo
1 commit: 129927cbab940016c13063f83a43995743079b2c
2 Author: Horea Christian <chr <AT> chymera <DOT> eu>
3 AuthorDate: Mon Sep 28 10:14:32 2020 +0000
4 Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
5 CommitDate: Mon Sep 28 10:14:32 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=129927cb
7
8 sci-libs/bigdft-abi: removed discontinued package
9
10 Package-Manager: Portage-3.0.8, Repoman-3.0.1
11 Signed-off-by: Horea Christian <chr <AT> chymera.eu>
12
13 sci-libs/bigdft-abi/bigdft-abi-1.0.4-r3.ebuild | 181 -----------
14 .../bigdft-abi/files/bigdft-abi-1.0.4-0002.patch | 37 ---
15 .../bigdft-abi/files/bigdft-abi-1.0.4-0003.patch | 49 ---
16 .../bigdft-abi/files/bigdft-abi-1.0.4-0004.patch | 20 --
17 .../bigdft-abi/files/bigdft-abi-1.0.4-0006.patch | 43 ---
18 .../bigdft-abi/files/bigdft-abi-1.0.4-0007.patch | 344 ---------------------
19 .../files/bigdft-abi-1.0.4-CUDA_gethostname.patch | 22 --
20 sci-libs/bigdft-abi/metadata.xml | 29 --
21 8 files changed, 725 deletions(-)
22
23 diff --git a/sci-libs/bigdft-abi/bigdft-abi-1.0.4-r3.ebuild b/sci-libs/bigdft-abi/bigdft-abi-1.0.4-r3.ebuild
24 deleted file mode 100644
25 index 73471b0dc..000000000
26 --- a/sci-libs/bigdft-abi/bigdft-abi-1.0.4-r3.ebuild
27 +++ /dev/null
28 @@ -1,181 +0,0 @@
29 -# Copyright 1999-2014 Gentoo Foundation
30 -# Distributed under the terms of the GNU General Public License v2
31 -
32 -EAPI=5
33 -
34 -PYTHON_COMPAT=( python2_7 )
35 -
36 -inherit autotools-utils eutils flag-o-matic fortran-2 python-any-r1 toolchain-funcs
37 -
38 -DESCRIPTION="A DFT electronic structure code using a wavelet basis set"
39 -HOMEPAGE="http://www.abinit.org/downloads/plug-in-sources"
40 -SRC_URI="
41 - http://forge.abinit.org/fallbacks/${P}.tar.gz
42 - https://raw.githubusercontent.com/gentoo-science/sci/master/patches/bigdft-abi-1.0.4-0005.patch
43 - "
44 -
45 -LICENSE="GPL-3"
46 -SLOT="0"
47 -KEYWORDS="~amd64 ~x86 ~amd64-linux"
48 -IUSE="cuda doc etsf_io glib mpi netcdf openmp opencl scalapack test"
49 -
50 -RDEPEND="
51 - >=sci-libs/libxc-1.2.0-r1[fortran]
52 - virtual/blas
53 - virtual/fortran
54 - virtual/lapack
55 - dev-libs/libyaml
56 - mpi? ( virtual/mpi )
57 - cuda? ( dev-util/nvidia-cuda-sdk )
58 - opencl? ( virtual/opencl )
59 - glib? ( >=dev-libs/glib-2.22 )
60 - etsf_io? ( >=sci-libs/etsf_io-1.0.3-r2 )
61 - netcdf? (
62 - || (
63 - sci-libs/netcdf[fortran]
64 - sci-libs/netcdf-fortran
65 - )
66 - )
67 - scalapack? ( virtual/scalapack )"
68 -DEPEND="${RDEPEND}
69 - virtual/pkgconfig
70 - >=sys-devel/autoconf-2.59
71 - doc? ( virtual/latex-base )
72 - ${PYTHON_DEPS}
73 - dev-python/pyyaml[libyaml]
74 - dev-util/gdbus-codegen
75 - app-arch/tar
76 - app-arch/gzip"
77 -
78 -DOCS=( README INSTALL ChangeLog AUTHORS NEWS )
79 -
80 -FORTRAN_STANDARD=90
81 -
82 -pkg_setup() {
83 - # fortran-2.eclass does not handle mpi wrappers
84 - if use mpi; then
85 - export FC="mpif90"
86 - export F77="mpif77"
87 - export CC="mpicc"
88 - else
89 - tc-export FC F77 CC
90 - fi
91 -
92 - # This should be correct.
93 - # It is gcc-centric because toolchain-funcs.eclass is gcc-centric.
94 - # Should a bug be filed against toolchain-funcs.eclass?
95 - # if use openmp; then
96 - # tc-has-openmp || \
97 - # die "Please select an openmp capable compiler like gcc[openmp]"
98 - # fi
99 - #
100 - # Luckily Abinit is a fortran package.
101 - # fortran-2.eclass has its own test for OpenMP support,
102 - # more general than toolchain-funcs.eclass
103 - # The test itself proceeds inside fortran-2_pkg_setup
104 - if use openmp; then FORTRAN_NEED_OPENMP=1; fi
105 -
106 - fortran-2_pkg_setup
107 -
108 - if use openmp; then
109 - # based on _fortran-has-openmp() of fortran-2.eclass
110 - local openmp=""
111 - local fcode=ebuild-openmp-flags.f
112 - local _fc=$(tc-getFC)
113 -
114 - pushd "${T}"
115 - cat <<- EOF > "${fcode}"
116 - 1 call omp_get_num_threads
117 - 2 end
118 - EOF
119 -
120 - for openmp in -fopenmp -xopenmp -openmp -mp -omp -qsmp=omp; do
121 - "${_fc}" "${openmp}" "${fcode}" -o "${fcode}.x" && break
122 - done
123 -
124 - rm -f "${fcode}.*"
125 - popd
126 -
127 - append-flags "${openmp}"
128 - fi
129 -
130 - python-any-r1_pkg_setup
131 -}
132 -
133 -src_prepare() {
134 - epatch \
135 - "${FILESDIR}"/${P}-0002.patch \
136 - "${FILESDIR}"/${P}-0003.patch \
137 - "${FILESDIR}"/${P}-0004.patch \
138 - "${DISTDIR}"/${P}-0005.patch \
139 - "${FILESDIR}"/${P}-0006.patch \
140 - "${FILESDIR}"/${P}-0007.patch \
141 - "${FILESDIR}"/${P}-CUDA_gethostname.patch
142 -
143 - eautoreconf
144 -}
145 -
146 -src_configure() {
147 - local modules="${EPREFIX}/usr/include"
148 - local netcdff_libs="-lnetcdff"
149 - filter-flags '-m*' '-O*' "-pipe"
150 - local nvcflags="${CFLAGS}"
151 - _filter-var nvcflags '-m*' '-O*' "-pipe" "-W*"
152 - use cuda && filter-ldflags '-m*' '-O*' "-pipe" "-W*"
153 - local mylapack="lapack"
154 - use scalapack && mylapack="scalapack"
155 - local myeconfargs=(
156 - $(use_enable mpi)
157 - --enable-optimised-convolution
158 - --enable-pseudo
159 - --enable-libbigdft
160 - --enable-binaries
161 - --disable-minima-hopping
162 - --disable-internal-libyaml
163 - --enable-internal-libabinit
164 - --with-moduledir="${modules}"
165 - --with-ext-linalg="$($(tc-getPKG_CONFIG) --libs-only-l "${mylapack}")"
166 - --with-ext-linalg-path="$($(tc-getPKG_CONFIG) --libs-only-L "${mylapack}")"
167 - --with-libxc="yes"
168 - --disable-internal-libxc
169 - $(use_enable cuda cuda-gpu)
170 - $(use_with cuda cuda-path /opt/cuda)
171 - $(use_with cuda nvcc-flags "${nvcflags}")
172 - $(use_enable opencl)
173 - $(use_with etsf_io etsf-io)
174 - "$(use etsf_io && echo "--with-netcdf-libs=$($(tc-getPKG_CONFIG) --libs netcdf) ${netcdff_libs}")"
175 - $(use_with glib gobject)
176 - $(use_with scalapack)
177 - $(use_with scalapack scalapack-path "${EPREFIX}/usr/$(get_libdir)")
178 - $(use_with scalapack blacs)
179 - $(use_with scalapack blacs-path "${EPREFIX}/usr/$(get_libdir)")
180 - PKG_CONFIG="$(tc-getPKG_CONFIG)"
181 - FCFLAGS="${FCFLAGS}"
182 - LD="$(tc-getLD)"
183 - CPP="$(tc-getCPP)"
184 - )
185 - autotools-utils_src_configure
186 -}
187 -
188 -src_compile() {
189 - #autotools-utils_src_compile() expanded
190 - _check_build_dir
191 - pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
192 - emake -j1
193 - sed -i -e's%\$(top_builddir)/[^ ]*/lib\([^ /$-]*\)\.a%-l\1%g' bigdft.pc || die
194 - popd > /dev/null
195 -
196 - #autotools-utils_src_compile
197 - if use doc; then
198 - VARTEXFONTS="${T}/fonts"
199 - autotools-utils_src_compile doc
200 - fi
201 -}
202 -
203 -src_test() {
204 - ewarn "The tests broken upstream. NOT testing"
205 -}
206 -
207 -src_install() {
208 - autotools-utils_src_install
209 -}
210
211 diff --git a/sci-libs/bigdft-abi/files/bigdft-abi-1.0.4-0002.patch b/sci-libs/bigdft-abi/files/bigdft-abi-1.0.4-0002.patch
212 deleted file mode 100644
213 index e533022c7..000000000
214 --- a/sci-libs/bigdft-abi/files/bigdft-abi-1.0.4-0002.patch
215 +++ /dev/null
216 @@ -1,37 +0,0 @@
217 -*** bigdft-abi-1.0.4/src/wfn_opt/applyh.f90 Tue May 28 15:42:28 2013
218 ---- bigdft-patch/src/wfn_opt/applyh.f90 Thu Jun 6 11:29:13 2013
219 -***************
220 -*** 1104,1110 ****
221 - istart_c=1
222 - if(at%npspcode(iatype)==7) then
223 - call atom_projector_paw(ikpt,iat,idir,istart_c,iproj,nlpspd%nprojel,&
224 -! lr,hx,hy,hz,rxyz(1,iat),at,orbs,nlpspd%plr(iat),proj,nwarnings,proj_G(iatype))
225 - else
226 - call atom_projector(ikpt,iat,idir,istart_c,iproj,nlpspd%nprojel,&
227 - lr,hx,hy,hz,rxyz(1,iat),at,orbs,nlpspd%plr(iat),proj,nwarnings)
228 ---- 1104,1110 ----
229 - istart_c=1
230 - if(at%npspcode(iatype)==7) then
231 - call atom_projector_paw(ikpt,iat,idir,istart_c,iproj,nlpspd%nprojel,&
232 -! lr,hx,hy,hz,paw%rpaw(iatype),rxyz(1,iat),at,orbs,nlpspd%plr(iat),proj,nwarnings,proj_G(iatype))
233 - else
234 - call atom_projector(ikpt,iat,idir,istart_c,iproj,nlpspd%nprojel,&
235 - lr,hx,hy,hz,rxyz(1,iat),at,orbs,nlpspd%plr(iat),proj,nwarnings)
236 -***************
237 -*** 1116,1122 ****
238 - istart_c=1
239 - if(at%npspcode(iatype)==7) then
240 - ! PAW case:
241 -! call apply_atproj_iorb_paw(iat,iorb,nlpspd%nprojel,&
242 - at,orbs,wfd,nlpspd%plr(iat),proj,&
243 - psi(ispsi),hpsi(ispsi),eproj_sum,proj_G(iatype),paw)
244 - else
245 ---- 1116,1123 ----
246 - istart_c=1
247 - if(at%npspcode(iatype)==7) then
248 - ! PAW case:
249 -! call apply_atproj_iorb_paw(iat,iorb,ispsi,istart_c,&
250 -! nlpspd%nprojel,&
251 - at,orbs,wfd,nlpspd%plr(iat),proj,&
252 - psi(ispsi),hpsi(ispsi),eproj_sum,proj_G(iatype),paw)
253 - else
254
255 diff --git a/sci-libs/bigdft-abi/files/bigdft-abi-1.0.4-0003.patch b/sci-libs/bigdft-abi/files/bigdft-abi-1.0.4-0003.patch
256 deleted file mode 100644
257 index 5b406a9a7..000000000
258 --- a/sci-libs/bigdft-abi/files/bigdft-abi-1.0.4-0003.patch
259 +++ /dev/null
260 @@ -1,49 +0,0 @@
261 -*** bigdft-abi-1.0.4/src/init/gautowav.f90 Mon Jul 9 16:43:33 2012
262 ---- bigdft-patch/src/init/gautowav.f90 Mon Jun 10 11:16:37 2013
263 -***************
264 -*** 675,680 ****
265 ---- 675,681 ----
266 - integer :: i_stat,i_all,ishell,iexpo,icoeff,iat,isat,ng,l,m,i,nterm,ig
267 - integer :: nterms_max,nterms,iterm,n_gau,ml1,mu1,ml2,mu2,ml3,mu3 !n(c) iscoeff
268 - real(gp) :: rx,ry,rz,gau_a
269 -+ real(gp) :: gau_cut !only for PAW
270 - integer, dimension(nterm_max) :: lx,ly,lz
271 - real(gp), dimension(nterm_max) :: fac_arr
272 - real(wp), allocatable, dimension(:,:,:) :: work
273 -***************
274 -*** 746,762 ****
275 - gau_a=G%xp(1,iexpo+ig-1)
276 - n_gau=lx(i)
277 - !print *,'x',gau_a,nterm,ncplx,kx,ky,kz,ml1,mu1,lr%d%n1
278 -! call gauss_to_daub_k(hx,kx*hx,ncplx,1,ncplx,fac_arr(i),rx,gau_a,n_gau,&
279 - lr%ns1,lr%d%n1,ml1,mu1,&
280 - wx(1,0,1,iterm),work,nw,perx)
281 - n_gau=ly(i)
282 - !print *,'y',ml2,mu2,lr%d%n2
283 -! call gauss_to_daub_k(hy,ky*hy,ncplx,1,ncplx,wfn_gau(icoeff),ry,gau_a,n_gau,&
284 - lr%ns2,lr%d%n2,ml2,mu2,&
285 - wy(1,0,1,iterm),work,nw,pery)
286 - n_gau=lz(i)
287 - !print *,'z',ml3,mu3,lr%d%n3
288 -! call gauss_to_daub_k(hz,kz*hz,ncplx,1,ncplx,G%psiat(:,iexpo+ig-1),rz,gau_a,n_gau,&
289 - lr%ns3,lr%d%n3,ml3,mu3,&
290 - wz(1,0,1,iterm),work,nw,perz)
291 - iterm=iterm+1
292 ---- 747,763 ----
293 - gau_a=G%xp(1,iexpo+ig-1)
294 - n_gau=lx(i)
295 - !print *,'x',gau_a,nterm,ncplx,kx,ky,kz,ml1,mu1,lr%d%n1
296 -! call gauss_to_daub_k(hx,kx*hx,ncplx,1,ncplx,fac_arr(i),rx,gau_a,gau_cut,n_gau,&
297 - lr%ns1,lr%d%n1,ml1,mu1,&
298 - wx(1,0,1,iterm),work,nw,perx)
299 - n_gau=ly(i)
300 - !print *,'y',ml2,mu2,lr%d%n2
301 -! call gauss_to_daub_k(hy,ky*hy,ncplx,1,ncplx,wfn_gau(icoeff),ry,gau_a,gau_cut,n_gau,&
302 - lr%ns2,lr%d%n2,ml2,mu2,&
303 - wy(1,0,1,iterm),work,nw,pery)
304 - n_gau=lz(i)
305 - !print *,'z',ml3,mu3,lr%d%n3
306 -! call gauss_to_daub_k(hz,kz*hz,ncplx,1,ncplx,G%psiat(:,iexpo+ig-1),rz,gau_a,gau_cut,n_gau,&
307 - lr%ns3,lr%d%n3,ml3,mu3,&
308 - wz(1,0,1,iterm),work,nw,perz)
309 - iterm=iterm+1
310
311 diff --git a/sci-libs/bigdft-abi/files/bigdft-abi-1.0.4-0004.patch b/sci-libs/bigdft-abi/files/bigdft-abi-1.0.4-0004.patch
312 deleted file mode 100644
313 index e9af11a58..000000000
314 --- a/sci-libs/bigdft-abi/files/bigdft-abi-1.0.4-0004.patch
315 +++ /dev/null
316 @@ -1,20 +0,0 @@
317 -*** bigdft-abi-1.0.4/src/hpsiortho.f90 Wed Jan 30 10:10:56 2013
318 ---- bigdft-patch/src/hpsiortho.f90 Tue Jun 11 09:49:22 2013
319 -***************
320 -*** 720,726 ****
321 - if(at%npspcode(1)==7) then
322 - call atom_projector_paw(ikpt,iat,0,istart_c,iproj,&
323 - nlpspd%nprojel,&
324 -! Lzd%Glr,Lzd%hgrids(1),Lzd%hgrids(2),Lzd%hgrids(3),rxyz(1,iat),at,orbs,&
325 - nlpspd%plr(iat),proj,nwarnings,proj_G(iatype))
326 - else
327 - call atom_projector(ikpt,iat,0,istart_c,iproj,&
328 ---- 720,727 ----
329 - if(at%npspcode(1)==7) then
330 - call atom_projector_paw(ikpt,iat,0,istart_c,iproj,&
331 - nlpspd%nprojel,&
332 -! Lzd%Glr,Lzd%hgrids(1),Lzd%hgrids(2),Lzd%hgrids(3),&
333 -! paw%rpaw(iatype),rxyz(1,iat),at,orbs,&
334 - nlpspd%plr(iat),proj,nwarnings,proj_G(iatype))
335 - else
336 - call atom_projector(ikpt,iat,0,istart_c,iproj,&
337
338 diff --git a/sci-libs/bigdft-abi/files/bigdft-abi-1.0.4-0006.patch b/sci-libs/bigdft-abi/files/bigdft-abi-1.0.4-0006.patch
339 deleted file mode 100644
340 index 56a67fc66..000000000
341 --- a/sci-libs/bigdft-abi/files/bigdft-abi-1.0.4-0006.patch
342 +++ /dev/null
343 @@ -1,43 +0,0 @@
344 -diff -urN bigdft-abi-1.0.4.old/configure bigdft-abi-1.0.4.new/configure
345 ---- bigdft-abi-1.0.4.old/configure 2012-10-05 15:10:27.000000000 +0200
346 -+++ bigdft-abi-1.0.4.new/configure 2013-06-11 16:51:00.000000000 +0200
347 -@@ -9185,15 +9185,15 @@
348 - withlibabinit=no
349 - fi
350 -
351 -- as_ac_File=`$as_echo "ac_cv_file_$ac_libabinit_dir/include/ab6_moldyn.$ax_fc_mod_ext" | $as_tr_sh`
352 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_libabinit_dir/include/ab6_moldyn.$ax_fc_mod_ext" >&5
353 --$as_echo_n "checking for $ac_libabinit_dir/include/ab6_moldyn.$ax_fc_mod_ext... " >&6; }
354 -+ as_ac_File=`$as_echo "ac_cv_file_$ac_libabinit_dir/include/ab7_moldyn.$ax_fc_mod_ext" | $as_tr_sh`
355 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_libabinit_dir/include/ab7_moldyn.$ax_fc_mod_ext" >&5
356 -+$as_echo_n "checking for $ac_libabinit_dir/include/ab7_moldyn.$ax_fc_mod_ext... " >&6; }
357 - if eval \${$as_ac_File+:} false; then :
358 - $as_echo_n "(cached) " >&6
359 - else
360 - test "$cross_compiling" = yes &&
361 - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
362 --if test -r "$ac_libabinit_dir/include/ab6_moldyn.$ax_fc_mod_ext"; then
363 -+if test -r "$ac_libabinit_dir/include/ab7_moldyn.$ax_fc_mod_ext"; then
364 - eval "$as_ac_File=yes"
365 - else
366 - eval "$as_ac_File=no"
367 -@@ -9208,15 +9208,15 @@
368 - moldyn="no"
369 - fi
370 -
371 -- as_ac_File=`$as_echo "ac_cv_file_$ac_libabinit_dir/include/ab6_symmetry.$ax_fc_mod_ext" | $as_tr_sh`
372 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_libabinit_dir/include/ab6_symmetry.$ax_fc_mod_ext" >&5
373 --$as_echo_n "checking for $ac_libabinit_dir/include/ab6_symmetry.$ax_fc_mod_ext... " >&6; }
374 -+ as_ac_File=`$as_echo "ac_cv_file_$ac_libabinit_dir/include/ab7_symmetry.$ax_fc_mod_ext" | $as_tr_sh`
375 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_libabinit_dir/include/ab7_symmetry.$ax_fc_mod_ext" >&5
376 -+$as_echo_n "checking for $ac_libabinit_dir/include/ab7_symmetry.$ax_fc_mod_ext... " >&6; }
377 - if eval \${$as_ac_File+:} false; then :
378 - $as_echo_n "(cached) " >&6
379 - else
380 - test "$cross_compiling" = yes &&
381 - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
382 --if test -r "$ac_libabinit_dir/include/ab6_symmetry.$ax_fc_mod_ext"; then
383 -+if test -r "$ac_libabinit_dir/include/ab7_symmetry.$ax_fc_mod_ext"; then
384 - eval "$as_ac_File=yes"
385 - else
386 - eval "$as_ac_File=no"
387
388 diff --git a/sci-libs/bigdft-abi/files/bigdft-abi-1.0.4-0007.patch b/sci-libs/bigdft-abi/files/bigdft-abi-1.0.4-0007.patch
389 deleted file mode 100644
390 index 8f871d8fd..000000000
391 --- a/sci-libs/bigdft-abi/files/bigdft-abi-1.0.4-0007.patch
392 +++ /dev/null
393 @@ -1,344 +0,0 @@
394 -diff -crB bigdft-abi-1.0.4/src/init/projectors.f90 bigdft-patch/src/init/projectors.f90
395 -*** bigdft-abi-1.0.4/src/init/projectors.f90 Thu Nov 29 11:09:02 2012
396 ---- bigdft-patch/src/init/projectors.f90 Thu Jun 6 11:31:46 2013
397 -***************
398 -*** 383,394 ****
399 - END SUBROUTINE fill_projectors
400 -
401 - subroutine atom_projector_paw(ikpt,iat,idir,istart_c,iproj,nprojel,&
402 -! lr,hx,hy,hz,rxyz,at,orbs,plr,proj,nwarnings,proj_G)
403 - use module_base
404 - use module_types
405 - implicit none
406 - integer, intent(in) :: iat,idir,ikpt,nprojel
407 -! real(gp), intent(in) :: hx,hy,hz
408 - type(atoms_data), intent(in) :: at
409 - type(orbitals_data), intent(in) :: orbs
410 - type(locreg_descriptors), intent(in) :: plr
411 ---- 383,394 ----
412 - END SUBROUTINE fill_projectors
413 -
414 - subroutine atom_projector_paw(ikpt,iat,idir,istart_c,iproj,nprojel,&
415 -! lr,hx,hy,hz,rpaw,rxyz,at,orbs,plr,proj,nwarnings,proj_G)
416 - use module_base
417 - use module_types
418 - implicit none
419 - integer, intent(in) :: iat,idir,ikpt,nprojel
420 -! real(gp), intent(in) :: hx,hy,hz,rpaw
421 - type(atoms_data), intent(in) :: at
422 - type(orbitals_data), intent(in) :: orbs
423 - type(locreg_descriptors), intent(in) :: plr
424 -***************
425 -*** 460,466 ****
426 - ! plr%wfd%keyvglob,plr%wfd%keyglob,proj_tmp(1),nwarnings)
427 - !END DEBUG
428 - call projector_paw(at%geocode,at%atomnames(ityp),iat,idir,l,i,&
429 -! proj_G%psiat(:,jj),proj_G%xp(:,jj),rxyz(1),lr,&
430 - hx,hy,hz,kx,ky,kz,proj_G%ncplx,ncplx_k,&
431 - mbvctr_c,mbvctr_f,mbseg_c,mbseg_f,&
432 - plr%wfd%keyvglob,plr%wfd%keyglob,proj_tmp(1),nwarnings)
433 ---- 460,466 ----
434 - ! plr%wfd%keyvglob,plr%wfd%keyglob,proj_tmp(1),nwarnings)
435 - !END DEBUG
436 - call projector_paw(at%geocode,at%atomnames(ityp),iat,idir,l,i,&
437 -! proj_G%psiat(:,jj),proj_G%xp(:,jj),rpaw,rxyz(1),lr,&
438 - hx,hy,hz,kx,ky,kz,proj_G%ncplx,ncplx_k,&
439 - mbvctr_c,mbvctr_f,mbseg_c,mbseg_f,&
440 - plr%wfd%keyvglob,plr%wfd%keyglob,proj_tmp(1),nwarnings)
441 -***************
442 -*** 646,651 ****
443 ---- 646,652 ----
444 - integer :: istart_c,nterm,idir2
445 - real(gp) :: fpi,factor,rx,ry,rz
446 - real(dp) :: scpr
447 -+ real(gp) :: gau_cut !dummy here just for PAW
448 - integer, dimension(3) :: nterm_arr
449 - integer, dimension(nterm_max) :: lx,ly,lz
450 - integer, dimension(3,nterm_max,3) :: lxyz_arr
451 -***************
452 -*** 709,715 ****
453 -
454 - call crtproj(geocode,nterm,lr,hx,hy,hz,kx,ky,kz,&
455 - ncplx_g,ncplx,&
456 -! gau_a,factors,rx,ry,rz,lx,ly,lz,&
457 - mbvctr_c,mbvctr_f,mseg_c,mseg_f,keyv_p,keyg_p,proj(istart_c))
458 -
459 - ! testing
460 ---- 710,716 ----
461 -
462 - call crtproj(geocode,nterm,lr,hx,hy,hz,kx,ky,kz,&
463 - ncplx_g,ncplx,&
464 -! gau_a,gau_cut,factors,rx,ry,rz,lx,ly,lz,&
465 - mbvctr_c,mbvctr_f,mseg_c,mseg_f,keyv_p,keyg_p,proj(istart_c))
466 -
467 - ! testing
468 -***************
469 -*** 1055,1061 ****
470 - end subroutine projector_paw_isf
471 -
472 - subroutine projector_paw(geocode,atomname,iat,idir,l,i,&
473 -! factor,gau_a,rxyz,lr,&
474 - hx,hy,hz,kx,ky,kz,ncplx_g,ncplx_k,&
475 - mbvctr_c,mbvctr_f,mseg_c,mseg_f,keyv_p,keyg_p,proj,nwarnings)
476 - use module_base
477 ---- 1056,1062 ----
478 - end subroutine projector_paw_isf
479 -
480 - subroutine projector_paw(geocode,atomname,iat,idir,l,i,&
481 -! factor,gau_a,gau_cut,rxyz,lr,&
482 - hx,hy,hz,kx,ky,kz,ncplx_g,ncplx_k,&
483 - mbvctr_c,mbvctr_f,mseg_c,mseg_f,keyv_p,keyg_p,proj,nwarnings)
484 - use module_base
485 -***************
486 -*** 1066,1072 ****
487 - integer, intent(in) :: iat,idir,l,i,mbvctr_c,mbvctr_f,mseg_c,mseg_f
488 - integer, intent(in) :: ncplx_k,ncplx_g
489 - type(locreg_descriptors),intent(in) :: lr
490 -! real(gp), intent(in) :: hx,hy,hz,kx,ky,kz
491 - !integer, dimension(2,3), intent(in) :: nboxp_c,nboxp_f
492 - integer, dimension(mseg_c+mseg_f), intent(in) :: keyv_p
493 - integer, dimension(2,mseg_c+mseg_f), intent(in) :: keyg_p
494 ---- 1067,1073 ----
495 - integer, intent(in) :: iat,idir,l,i,mbvctr_c,mbvctr_f,mseg_c,mseg_f
496 - integer, intent(in) :: ncplx_k,ncplx_g
497 - type(locreg_descriptors),intent(in) :: lr
498 -! real(gp), intent(in) :: hx,hy,hz,kx,ky,kz,gau_cut
499 - !integer, dimension(2,3), intent(in) :: nboxp_c,nboxp_f
500 - integer, dimension(mseg_c+mseg_f), intent(in) :: keyv_p
501 - integer, dimension(2,mseg_c+mseg_f), intent(in) :: keyg_p
502 -***************
503 -*** 1131,1137 ****
504 -
505 - call crtproj(geocode,nterm,lr,hx,hy,hz,kx,ky,kz,&
506 - ncplx_g,ncplx_k,&
507 -! gau_a,factors(1:ncplx_g,1:nterm),&
508 - rx,ry,rz,lx(1:nterm),ly(1:nterm),lz(1:nterm),&
509 - mbvctr_c,mbvctr_f,mseg_c,mseg_f,keyv_p,keyg_p,&
510 - proj(istart_c))
511 ---- 1132,1138 ----
512 -
513 - call crtproj(geocode,nterm,lr,hx,hy,hz,kx,ky,kz,&
514 - ncplx_g,ncplx_k,&
515 -! gau_a,gau_cut,factors(1:ncplx_g,1:nterm),&
516 - rx,ry,rz,lx(1:nterm),ly(1:nterm),lz(1:nterm),&
517 - mbvctr_c,mbvctr_f,mseg_c,mseg_f,keyv_p,keyg_p,&
518 - proj(istart_c))
519 -***************
520 -*** 1248,1254 ****
521 - !! in the arrays proj_c, proj_f
522 - subroutine crtproj(geocode,nterm,lr, &
523 - hx,hy,hz,kx,ky,kz,ncplx_g,ncplx_k,&
524 -! gau_a,fac_arr,rx,ry,rz,lx,ly,lz, &
525 - mvctr_c,mvctr_f,mseg_c,mseg_f,keyv_p,keyg_p,proj)
526 - use module_base
527 - use module_types
528 ---- 1249,1255 ----
529 - !! in the arrays proj_c, proj_f
530 - subroutine crtproj(geocode,nterm,lr, &
531 - hx,hy,hz,kx,ky,kz,ncplx_g,ncplx_k,&
532 -! gau_a,gau_cut,fac_arr,rx,ry,rz,lx,ly,lz, &
533 - mvctr_c,mvctr_f,mseg_c,mseg_f,keyv_p,keyg_p,proj)
534 - use module_base
535 - use module_types
536 -***************
537 -*** 1256,1262 ****
538 - character(len=1), intent(in) :: geocode
539 - integer, intent(in) :: nterm,mvctr_c,mvctr_f,mseg_c,mseg_f
540 - integer, intent(in) :: ncplx_g,ncplx_k
541 -! real(gp), intent(in) :: hx,hy,hz,rx,ry,rz,kx,ky,kz
542 - integer, dimension(nterm), intent(in) :: lx,ly,lz
543 - real(gp), dimension(ncplx_g,nterm), intent(in) :: fac_arr
544 - real(gp), dimension(ncplx_g),intent(in):: gau_a
545 ---- 1257,1263 ----
546 - character(len=1), intent(in) :: geocode
547 - integer, intent(in) :: nterm,mvctr_c,mvctr_f,mseg_c,mseg_f
548 - integer, intent(in) :: ncplx_g,ncplx_k
549 -! real(gp), intent(in) :: hx,hy,hz,rx,ry,rz,kx,ky,kz,gau_cut
550 - integer, dimension(nterm), intent(in) :: lx,ly,lz
551 - real(gp), dimension(ncplx_g,nterm), intent(in) :: fac_arr
552 - real(gp), dimension(ncplx_g),intent(in):: gau_a
553 -***************
554 -*** 1313,1327 ****
555 -
556 - factor(:)=fac_arr(:,iterm)
557 - n_gau=lx(iterm)
558 -! call gauss_to_daub_k(hx,kx*hx,ncplx_w,ncplx_g,ncplx_k,factor,rx,gau_a,n_gau,ns1,n1,ml1,mu1,&
559 - wprojx(1,0,1,iterm),work,nw,perx)
560 -
561 - n_gau=ly(iterm)
562 -! call gauss_to_daub_k(hy,ky*hy,ncplx_w,ncplx_g,ncplx_k,1.d0,ry,gau_a,n_gau,ns2,n2,ml2,mu2,&
563 - wprojy(1,0,1,iterm),work,nw,pery)
564 -
565 - n_gau=lz(iterm)
566 -! call gauss_to_daub_k(hz,kz*hz,ncplx_w,ncplx_g,ncplx_k,1.d0,rz,gau_a,n_gau,ns3,n3,ml3,mu3,&
567 - wprojz(1,0,1,iterm),work,nw,perz)
568 - end do
569 - !the filling of the projector should be different if ncplx_k==1 or 2
570 ---- 1314,1328 ----
571 -
572 - factor(:)=fac_arr(:,iterm)
573 - n_gau=lx(iterm)
574 -! call gauss_to_daub_k(hx,kx*hx,ncplx_w,ncplx_g,ncplx_k,factor,rx,gau_a,gau_cut,n_gau,ns1,n1,ml1,mu1,&
575 - wprojx(1,0,1,iterm),work,nw,perx)
576 -
577 - n_gau=ly(iterm)
578 -! call gauss_to_daub_k(hy,ky*hy,ncplx_w,ncplx_g,ncplx_k,1.d0,ry,gau_a,gau_cut,n_gau,ns2,n2,ml2,mu2,&
579 - wprojy(1,0,1,iterm),work,nw,pery)
580 -
581 - n_gau=lz(iterm)
582 -! call gauss_to_daub_k(hz,kz*hz,ncplx_w,ncplx_g,ncplx_k,1.d0,rz,gau_a,gau_cut,n_gau,ns3,n3,ml3,mu3,&
583 - wprojz(1,0,1,iterm),work,nw,perz)
584 - end do
585 - !the filling of the projector should be different if ncplx_k==1 or 2
586 -diff -crB bigdft-abi-1.0.4/src/modules/types.f90 bigdft-patch/src/modules/types.f90
587 -*** bigdft-abi-1.0.4/src/modules/types.f90 Thu Jan 3 10:18:08 2013
588 ---- bigdft-patch/src/modules/types.f90 Thu Jun 6 11:27:48 2013
589 -***************
590 -*** 1119,1124 ****
591 ---- 1119,1125 ----
592 - type(cprj_objects),dimension(:,:),allocatable :: cprj
593 - real(wp),dimension(:),pointer :: spsi
594 - real(wp),dimension(:,:),pointer :: sij
595 -+ real(dp),dimension(:),pointer :: rpaw
596 - end type paw_objects
597 -
598 - contains
599 -***************
600 -*** 2090,2095 ****
601 ---- 2091,2097 ----
602 - nullify(paw%indlmn)
603 - nullify(paw%spsi)
604 - nullify(paw%sij)
605 -+ nullify(paw%rpaw)
606 -
607 - if(present(rholoc)) then
608 - nullify(rholoc%msz)
609 -diff -crB bigdft-abi-1.0.4/src/wavelib/gauss_to_daub.f90 bigdft-patch/src/wavelib/gauss_to_daub.f90
610 -*** bigdft-abi-1.0.4/src/wavelib/gauss_to_daub.f90 Mon Jul 9 16:43:33 2012
611 ---- bigdft-patch/src/wavelib/gauss_to_daub.f90 Thu Jun 6 13:01:01 2013
612 -***************
613 -*** 448,454 ****
614 - !! In this version, we dephase the projector to wrt the center of the gaussian
615 - !! this should not have an impact on the results since the operator is unchanged
616 - subroutine gauss_to_daub_k(hgrid,kval,ncplx_w,ncplx_g,ncplx_k,&
617 -! factor,gau_cen,gau_a,n_gau,&!no err, errsuc
618 - nstart,nmax,n_left,n_right,c,&
619 - ww,nwork,periodic) !added work arrays ww with dimension nwork
620 - use module_base
621 ---- 448,454 ----
622 - !! In this version, we dephase the projector to wrt the center of the gaussian
623 - !! this should not have an impact on the results since the operator is unchanged
624 - subroutine gauss_to_daub_k(hgrid,kval,ncplx_w,ncplx_g,ncplx_k,&
625 -! factor,gau_cen,gau_a,gau_cut,n_gau,&!no err, errsuc
626 - nstart,nmax,n_left,n_right,c,&
627 - ww,nwork,periodic) !added work arrays ww with dimension nwork
628 - use module_base
629 -***************
630 -*** 458,464 ****
631 - integer, intent(in) :: ncplx_w !size of the ww matrix
632 - integer, intent(in) :: ncplx_g !1 or 2 for simple or complex gaussians, respectively.
633 - integer, intent(in) :: ncplx_k !use 2 for k-points.
634 -! real(gp), intent(in) :: hgrid,gau_cen,kval
635 - real(gp),dimension(ncplx_g),intent(in)::factor,gau_a
636 - real(wp), dimension(0:nwork,2,ncplx_w), intent(inout) :: ww
637 - integer, intent(out) :: n_left,n_right
638 ---- 458,464 ----
639 - integer, intent(in) :: ncplx_w !size of the ww matrix
640 - integer, intent(in) :: ncplx_g !1 or 2 for simple or complex gaussians, respectively.
641 - integer, intent(in) :: ncplx_k !use 2 for k-points.
642 -! real(gp), intent(in) :: hgrid,gau_cen,kval,gau_cut
643 - real(gp),dimension(ncplx_g),intent(in)::factor,gau_a
644 - real(wp), dimension(0:nwork,2,ncplx_w), intent(inout) :: ww
645 - integer, intent(out) :: n_left,n_right
646 -***************
647 -*** 467,473 ****
648 - character(len=*), parameter :: subname='gauss_to_daub_k'
649 - integer :: i_all,i_stat
650 - integer :: rightx,leftx,right_t,i0,i,k,length,j,icplx
651 -! real(gp) :: a1,a2,z0,h,x,r,coeff,r2,rk
652 - real(gp) :: fac(ncplx_g)
653 - real(wp) :: func,cval,sval,cval2,sval2
654 - real(wp), dimension(:,:,:), allocatable :: cc
655 ---- 467,473 ----
656 - character(len=*), parameter :: subname='gauss_to_daub_k'
657 - integer :: i_all,i_stat
658 - integer :: rightx,leftx,right_t,i0,i,k,length,j,icplx
659 -! real(gp) :: a1,a2,z0,h,x,r,coeff,r2,rk,gcut
660 - real(gp) :: fac(ncplx_g)
661 - real(wp) :: func,cval,sval,cval2,sval2
662 - real(wp), dimension(:,:,:), allocatable :: cc
663 -***************
664 -*** 487,492 ****
665 ---- 487,493 ----
666 - end if
667 - i0=nint(gau_cen/hgrid) ! the array is centered at i0
668 - z0=gau_cen/hgrid-real(i0,gp)
669 -+ gcut=gau_cut/hgrid
670 - h=.125_gp*.5_gp
671 -
672 - !calculate the array sizes;
673 -***************
674 -*** 655,681 ****
675 - do i=leftx,rightx
676 - x=real(i-i0*16,gp)*h
677 - r=x-z0
678 -! r2=r*r
679 -! cval=real(cos(a2*r2),wp)
680 -! sval=real(sin(a2*r2),wp)
681 -! r2=0.5_gp*r2/(a1**2)
682 -! func=real(dexp(-real(r2,kind=8)),wp)
683 -! ww(i-leftx,1,1)=func*cval
684 -! ww(i-leftx,1,2)=func*sval
685 - enddo
686 - else
687 - do i=leftx,rightx
688 - x=real(i-i0*16,gp)*h
689 - r=x-z0
690 -! r2=r*r
691 -! cval=real(cos(a2*r2),wp)
692 -! sval=real(sin(a2*r2),wp)
693 -! coeff=r**n_gau
694 -! r2=0.5_gp*r2/(a1**2)
695 -! func=real(dexp(-real(r2,kind=8)),wp)
696 -! func=real(coeff,wp)*func
697 -! ww(i-leftx,1,1)=func*cval
698 -! ww(i-leftx,1,2)=func*sval
699 - enddo
700 - end if
701 -
702 ---- 656,690 ----
703 - do i=leftx,rightx
704 - x=real(i-i0*16,gp)*h
705 - r=x-z0
706 -! if(abs(r)-gcut < 1e-8) then
707 -! r2=r*r
708 -! cval=real(cos(a2*r2),wp)
709 -! sval=real(sin(a2*r2),wp)
710 -! r2=0.5_gp*r2/(a1**2)
711 -! func=real(dexp(-real(r2,kind=8)),wp)
712 -! ww(i-leftx,1,1)=func*cval
713 -! ww(i-leftx,1,2)=func*sval
714 -! else
715 -! ww(i-leftx,1,:)=0.0_wp
716 -! end if
717 - enddo
718 - else
719 - do i=leftx,rightx
720 - x=real(i-i0*16,gp)*h
721 - r=x-z0
722 -! if( abs(r)-gcut < 1e-8 ) then
723 -! r2=r*r
724 -! cval=real(cos(a2*r2),wp)
725 -! sval=real(sin(a2*r2),wp)
726 -! coeff=r**n_gau
727 -! r2=0.5_gp*r2/(a1**2)
728 -! func=real(dexp(-real(r2,kind=8)),wp)
729 -! func=real(coeff,wp)*func
730 -! ww(i-leftx,1,1)=func*cval
731 -! ww(i-leftx,1,2)=func*sval
732 -! else
733 -! ww(i-leftx,1,:)=0.0_wp
734 -! end if
735 - enddo
736 - end if
737 -
738
739 diff --git a/sci-libs/bigdft-abi/files/bigdft-abi-1.0.4-CUDA_gethostname.patch b/sci-libs/bigdft-abi/files/bigdft-abi-1.0.4-CUDA_gethostname.patch
740 deleted file mode 100644
741 index 04c45b4d7..000000000
742 --- a/sci-libs/bigdft-abi/files/bigdft-abi-1.0.4-CUDA_gethostname.patch
743 +++ /dev/null
744 @@ -1,22 +0,0 @@
745 -diff -Naurp bigdft-abi-1.0.4-orig/S_GPU/src/class_utils.h bigdft-abi-1.0.4/S_GPU/src/class_utils.h
746 ---- bigdft-abi-1.0.4-orig/S_GPU/src/class_utils.h 2012-07-09 14:43:33.000000000 +0000
747 -+++ bigdft-abi-1.0.4/S_GPU/src/class_utils.h 2013-06-27 09:52:17.000000000 +0000
748 -@@ -32,6 +32,7 @@
749 - #include <config.h>
750 - #endif
751 -
752 -+#include <unistd.h>
753 - #include <sstream>
754 -
755 - class deleter
756 -diff -Naurp bigdft-abi-1.0.4-orig/src/CUDA/check_cuda.h bigdft-abi-1.0.4/src/CUDA/check_cuda.h
757 ---- bigdft-abi-1.0.4-orig/src/CUDA/check_cuda.h 2012-07-09 14:43:33.000000000 +0000
758 -+++ bigdft-abi-1.0.4/src/CUDA/check_cuda.h 2013-06-27 09:51:50.000000000 +0000
759 -@@ -1,6 +1,7 @@
760 - #ifndef __checkcuda__
761 - #define __checkcuda__
762 -
763 -+#include <unistd.h>
764 - #include <string>
765 - #include <sstream>
766 -
767
768 diff --git a/sci-libs/bigdft-abi/metadata.xml b/sci-libs/bigdft-abi/metadata.xml
769 deleted file mode 100644
770 index b5efea318..000000000
771 --- a/sci-libs/bigdft-abi/metadata.xml
772 +++ /dev/null
773 @@ -1,29 +0,0 @@
774 -<?xml version="1.0" encoding="UTF-8"?>
775 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
776 -<pkgmetadata>
777 - <maintainer type="project">
778 - <email>sci-physics@g.o</email>
779 - <name>Gentoo Physics Project</name>
780 - </maintainer>
781 - <longdescription lang="en">
782 -BigDFT is a package whose main program allows one to find the total energy,
783 -charge density and electronic structure of systems made of electrons and nuclei
784 -(molecules and periodic solids) within Density Functional Theory (DFT), using
785 -pseudopotentials and a wavelets basis. BigDFT-ABI is its fork by ABINIT developers
786 -to serve as a library for sci-physics/abinit.
787 -</longdescription>
788 - <use>
789 - <flag name="cuda">Enable support for nVidia CUDA</flag>
790 - <flag name="etsf_io">
791 -Enable support for reading and writing the European Theoretical
792 -Spectroscopy facility (ETSF) file format
793 -</flag>
794 - <flag name="glib">
795 -Compile with GLib Object System support
796 -</flag>
797 - <flag name="opencl">Enable support for OpenCL GPU acceleration</flag>
798 - <flag name="scalapack">
799 -Use ScaLAPACK, a subset of LAPACK routines redesigned for heterogenous computing
800 -</flag>
801 - </use>
802 -</pkgmetadata>