3
0
mirror of https://github.com/triqs/dft_tools synced 2024-11-07 06:33:48 +01:00
Commit Graph

245 Commits

Author SHA1 Message Date
Oleg E. Peil
65fc129cd1 Fixed parsing of EIGENVAL to accord with the new format
In recent version of VASP the output in EIGENVAL includes also
Fermi weights. The parser in class 'Eigenval' has been modified
accordingly.
2015-10-14 16:15:14 +02:00
Oleg E. Peil
66fac2f1bd Added preliminary PROJCAR parser to vaspio
This python-parser is a prototype of a future parser that will probably
be using only LOCPROJ (which is going to be modified).
At the moment, one has to use the first line of LOCPROJ to determine
the array dimensions and parse PROJCAR because it contains relevant information
on projectors (such as site and orbital character).

Note that in the previous implementation relying on the binary PLOCAR-file
the Fermi weights were taken from PLOCAR. In the current version of VASP
(>=5.4.1) the Fermi weights can read in from EIGENVAL.
2015-10-14 15:58:45 +02:00
Oleg E. Peil
8064c9604d Moved 'vasp_converter.py' to 'converters' 2015-10-13 11:36:43 +02:00
Oleg E. Peil
819fc987f0 Reshuffled files after repository merge
The files from the original vasp-interface repository are reshuffled in
accord with the directory structure of dft_tools. Some of the directories,
such as 'test' (unit tests for the interface), 'examples' (simple examples for
the development purposes) are temporarily placed into 'python/vasp' directory
to avoid confusion with integral tests and examples of dft_tools.
2015-10-13 11:27:55 +02:00
Oleg E. Peil
77a169d242 Fixed small bugs and typos in vasp_converter
VaspConverter is fixed to run and successfully produce some *.h5-file.
Consistency of this file is to be determined later.
2015-10-11 14:03:14 +02:00
Oleg E. Peil
fada2af703 Fixed imports in vasp_converter
Import of 'json' is fixed to conform python distributions without
'simplejson'.
Also, the full path is used for 'converter_tools' for the moment while
'vasp_converter' is not part of 'dft_tools'.
2015-10-11 14:03:14 +02:00
Oleg.Peil
2346b43950 Fixed import of 'json'
It seems that not all distributions of python come with a 'simplejson' module.
Now, if this module is not found the import falls back to module 'json'.
2015-10-11 14:03:14 +02:00
Oleg E. Peil
53de9b3962 Added preliminary implementation of misc and symmetry input
At the moment, symmetries are not supported by the interface.
Instead, some dummy parameters are generated and the symmetry is turned off.
'misc_input' is only partially implemented because it contains
some data which is not required for the correct functioning of DftTools.
2015-10-11 14:03:14 +02:00
Oleg E. Peil
57b0d5735a Replaced 'python' with 'pytriqs' in 'run_build.sh' 2015-10-11 14:03:13 +02:00
Oleg E. Peil
84061edc4b Added a preliminary version of VaspConverter
This preliminary version is untested and might not even run.
Here, almost all relevant input (apart from symmetries and miscellaneous)
is implemented and conventions adpoted in DftTools are accomodated.
2015-10-11 14:03:13 +02:00
Oleg E. Peil
d70dca3dd7 Fixed 'nelect_window()' in ProjectorGroup
Method 'nelect_window()' now correctly takes into account a subset
of bands selected by the energy window.
Also, the number of electrons is now output to a '*.grX' file.
2015-10-11 14:03:13 +02:00
Oleg E. Peil
f89ea4c639 Added output of ion sort corresponding to a shell
The data for a projected shell (output to a '*.pgX' file) contains
now the ion sort corresponding to this shell.

Also, 'check_data_consistency()' was fixed by correcting the
reference to list 'type_of_ion' (which is now copied to ElectronicStructure).
2015-10-11 14:03:13 +02:00
Oleg E. Peil
f2e4c2f866 Added 'type_of_ion' list to ElectronicStructure 2015-10-11 14:03:13 +02:00
Oleg E. Peil
68fbc15891 Fixed test setup for 'test_projgroups.py'
The parameter set of 'ProjectorGroup' constructor was modified.
Now the call in the test case has been fixed accordingly.
2015-10-11 14:03:13 +02:00
Oleg E. Peil
1f57cd1935 Added consistency check for projected shells
Added a check to 'check_data_consistency()' that verifies
that each shell contains only one sort of ions.

Also added a non-functioning test (implementation is commented)
for the function.
It requires a full set of VASP files for an example with multiple atom sorts.
2015-10-11 14:03:13 +02:00
Oleg E. Peil
36c928a4b5 Fixed the previous commit
The implementation of option 'read_all' was missing in the previous commit.
2015-10-11 14:03:13 +02:00
Oleg E. Peil
33ab7ff2a0 Added an option 'read_all' to VaspData.__init__() 2015-10-11 14:03:13 +02:00
Oleg E. Peil
0cec37f3fc Added 'type_of_ion' list to class Poscar
A list 'type_of_ion' mapping ion index to their types is added
to class Poscar. A corresponding test is also added.
2015-10-11 14:03:13 +02:00
Oleg E. Peil
529c7bc9d5 Fixed the determination of parameter 'shell.ndim'
Parameter 'ndim' of class 'ProjectedShell' was calculated
incorrectly, giving the value of 6 for a d-shell.
2015-10-11 14:03:13 +02:00
Oleg E. Peil
7256907c72 Added input of a ctrl-file to the converter
Implemented a basic input of a ctrl-file. First, the JSON-header is
read and parsed, then k-points and their weights are read in.
2015-10-11 14:03:13 +02:00
Oleg Peil
1e01003653 Added 'conv_example.py' to test the converter.
The script is supposed to be part of the test example for
the converter.
2015-10-11 14:03:13 +02:00
Oleg Peil
327f100a64 Fixed the name of function 'generate_plo()'
The function 'generate_ortho_plos()' is renamed to
'generate_plo()', which fixes the partially faulty merge.
2015-10-11 14:03:13 +02:00
Oleg Peil
7b2e2a3b6e Implemented 'read_header_and_data()' and 'read_data()'
'read_data()' is a generator interpreting a file as a sequence of
floats. Lines starting with '#' are ignored.
'read_header_and_data()' reads the header string until a line
"# END ...", initializes a generator 'read_data()', and returns
them.
2015-10-11 14:03:13 +02:00
Oleg Peil
8179b74178 Added the main converter script 'vasp_converter.py'
'vasp_converter.py' is based on the existing 'wien2k_converter.py'.
Methods 'read_header_and_data()' and 'read_data()' for reading input files
are added. The first method returns a JSON-header and a generator 'read_data()'
returning floats from the plain-data part of the file.
2015-10-11 14:03:13 +02:00
Michel Ferrero
dd33621e7c Merge ../bare_plovasp into dev
Conflicts:
	python/converters/vasp/python/main.py
	python/converters/vasp/python/plotools.py
