Commit 9994de1e authored by Daniel Wortmann's avatar Daniel Wortmann

Merge branch 'develop' of iffgit.fz-juelich.de:fleur/fleur into develop

parents 89dbf8ee 93d7abd2
......@@ -215,12 +215,7 @@
CALL initParallelProcesses(atoms,vacuum,input,stars,sliceplot,banddos,&
DIMENSION,cell,sym,xcpot,noco,oneD,hybrid,&
kpts,enpara,sphhar,mpi,obsolete)
<<<<<<< HEAD
#ifndef CPP_OLDINTEL
! CALL mpi_dist_forcetheorem(mpi,forcetheo)
#endif
=======
>>>>>>> 41c649b8ff2ed52b52299ae6ee4f36cd3fe18d93
#endif
ELSE ! else branch of "IF (input%l_inpXML) THEN"
......@@ -529,6 +524,7 @@
CALL add_usage_data("PlaneWaves",DIMENSION%nvd)
CALL add_usage_data("LOs",atoms%nlotot)
CALL add_usage_data("Iterations",input%itmax)
CALL add_usage_data("nkpt", kpts%nkpt)
CALL results%init(dimension,input,atoms,kpts,noco)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment