LCPQ/dft_tools
3
0
Fork 0
mirror of https://github.com/triqs/dft_tools synced 2024-06-30 00:44:34 +02:00
Code Issues Releases Wiki Activity

Removed redundant index reassignments in 'c_plocar_io.c'

Browse Source
This commit is contained in:
Oleg E. Peil 2015-02-19 12:31:50 +01:00 committed by Michel Ferrero
parent 46474c0b3e
commit 36aadf6ff4
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
python/converters/vasp/c/plocar_io/c_plocar_io.c
View File

@ -245,34 +245,27 @@ int read_arrays(FILE* fh, t_params* p, PyArrayObject* py_plo, PyArrayObject* py_
{ {
double complex *plo; double complex *plo;
double *ferw; double *ferw;
npy_intp idx5[5], idx4[4]; npy_intp idx5[5];
int ion, ik, ib, is, ilm; int ilm;
int nlm; int nlm;
float rtmp; float rtmp;
float complex rbuf[50]; float complex rbuf[50];
double dtmp; double dtmp;
double complex dbuf[50]; double complex dbuf[50];
for(ion = 0; ion < p->nion; ion++) { idx5[4] = 0;
for(idx5[0] = 0; idx5[0] < p->nion; idx5[0]++) {
if(fread(&nlm, 4, 1, fh) < 1) goto error; if(fread(&nlm, 4, 1, fh) < 1) goto error;
// printf(" nlm = %d\n", nlm); // printf(" nlm = %d\n", nlm);
for(is = 0; is < p->ns; is++) for(idx5[1] = 0; idx5[1] < p->ns; idx5[1]++)
for(ik = 0; ik < p->nk; ik++) for(idx5[2] = 0; idx5[2] < p->nk; idx5[2]++)
for(ib = 0; ib < p->nb; ib++) { for(idx5[3] = 0; idx5[3] < p->nb; idx5[3]++) {
// Get the pointers to corresponding elements according to the new API // Get the pointers to corresponding elements according to the new API
idx5[0] = ion;
idx5[1] = is;
idx5[2] = ik;
idx5[3] = ib;
idx5[4] = 0;
plo = (double complex *)PyArray_GetPtr(py_plo, idx5); plo = (double complex *)PyArray_GetPtr(py_plo, idx5);
idx4[0] = ion; // Here, only the first 4 elements of idx5 are used
idx4[1] = is; ferw = (double *)PyArray_GetPtr(py_ferw, idx5);
idx4[2] = ik;
idx4[3] = ib;
ferw = (double *)PyArray_GetPtr(py_ferw, idx4);
if(p->isdouble) { if(p->isdouble) {
if(fread(&dtmp, sizeof(double), 1, fh) < 1) goto error; if(fread(&dtmp, sizeof(double), 1, fh) < 1) goto error;