Merged old version of output with the new one
2015-10-11 14:00:35 +02:00
Oleg E. Peil
586b11c93f Added output of projector groups
The output of projected-group files is implemented. The data is stored
into files <basename>.pg<Ng>, where 'Ng' starts from 1.
2015-10-11 13:57:46 +02:00
Oleg E. Peil
2472341cd0 Added output of the header of a PLO-group file
The basic header for PLO-group file (now called '<basename>.pg<Ng>')
is implemented.
Also, fixed the wrong imported function name in 'main.py'.
2015-10-11 13:57:46 +02:00
Oleg E. Peil
207c637be2 Restructured text-output routines
'main()' now calls a function 'output_as_text()' responsible for storing
both a ctrl- and plo-files ('ctrl_output()' and 'plo_output()', respectively).
2015-10-11 13:57:46 +02:00
Oleg E. Peil
99f87cc70f Added output of k-points
The header of the ctrl-file is terminated by a line "#END OF HEADER"
followed by a dump of k-points with weights.
2015-10-11 13:57:46 +02:00
Oleg E. Peil
d794bfa0f5 Added output of a basic header into a ctrl-file
Added function 'ctrl_ouput()' which stores data common for all correlated
shells into a file '<basename>.ctrl'.
At the moment, only a very basic header is output.
The signature of 'plo_output()' is also modified to include an instance
of class 'ElectronicStructre' containing important information on
the lattice structure, Efermi, and k-points.
2015-10-11 13:57:46 +02:00
Oleg E. Peil
4c18c6e09c Added the parser of section [General]
Parsing of two optional parameters (BASENAME and EFERMI) from section [General] from the config-file
is implemented. If this section is not found the parameters are set to their
default values, which is 'vasp' for BASENAME and nothing for EFERMI.
Appropriate test is added to the 'inpconf' test suite.
2015-10-11 13:57:46 +02:00
Oleg E. Peil
4bbafa239e Added documentation on the output file formats
A description of the output file formats is added to the documentation.
In particular, the outline of JSON headers for projector-group (*.plog<Ng>)
and control (*.ctrl) files are given.
2015-10-11 13:57:46 +02:00
Oleg E. Peil
db16a8438d Restructed test directory
The names of the test suites have been prefixed with an underscore
to avoid name conflicts with corresponding modules.
Also an attempt to make a scan of all tests has been made by
creating a 'test_all.py' script that is supposed to discover all
test cases and run them. Unfortunately, this does not work as expected
because many tests use input files assumed to be found in the current
directory, which is not true if the tests are run from a different
(parent) directory.

This can be fixed by either forcing the change of directory (but it
seems that 'unittest' does not have this functionality) or
prepending input file names with the current module directory.
2015-10-11 13:57:46 +02:00
Oleg Peil
bb010d200b Added output of k-points
Subroutine 'kpoints_output()' is added to 'plotools.py' and is invoked
from 'main.py'.
K-points are output in a separate file <basename>.kpoints that is
common to all PLO groups. If present, tetrahedron data is also stored.
2015-10-11 13:55:49 +02:00
Oleg Peil
33f9e75857 Changed 'generate_ortho_plos()' to 'generate_plo()'
Generation and orthogonalization of PLOs should be separated
because some quantities (such as the LDA density matrix) are calculated
using the original raw projectors.
The orthogonalization routine is now called from 'main.py'.
2015-10-11 13:55:48 +02:00
Oleg Peil
b325028efd Fixed the calculation of 'nelect'
In the previous commit the calculation of 'nelect' was implemented
incorrectly. The sum over k-points must also contain k-weights
and a spin factor (2.0 for ns = 1).

The calculation of 'nelect' is now implemented as a separate method
of ProjectorGroup.
2015-10-11 13:55:48 +02:00
Oleg Peil
b78a06d36f Added output of PLO groups
Output of PLO groups into a text file is added to 'plo_output()'.
The file format is provisional and can change in future versions.

Also, an attribute 'nelect' providing the number of electrons in
the selected energy window is added to ProjectorGroup.
2015-10-11 13:55:48 +02:00
Oleg Peil
6ab916d2d0 Added (empty) function 'plo_output()' 2015-10-11 13:55:05 +02:00
Oleg Peil
b6250477f2 Fixed 'generate_ortho_plos()' to produce orthogonalized PLOs 2015-10-11 13:55:05 +02:00
Oleg Peil
d0a75edec3 Added a simplest workflow to 'main.py'
Simplest workflow: read config-file, vasp data, generate PLOs,
and output them to text files.
2015-10-11 13:55:05 +02:00
Oleg Peil
bec28dbefd Added examples directory with one example 'simple'
Apart from their direct purpose as a help to users, examples may serve
as integrity tests. Eventually, one can convert them into a test suite.
2015-10-11 13:55:05 +02:00
Oleg E. Peil
5d8423a30e Added preliminary 'main.py' 2015-10-11 13:55:05 +02:00
Oleg E. Peil
89ab594253 Added test output files forgotten in the previous commit 2015-10-11 13:55:05 +02:00
Oleg E. Peil
4c920b8312 Added some documentation on PLOtools
The documentation has been slightly rewritten and extended to follow
the recent changes. The modifications include:

- ProjectorSet class is now replaced by ProjectorShell
- the workflow has been refined
- the electronic structure part is represented by class ElectronicStructure
2015-10-11 13:55:05 +02:00
Oleg E. Peil
3317371762 Added calculation of density matrices for a shell
A method 'density_matrix()' for evaluating a density matrix of a given shell
has been added to class ProjectorShell. It requires an ElectronicStructure
object as an input an by default produces a site- and spin-diagonal
part of the density matrix using the Fermi-weights obtained directly from VASP.
Ideally, this density matrix should coincide with the one calculated
within VASP itself (inside the LDA+U module).

Corresponding sanity test has been added, which shows only that the
calculation does not crash. Real numerical tests are needed.
2015-10-11 13:55:05 +02:00
Oleg E. Peil
ad6b3ab708 Added class ElectronicStructure
Class ElectronicStructure is intended for the internal representation
of the band structure and raw projector data from VASP.
In addition, its purpose is to perform a simple consistency check
of the input VASP data (as they are read from different files).
2015-10-11 13:55:05 +02:00
Oleg E. Peil
0c4e3ad006 Changed order of indices of 'proj_arr' array
When a ProjectorShell is created it creates a view of the full
projector array with orbital 'ilm' and band 'ib' indices interchanged.
The reason for this is that this corresponds more naturally to the
definition of the projector P_{m\nu} and also allows for multiplications
of projector matrices without additional transposition.

The tests have been modified accordingly.
2015-10-11 13:55:04 +02:00
Oleg E. Peil
a0e9d1a18e Added a test suite for ProjectorGroup class
A preliminary test suite for class 'ProjectorGroup' was added.
Currently, only a simplest test is performed testing that
after the input is processed the resulting projectors selected
within a given energy window are corret.
2015-10-11 13:55:04 +02:00
Oleg E. Peil
9bbd71afb9 Fixed a bug in 'inpconf.py'
The problem was that when one shell was specified without an explicit
group the created automatic group was lacking the default values for
parameters 'normalize' and 'normion'. The current design, however,
assumes that they must always be set.
2015-10-11 13:55:04 +02:00
Oleg E. Peil
5c3b3d0b8d Added several tests
Tests for 'select_bands()' and class 'ProjectorShell' have been added.
The function and class methods have been fixed accordingly to pass
the tests.
2015-10-11 13:55:04 +02:00
Oleg E. Peil
90c93c4693 Fixed a bug in 'inpconf.py', added a corresponding test 2015-10-11 13:55:04 +02:00
Oleg E. Peil
b05d176f39 Fixed 'vaspio.py' to pass the tests' 2015-10-11 13:55:04 +02:00
Oleg E. Peil
82cc06d41e Added a test suite for module 'vaspio' 2015-10-11 13:55:04 +02:00
Oleg E. Peil
36aadf6ff4 Removed redundant index reassignments in 'c_plocar_io.c' 2015-10-11 13:55:04 +02:00
Oleg E. Peil
46474c0b3e Modified 'c_plocar_io.c' to conform Numpy 1.7 API 2015-10-11 13:55:04 +02:00
Oleg E. Peil
7e894d98f6 Added a small test suite for 'c_plocar_io' module 2015-10-11 13:55:04 +02:00
Oleg E. Peil
19a30034f5 * Replaced direct compilation in Makefile by 'setup.py' from 'distutils'
* NO_DEPRECATED_API flag was added and now 'c_plocar_io.c' does not compile
2015-10-11 13:55:04 +02:00
Oleg E. Peil
f0ae1c9927 Added untested 'ProjectorGroup' class (including orthogonalization routine) 2015-10-11 13:55:04 +02:00
Oleg E. Peil
ba015d4b62 Added untested version of 'ProjectorShell' class 2015-10-11 13:55:04 +02:00
Oleg E. Peil
74ef3ca93e Added defulats to optional group parameters 2015-10-11 13:55:04 +02:00
Oleg E. Peil
9d4fb22572 Rearranged test cases for 'inpconf.py'.
A single-file test suite for 'inpconf.py' is split into several files,
each containing a separate TestCase class. In addition, all test cases
are derived from class ArrayTestCase (in turn derived from TestCase)
which contains a numpy-array equality method.
2015-10-11 13:55:04 +02:00
Oleg E. Peil
a58ec59c9c Added Scenario 5 to 'test_parse_input()' and fixed 'inpconf.py' to pass it 2015-10-11 13:55:04 +02:00
Oleg E. Peil
74a1ad280d Added Scenario 4 to 'test_parse_input()' (test10.cfg) 2015-10-11 13:55:04 +02:00
Oleg E. Peil
bcc20a0399 * Added Scenario 3 to 'test_parse_input()' (test9.cfg)
* Fixed 'parse_input()' to pass the test
2015-10-11 13:55:04 +02:00
Oleg E. Peil
8928fa3118 * Added Scenario 2 to 'test_input()' (test8.cfg)
* Removed group parameter 'shells' from a dict of required parameters
   for a single [Shell] section
2015-10-11 13:55:04 +02:00
Oleg E. Peil
8b60a91e49 Completed 'test_parse_groups()' 2015-10-11 13:55:04 +02:00
Oleg E. Peil
3516ebd285 * Replaced 'test_groups_shells_consistency()' with 'test_parse_input()'
* Fixed Scenario 1 of 'test_parse_input()'
  * Fixed Scenario 1 of 'test_parse_groups()'
2015-10-11 13:55:04 +02:00
Oleg E. Peil
d2fe6d50e8 * Fixed tests for the modified version of 'parse_shells()'
* Removed redundant prints in 'parse_shells()'
2015-10-11 13:55:04 +02:00
Oleg Peil
76d0b4a6bb Small syntax fix in inpconf.py 2015-10-11 13:55:04 +02:00
Oleg Peil
0816d45d59 * Added (empty) function 'parse_general()' * Completed 'parse_input()' 2015-10-11 13:55:03 +02:00
Oleg Peil
9ab6116b28 * Completed group parser
* Added a consistency check for groups and shells
 * Added scenario descriptions to the test suite
2015-10-11 13:55:03 +02:00
Oleg Peil
0d1ef0ac97 Small fixes in config.rst 2015-10-11 13:55:03 +02:00
Oleg Peil
f393168d16 * Added a test 'parse_groups()'
* Added to docs for config-file a description of all features that
    are implemented or under active development
2015-10-11 13:55:03 +02:00
Oleg Peil
bd6198d264 * Restructured the directory structure * Added some half-day long development including tests 2015-10-11 13:55:03 +02:00
Oleg Peil
e85d3b4f2b Initial commit 2015-10-11 13:55:03 +02:00
Manuel Zingl
29d2bf8d50 sigma_from_file changed to read function of gf
build_sigma_from_txt.py deleted as reading a gf
        from a file is now implemented in gf.local.tools
2015-09-17 10:03:07 +02:00
Manuel Zingl
cf7628065b Some changes in the usage of build_sigma_from_txt. 2015-08-24 14:47:08 +02:00
Manuel Zingl
61747745f4 New test added for build_sigma_from_txt.py 2015-08-21 12:24:54 +02:00
Manuel Zingl
00a775a93d analysis.rst done. Minor change in transport.rst
I also described how one can read a self energy form a data
        file. However, this needs to be tested and also included
        in the reference manual. Maybe the function should move
        back into sumk_dft_tools!?
2015-08-20 15:46:14 +02:00
Manuel Zingl
929b459681 Removes work around for issue #41 2015-08-10 16:14:51 +02:00
Manuel Zingl
b6e33ecc23 Add more integrators for the transport integral
It is now possible to use trapz, simps and quadl (with cubic
        spline) to perform the omega integration needed in the transport code.
2015-07-28 17:21:13 +02:00
Manuel Zingl
6ecbf6720d Fix converter bug occuring in sp case.
max(n_orbitals) changed to numpy.max(n_orbitals)
2015-07-16 12:27:01 +02:00
Manuel Zingl
ea7d0b1e81 Workaround for issue #41 2015-07-14 09:26:04 +02:00
Priyanka Seth
335dee2042 Fixes a bug when reading case.oubwin
Code does not crash anymore if number of k-points differ
    in case.oubwin and case.klist. Added a warning.
2015-07-07 15:26:04 +02:00
Manuel Zingl
60c6466ace Some changes wien2k_converter
convert_bands_input and convert_parproj_input can now be called
    without calling convert_dft_input directly before.
2015-07-07 15:08:53 +02:00
Priyanka Seth
b24a836372 [sumk] import itertools for product 2015-07-02 15:17:33 +02:00
pdelange
6eef3bd172 fixed analyze_block_structure in sumk
was buggy when the number of off-diagonal elements was larger than the number of orbitals
2015-06-26 18:59:39 +02:00
Priyanka Seth
86b1461c52 Moved U_matrix to TRIQS library 2015-06-17 18:19:30 +02:00
Manuel Zingl
8bfc950cb1 [transport] Replacing Im(G) by 1/(2i)*(G-G^dag) 2015-05-27 10:43:40 +02:00
Oleg.Peil
0aed9c681f Fixed a small mistake in the calculation of cell volume
There was an obious typo in the formula for cell volume

vol_c = a * b * c * numpy.sqrt(1 + 2 * c_al * c_be * c_ga - c_al ** 2 - c_be ** 2 - c_ga ** 2),

where instead of 'c_be ** 2' there was 'c_be * 82'.
2015-05-02 13:16:24 +02:00
Manuel Zingl
aef5072cad Fixes a little bug in wien2k_converter.py 2015-04-30 19:05:24 +02:00
Priyanka Seth
79b4b426a8 Modify HDFArchive calls to 'r' where possible to handle corrupt files 2015-04-27 13:12:28 +02:00
Priyanka Seth
8dc42b08ae [doc] New documentation
* restructuring
* added user reference
* started working on user guide
* added schematic to structure
2015-04-21 14:31:15 +02:00
Manuel Zingl
3d577c294e Fix for previous bugfix 2015-04-15 15:35:03 +02:00
Priyanka Seth
a2dae173cf Fixed bug in lattice gf that appeared when dc was not used 2015-04-15 09:48:31 +02:00
Priyanka Seth
87523ef231 Fixed bug in cal_density_correction 2015-04-14 18:19:59 +02:00
Manuel Zingl
b42a51fe17 Correcting another bug in dos_*_basis
om_mesh was wrongly determined to zero (due to integer division...)
if no Sigma was given.
2015-04-14 15:44:07 +02:00
Manuel Zingl
8d0bc912af Corrects bug in dos_wannier_basis 2015-04-14 14:45:32 +02:00
Priyanka Seth
74a19b72df Fixed bug in mesh construction of lattice GF. 2015-04-13 15:11:04 +02:00
Priyanka Seth
e387f3ed21 [tools] Parallelize k sum in spaghettis 2015-04-04 12:41:25 +02:00