Merge lp:~albertog/siesta/4.1-scf-first into lp:~nickpapior/siesta/4.1-scf-first

[Alberto Garcia]

I have written a longer explanation in the manual. In particular, I explicitly mention that atomically filled DMs will be mixed by default, something that might be important in some cases.

Besides, this case highlights a contradiction: atomically filled DMs are not idempotent, and yet we happily mix them.

In fact, I believe that the idempotency issue is a red herring. Our DM is a decimated version of the true DM: we only keep those elements for which S (actually H) is not zero. This is fine to compute the charge density, and even to compute things like Tr(H*DM) and similar constructs. But since our DM is not the true DM, it is not idempotent. Moreover, even if DM_1 and DM_2 are idempotent, their mixing will not be. The really important thing is that the *output* DM is the one to be used to compute things like the kinetic energy, and the *input* DM is only an intermediate tool to compute the Hamiltonian.

I have avoided to open the can of worms of the heuristics when mixing the Hamiltonian. I believe that we should soon offer the possibility of reading H from file.

[Alberto Garcia (albertog)]

I forgot to mention that I have removed the mention to idempotency in the warning given to the user when the "force" flag is enabled and the sparsity has changed. This matches my view on the reduced importance of the idempotency issue.

[Nick Papior (nickpapior)]

I think you made a branch of 4.1 (after 4.1-wfs merge), merged in 4.1-scf-first made changes and then committed. :(
I.e. it is difficult to merge in 4.1-scf-first since there are many unrelated changes.

Do you mind me updating 4.1-scf-first branch with what I think you changed in r1093?

[Nick Papior (nickpapior)]

PS. I think your changes looks extremely appropriate and well thought! Thanks!

[Nick Papior (nickpapior)]

Could you check r1086 on lp:~nickpapior/siesta/4.1-scf-first to see if all is good?

[Alberto Garcia (albertog)]

Yes, that is correct!

----- El 19 de Ago de 2019, a las 10:19, Nick Rubner Papior <email address hidden> escribió:

| Could you check r1086 on lp:~nickpapior/siesta/4.1-scf-first to see if all is
| good?
| --
| https://code.launchpad.net/~albertog/siesta/4.1-scf-first/+merge/371434
| You are the owner of lp:~albertog/siesta/4.1-scf-first.

=== modified file 'Docs/Contributors.txt'
--- Docs/Contributors.txt	2018-10-22 14:12:27 +0000
+++ Docs/Contributors.txt	2019-08-18 23:02:58 +0000
@@ -60,6 +60,7 @@
 Magnus Paulsson
 Oscar Paz
 Andrei Postnikov
+Roberto Robles
 Tristana Sondon
 Andrew Walker
 Andrew Walkingshaw
 
=== modified file 'Docs/siesta.tex'
--- Docs/siesta.tex	2019-08-16 10:13:21 +0000
+++ Docs/siesta.tex	2019-08-18 23:02:58 +0000
@@ -277,6 +277,7 @@
 Magnus Paulsson,
 Oscar Paz,
 Andrei Postnikov,
+Roberto Robles,
 Tristana Sondon,
 Andrew Walker,
 Andrew Walkingshaw,
@@ -4103,23 +4104,41 @@
   \fdfindex*{DM.MixSCF1}[|see SCF.Mix.First]
   \fdfdepend{SCF.Mix!First.Force}%
 
-  Whether the first SCF should be mixed or it uses the output as input
-  in the next SCF step. It is generally advised to set this to true,
-  at least when restarting calculations.
-
-  The general logic of mixing on the first method is determined by the
-  read matrices. If the sparsity pattern has changed between the read
-  matrix and the current matrix \siesta\ will default to \emph{not}
-  mix in the first step, regardless of this flag. To ensure mixing is
-  done in the first step \fdf{SCF.Mix!First.Force} should be set to
-  \fdftrue.
+  This flag is used to decide whether mixing (of the DM or H) should
+  be done in the first SCF step. If mixing is not performed the output
+  DM or H generated in the first SCF step is used as input in the next
+  SCF step. When mixing the DM, this ``reset'' has the effect of
+  avoiding potentially undesirable memory effects: for example, a DM
+  read from file which corresponds to a different structure might not
+  satisfy the correct symmetry, and mixing will not fix it. On the
+  other hand, when reusing a DM for a restart of an interrupted
+  calculation, a full reset might not be advised.
+
+  The value of this flag is one of the ingredients used by \siesta\ to
+  decide what to do. If \fdftrue (the default), mixing will be
+  performed in all cases, except when a DM has been read from file and
+  the sparsity pattern of the DM on file is different from the current
+  one.  To ensure that a first-step mixing is done even in this case,
+  \fdf{SCF.Mix!First.Force} should be set to \fdftrue.
+
+  If the flag is \fdffalse, no mixing in the first step will be
+  performed, except if overridden by \fdf{SCF.Mix!First.Force}.
   
+  Note that the default value for this flag has changed from the old
+  (pre-version 4) setting in \siesta\. The new setting is most
+  appropriate for the case of restarting calculations. On the other
+  hand, it means that mixing in the first scf step will also be
+  performed for the standard case in which the initial DM is built as
+  a (diagonal) superposition of atomic orbital occupation values. In
+  some cases (e.g. spin-orbit calculations) better results might be
+  obtained by avoiding this mixing.
+
 \end{fdflogicalT}
 
 \begin{fdflogicalF}{SCF.Mix!First.Force}
 
-  Force the mixing of the first step, regardless of what \siesta\ may
-  heuristically decide.
+  Force the mixing (of DM or H) in the first SCF step, regardless of
+  what \siesta\ may heuristically decide.
 
   This overrules \fdf{SCF.Mix!First}.
   
@@ -10915,6 +10934,12 @@
   in a \tbtrans\ calculation to achieve a converged transmission
   function.
 
+  \item%
+  Energies from \tsiesta\ are \emph{not} to be trusted since the open
+  boundaries complicates the energy calculation. Therefore you cannot
+  compare energies between different calculations and/or different
+  bias'.
+
 \end{itemize}
 
 \subsection{Electrodes}
@@ -12137,12 +12162,18 @@
   
 \end{fdfentry}
 
-\begin{fdfentry}{TS!Elecs!DM.Init}[string]<diagon|bulk>
+\begin{fdfentry}{TS!Elecs!DM.Init}[string]<bulk|diagon>
 
   The density matrix elements in the electrodes may be forcefully set
   to the bulk values by reading in the DM of the corresponding
-  electrode. This may be set to \fdf*{bulk} to forcefully set the bulk
-  values.
+  electrode. This is by default \fdf*{bulk} for non-bias calculation,
+  and otherwise defaults to \fdf*{diagon}.
+
+  This step is only required once since the DM will be constant in the
+  electrode regions and thus it will be propagated through the
+  \sysfile{TSDE} files without having to re-do this step.
+  If this is done (by default) in the 0 bias calculation it will also
+  be effective in the bias calculation.
 
   \note this will automatically be set to \fdf*{diagon} for
   non-equilibrium calculations. If bulk density matrix elements are
 
=== modified file 'Src/Makefile'
--- Src/Makefile	2019-05-21 09:18:42 +0000
+++ Src/Makefile	2019-08-18 23:02:58 +0000
@@ -434,7 +434,8 @@
 	 m_ts_cctype.o ts_init.o ts_show_regions.o m_ts_electype.o \
 	 m_ts_method.o m_ts_elec_se.o \
 	 m_ts_debug.o m_ts_tdir.o \
-	 m_ts_chem_pot.o m_transiesta.o m_ts_hartree.o m_ts_voltage.o
+	 m_ts_chem_pot.o m_transiesta.o m_ts_hartree.o m_ts_voltage.o \
+         ts_energies.o
 
 # contour objects
 TS_OBJS += m_ts_contour_eq.o m_ts_contour_neq.o m_ts_io_ctype.o \
@@ -647,8 +648,9 @@
 compute_ebs_shift.o: m_mpi_utils.o parallel.o precision.o
 compute_energies.o: atomlist.o class_SpData1D.o class_SpData2D.o dhscf.o
 compute_energies.o: files.o m_dipol.o m_energies.o m_mpi_utils.o m_ntm.o
-compute_energies.o: m_rhog.o m_spin.o precision.o siesta_geom.o
-compute_energies.o: siesta_options.o sparse_matrices.o
+compute_energies.o: m_rhog.o m_spin.o m_ts_global_vars.o precision.o
+compute_energies.o: siesta_geom.o siesta_options.o sparse_matrices.o
+compute_energies.o: ts_energies.o
 compute_max_diff.o: m_mpi_utils.o precision.o
 compute_norm.o: m_mpi_utils.o m_spin.o precision.o sparse_matrices.o
 compute_pw_matrix.o: alloc.o m_planewavematrix.o m_planewavematrixvar.o
@@ -683,11 +685,11 @@
 dhscf.o: vmat.o
 diag.o: alloc.o diag_option.o parallel.o precision.o sys.o
 diag2g.o: fermid.o intrinsic_missing.o parallel.o parallelsubs.o precision.o
-diag2g.o: sys.o
-diag2k.o: fermid.o parallel.o parallelsubs.o precision.o sys.o
+diag2g.o: sys.o writewave.o
+diag2k.o: fermid.o parallel.o parallelsubs.o precision.o sys.o writewave.o
 diag3g.o: fermid.o intrinsic_missing.o parallel.o parallelsubs.o precision.o
-diag3g.o: sys.o
-diag3k.o: fermid.o parallel.o parallelsubs.o precision.o sys.o
+diag3g.o: sys.o writewave.o
+diag3k.o: fermid.o parallel.o parallelsubs.o precision.o sys.o writewave.o
 diag_option.o: parallel.o precision.o
 diagg.o: alloc.o fermid.o intrinsic_missing.o m_spin.o parallel.o
 diagg.o: parallelsubs.o precision.o sys.o writewave.o
@@ -822,7 +824,7 @@
 m_dscfcomm.o: alloc.o parallel.o parallelsubs.o precision.o schecomm.o
 m_efield.o: atmfuncs.o m_cite.o m_ts_global_vars.o mesh.o parallel.o
 m_efield.o: precision.o siesta_cml.o siesta_geom.o sys.o units.o
-m_energies.o: precision.o
+m_energies.o: m_ts_global_vars.o precision.o
 m_eo.o: precision.o
 m_exp_coord.o: files.o m_os.o parallel.o precision.o units.o
 m_filter.o: bessph.o precision.o radfft.o sys.o
@@ -935,12 +937,13 @@
 m_test_io.o: precision.o
 m_timer.o: m_io.o m_walltime.o moreParallelSubs.o parallel.o precision.o sys.o
 m_transiesta.o: alloc.o class_OrbitalDistribution.o class_SpData1D.o
-m_transiesta.o: class_SpData2D.o class_Sparsity.o files.o m_interpolate.o
-m_transiesta.o: m_ts_charge.o m_ts_contour_eq.o m_ts_contour_neq.o
-m_transiesta.o: m_ts_electype.o m_ts_fullg.o m_ts_fullk.o m_ts_gf.o
-m_transiesta.o: m_ts_kpoints.o m_ts_method.o m_ts_mumpsg.o m_ts_mumpsk.o
-m_transiesta.o: m_ts_options.o m_ts_sparse.o m_ts_tri_common.o m_ts_tri_init.o
-m_transiesta.o: m_ts_trig.o m_ts_trik.o parallel.o precision.o units.o
+m_transiesta.o: class_SpData2D.o class_Sparsity.o files.o m_energies.o
+m_transiesta.o: m_interpolate.o m_ts_charge.o m_ts_contour_eq.o
+m_transiesta.o: m_ts_contour_neq.o m_ts_electype.o m_ts_fullg.o m_ts_fullk.o
+m_transiesta.o: m_ts_gf.o m_ts_kpoints.o m_ts_method.o m_ts_mumpsg.o
+m_transiesta.o: m_ts_mumpsk.o m_ts_options.o m_ts_sparse.o m_ts_tri_common.o
+m_transiesta.o: m_ts_tri_init.o m_ts_trig.o m_ts_trik.o parallel.o precision.o
+m_transiesta.o: units.o
 m_trialorbitalclass.o: precision.o units.o
 m_trimat_invert.o: class_TriMat.o intrinsic_missing.o m_pivot_array.o
 m_trimat_invert.o: precision.o
@@ -1321,6 +1324,10 @@
 timer.o: timer_tree.o
 timer_tree.o: m_walltime.o
 transition_rate.o: alloc.o fermid.o parallel.o parallelsubs.o precision.o sys.o
+ts_energies.o: class_OrbitalDistribution.o class_SpData1D.o class_SpData2D.o
+ts_energies.o: class_Sparsity.o geom_helper.o m_energies.o m_spin.o
+ts_energies.o: m_ts_electype.o m_ts_method.o m_ts_options.o parallel.o
+ts_energies.o: precision.o sparse_matrices.o
 ts_init.o: m_fixed.o m_os.o m_ts_cctype.o m_ts_charge.o m_ts_electrode.o
 ts_init.o: m_ts_electype.o m_ts_gf.o m_ts_global_vars.o m_ts_kpoints.o
 ts_init.o: m_ts_method.o m_ts_options.o parallel.o siesta_options.o
@@ -1346,7 +1353,7 @@
 write_subs.o: m_steps.o m_stress.o m_ts_global_vars.o parallel.o precision.o
 write_subs.o: siesta_cml.o siesta_geom.o siesta_options.o units.o zmatrix.o
 writewave.o: alloc.o atmfuncs.o atomlist.o densematrix.o diag.o diag_option.o
-writewave.o: get_kpoints_scale.o kpoint_grid.o m_spin.o parallel.o
+writewave.o: get_kpoints_scale.o kpoint_grid.o m_spin.o m_spin.o parallel.o
 writewave.o: parallelsubs.o precision.o siesta_geom.o sys.o units.o
 xml.o: precision.o
 zm_broyden_optim.o: m_broyddj_nocomm.o parallel.o precision.o sys.o units.o
@@ -1506,6 +1513,7 @@
 t_spin.o: m_spin.o
 timer_options.o: timer.o
 trialorbitalclass.o: m_trialorbitalclass.o
+ts_energies_m.o: ts_energies.o
 version_info.o: version.o
 write_subs_energies.o: write_subs.o
 write_subs_positions.o: write_subs.o
 
=== modified file 'Src/alloc.F90'
--- Src/alloc.F90	2017-10-10 19:27:53 +0000
+++ Src/alloc.F90	2019-08-18 23:02:58 +0000
@@ -45,7 +45,7 @@
 ! Notice that, if the restore call is skipped, the new defaults will
 ! stay in effect until a new call to alloc_dafault is made.
 ! ==================================================================
-! SUBROUTINE alloc_report( level, unit, file, printNow, threshold )
+! SUBROUTINE alloc_report( level, unit, file, printNow, threshold, shutdown )
 !   Sets the output file for the allocation report
 ! INPUT (optional):
 !   integer      :: level     : Level (detail) of report
@@ -53,7 +53,8 @@
 !   character*(*):: file      : Output file name
 !   logical      :: printNow  : If present & true => print report now
 !   real(dp)     :: threshold : Memory threshold (in bytes) to print
-!                               the memory use of any given array 
+!                               the memory use of any given array
+!   logical      :: shutdown  : If present & true then close output unit.
 ! BEHAVIOR:
 !   The detail/extent of the report increses with the value of level:
 ! level=0 : no report at all (the default)
@@ -73,6 +74,13 @@
 ! reports are written consecutively in the same file, each with a 
 ! time stamp header.
 !   If threshold is not present, threshold=0 is assumed.
+!   When performing library invocations of this module in say
+! external methods it is vital to close units before exiting the
+! library to ensure that no dangling files are kept open.
+! To ensure the file is closed before return one can use
+! the shutdown=.true. argument to forcefully close (and free)
+! the unit used to report. If not present or .false. the unit
+! will be kept open.
 !   In parallel execution, the report sections that involve every
 ! reallocation (levels 1, 3, and 4) are written only by node 0.
 ! The section that is written upon request (level 2) is written
 
=== modified file 'Src/atmfuncs.f'
--- Src/atmfuncs.f	2016-04-29 07:31:13 +0000
+++ Src/atmfuncs.f	2019-08-18 23:02:58 +0000
@@ -23,11 +23,6 @@
 
       implicit none 
 !
-      type(species_info), pointer        :: spp
-      type(rad_func), pointer            :: op
-      type(rad_func), pointer            :: pp
-      type(rad_func), pointer            :: func   
-!
       character(len=79) message
       integer, parameter               :: max_l = 5
       integer, parameter               :: max_ilm = (max_l+1)*(max_l+1)
@@ -47,10 +42,8 @@
 
       public  :: orb_gindex, kbproj_gindex, vna_gindex, ldau_gindex
       private
-                          !
+      
       contains
-!
-!
 
       subroutine chk(name,is)
       character(len=*), intent(in) :: name
@@ -290,9 +283,10 @@
 C                    IO = 0 => Local pseudopotential
 C************************OUTPUT*****************************************
 C   INTEGER LOFIO  : Quantum number L of orbital or KB projector
+      type(species_info), pointer :: spp
 
       call chk('lofio',is)
-      
+
       spp => species(is)
       if (io.gt.0) then
          if (io.gt.spp%norbs)  call die("lofio: No such orbital")
@@ -320,6 +314,7 @@
 C                    IO = 0 => Local pseudopotential
 C************************OUTPUT*****************************************
 C   INTEGER MOFIO  : Quantum number m of orbital or KB projector
+      type(species_info), pointer :: spp
 
       call chk('mofio',is)
       
@@ -348,6 +343,7 @@
 C                    IO > 0 => Basis orbitals
 C************************OUTPUT*****************************************
 C   INTEGER ZETAFIO  : Zeta number of orbital
+      type(species_info), pointer :: spp
 
       call chk('mofio',is)
 
@@ -372,6 +368,7 @@
 C  Returns cutoff radius of Kleynman-Bylander projectors and
 C  atomic basis orbitals.
 C  Distances in Bohr
+      type(species_info), pointer :: spp
 
       call chk('rcut',is)
       
@@ -379,12 +376,10 @@
       if (io.gt.0) then
          if (io.gt.spp%norbs)  call die("rcut: No such orbital")
 
-         op => spp%orbnl(spp%orb_index(io))
-         rcut = op%cutoff
+         rcut = spp%orbnl(spp%orb_index(io))%cutoff
       else if (io.lt.0) then
          if (-io.gt.spp%nprojs)  call die("rcut: No such projector")
-         pp => spp%pjnl(spp%pj_index(-io))
-         rcut = pp%cutoff
+         rcut = spp%pjnl(spp%pj_index(-io))%cutoff
       else
          rcut = spp%vna%cutoff
       endif
@@ -424,6 +419,7 @@
       data (sym_label(i),i=17,25)
      .  / 'gxy(x2-y2)', 'gzy(3x2-y2)', 'gz2xy', 'gz3y', 'gz4',
      .    'gz3x', 'gz2(x2-y2)', 'gzx(x2-3y2)', 'gx4+y4' /
+      type(species_info), pointer :: spp
 
       call chk('rcut',is)
       
@@ -461,12 +457,12 @@
                                    ! io>0 => basis orbitals
 
 C If true, the orbital IO is a perturbative polarization orbital
+      type(species_info), pointer :: spp
 
       spp => species(is)
       if ( (io .gt. species(is)%norbs) .or.
      $     (io .le. 0))   call die("pol: Wrong io")
 
-      spp => species(is)
       pol = spp%orbnl_ispol(spp%orb_index(io))
       
       end function pol
@@ -483,6 +479,7 @@
 C                 Sum_lm( epsKB_l * <Psi|Phi_lm> * <Phi_lm|Psi'> )
 C  where Phi_lm is returned by subroutine PHIATM.
 C  Energy in Rydbergs.
+      type(species_info), pointer :: spp
 
       integer ik
 
@@ -504,13 +501,14 @@
 C Returns local part of neutral-atom Kleynman-Bylander pseudopotential.
 C Distances in Bohr,  Energies in Rydbergs
 C  2) Returns exactly zero when |R| > RCUT(IS,0)
+      type(rad_func), pointer :: func
 
       real(dp) rmod, dvdr
 
       call chk('vna_sub',is)
 
-      v=0.0_dp
-      grv(1:3)=0.0_dp
+      v = 0.0_dp
+      grv(1:3) = 0.0_dp
 
       if (floating(is)) return
 
@@ -520,7 +518,7 @@
       if (rmod .gt. func%cutoff) return
 
       call rad_get(func,rmod,v,dvdr)
-      rmod=rmod+tiny20
+      rmod = rmod + tiny20
       grv(1:3) = dvdr * r(1:3)/rmod
  
       end subroutine vna_sub
@@ -535,13 +533,14 @@
 C Distances in Bohr, Energies in Rydbergs
 C Density in electrons/Bohr**3
 C  2) Returns exactly zero when |R| > Rchloc
+      type(rad_func), pointer :: func
 
       real(dp) :: rmod, dchdr
 
       call chk('psch',is)
 
-      ch=0.0_dp 
-      grch(1:3)=0.0_dp 
+      ch = 0.0_dp 
+      grch(1:3) = 0.0_dp 
 
       if (floating(is)) return
 
@@ -550,7 +549,7 @@
       if (rmod .gt. func%cutoff) return
 
       call rad_get(func,rmod,ch,dchdr)
-      rmod=rmod+tiny20
+      rmod = rmod + tiny20
       grch(1:3) = dchdr * r(1:3)/rmod
 
       end subroutine psch
@@ -565,19 +564,20 @@
 C in the xc potential.
 C Distances in Bohr, Energies in Rydbergs, Density in electrons/Bohr**3
 C  2) Returns exactly zero when |R| > Rcore
+      type(rad_func), pointer :: func
 
       real(dp) rmod, dchdr
 
       call chk('chcore_sub',is)
 
-      ch=0.0_dp
-      grch(1:3)=0.0_dp
+      ch = 0.0_dp
+      grch(1:3) = 0.0_dp
 
       if (floating(is)) return
 
       func => species(is)%core
       rmod = sqrt(sum(r*r))
-      rmod=rmod+tiny20                   ! Moved here. JMS, Dec.2012
+      rmod = rmod + tiny20                   ! Moved here. JMS, Dec.2012
       if (rmod .gt. func%cutoff) return
 
       call rad_get(func,rmod,ch,dchdr)
@@ -611,6 +611,8 @@
 C 5) Prints a message and stops when no data exits for IS and/or IO
 C 6) Returns exactly zero when |R| > RCUT(IS,IO)
 C 7) PHIATM with IO = 0 is strictly equivalent to VNA_SUB
+      type(species_info), pointer :: spp
+      type(rad_func), pointer :: func
 
       real(dp) rmod, phir, dphidr
       real(dp) rly(max_ilm), grly(3,max_ilm)
@@ -652,6 +654,7 @@
          ilm = l*l + l + m + 1
          call rlylm( l, r, rly, grly )
          phi = phir * rly(ilm)
+!GCC$ unroll 3
          do i = 1,3
             grphi(i)=dphidr*rly(ilm)*r(i)/rmod+phir*grly(i,ilm)
          enddo
@@ -687,6 +690,8 @@
 C    where epsKB_l is returned by function EPSKB
 C 6) Returns exactly zero when |R| > RCUT(IS,IO)
 C 7) RPHIATM with ITYPE = 0 is strictly equivalent to VNA_SUB
+      type(species_info), pointer :: spp
+      type(rad_func), pointer :: func
 
       real(dp) rmod, phir
       integer l, m, ik
@@ -734,16 +739,17 @@
       end subroutine rphiatm
 
 
-      subroutine all_phi( is, it, r, nphi, phi, grphi )
+      subroutine all_phi( is, it, r, maxnphi, nphi, phi, grphi )
       integer,   intent(in) :: is     ! Species index
       integer,   intent(in) :: it     ! Orbital-type switch:
                                       ! IT > 0 => Basis orbitals
                                       ! IT < 0 => KB projectors
       real(dp),  intent(in) :: r(3)   ! Point vector, relative to atom
+      integer,  intent(in) :: maxnphi ! Maximum number of phi's
       integer,  intent(out) :: nphi   ! Number of phi's
-      real(dp), intent(out) :: phi(:) ! Basis orbital, KB projector, or
+      real(dp), intent(out) :: phi(maxnphi) ! Basis orbital, KB projector, or
                                       !  local pseudopotential
-      real(dp), optional, intent(out) :: grphi(:,:) ! Gradient of phi
+      real(dp), optional, intent(out) :: grphi(3,maxnphi) ! Gradient of phi
 
 C  Returns Kleynman-Bylander local pseudopotential, nonlocal projectors,
 C  and atomic basis orbitals (and their gradients).
@@ -763,16 +769,15 @@
 C 6) Returns exactly zero when |R| > RCUT(IS,IO)
 C 8) If arrays phi or grphi are too small, returns with the required
 C    value of nphi
+      type(species_info), pointer :: spp
 
-      integer i, jlm, l, lmax, m, maxlm, n
+      integer i, jlm, l, lmax, m, maxlm
       double precision  rmod, phir, dphidr
       real(dp) rly(max_ilm), grly(3,max_ilm)
 
-      integer, parameter :: maxphi=100
-
-      integer :: ilm(maxphi)
-      double precision :: rmax(maxphi)
-      logical :: within(maxphi)
+      integer :: ilm(maxnphi)
+      double precision :: rmax(maxnphi)
+      logical :: within(maxnphi)
 
       call chk('all_phi',is)
       spp => species(is)
@@ -786,37 +791,24 @@
          call die("all_phi: Please use phiatm to get Vna...")
       endif
       
-      if (nphi.gt.maxphi) call die('all_phi: maxphi too small')
+      if (nphi.gt.maxnphi) call die('all_phi: maxphi too small')
 
       if (it.gt.0) then
          do i = 1, nphi
             l = spp%orb_l(i)
             m = spp%orb_m(i)
             ilm(i) = l*(l+1)+m+1
-            op => spp%orbnl(spp%orb_index(i))
-            rmax(i) = op%cutoff
+            rmax(i) = spp%orbnl(spp%orb_index(i))%cutoff
          enddo
       else
          do i = 1, nphi
-            pp => spp%pjnl(spp%pj_index(i))
-            rmax(i) = pp%cutoff
+            rmax(i) = spp%pjnl(spp%pj_index(i))%cutoff
             l = spp%pj_l(i)
             m = spp%pj_m(i)
             ilm(i) = l*(l+1)+m+1
          enddo
       endif
 
-!     Check size of output arrays
-      if (present(grphi)) then
-        if (size(grphi,1).ne.3)
-     .    call die('all_phi: incorrect first dimension of grphi')
-        n = min( size(phi), size(grphi,2) )
-      else
-        n = size(phi)
-      endif
-!     Return if the caller did not provide arrays large enough...
-      if (n.lt.nphi) return
-
 !     Initialize orbital values
       phi(1:nphi) = 0._dp
       if (present(grphi)) grphi(:,1:nphi) = 0._dp
@@ -841,14 +833,11 @@
         if (.not.within(i)) cycle i_loop
           
 !       Find radial part
-
         if (it.gt.0) then
-           func => spp%orbnl(spp%orb_index(i))
-        else 
-           func => spp%pjnl(spp%pj_index(i))
-        endif
-
-        call rad_get(func,rmod,phir,dphidr)
+          call rad_get(spp%orbnl(spp%orb_index(i)),rmod,phir,dphidr)
+        else
+          call rad_get(spp%pjnl(spp%pj_index(i)),rmod,phir,dphidr)
+        end if
 
 !       Multiply radial and angular parts
         jlm = ilm(i)
@@ -875,6 +864,7 @@
 C due to the overlap of the two 'local pseudopotential charge densities'
 C Distances in Bohr, Energies in Rydbergs
 C  2) Returns exactly zero when |R| > Rchloc
+      type(rad_func), pointer :: func
 
       integer ismx, ismn, indx
       real(dp) r_local
@@ -910,6 +900,7 @@
       integer, intent(in)  :: l    ! Angular momentum of the basis funcs
 C Returns the number of different basis functions
 C with the same angular momentum and for a given species
+      type(species_info), pointer :: spp
 
       integer i
 
@@ -930,7 +921,8 @@
 
 C Returns the number of different KB projectors
 C with the same angular momentum and for a given species
-      
+      type(species_info), pointer :: spp
+
       integer i
 
       call chk('nkbl_func',is)
 
=== modified file 'Src/bands.F'
--- Src/bands.F	2018-10-17 13:04:40 +0000
+++ Src/bands.F	2019-08-18 23:02:58 +0000
@@ -296,7 +296,8 @@
       end subroutine initbands
 
 
-      subroutine bands( no_s, nspin, maxspn, no_u, no_l, maxnh, maxk,
+      subroutine bands( no_s, spin,
+     .                  no_u, no_l,maxnh, maxk,
      .                  numh, listhptr, listh, H, S, ef, xij, indxuo,
      .                  writeb, nk, kpoint, ek, occtol, getPSI )
 
@@ -305,40 +306,39 @@
 C Written by J.Soler, August 1997 and August 1998.
 C Initialisation moved into a separate routine, JDG Jan 2000.
 C WFS options by A. Garcia, April 2012
+C Cleaned for tSpin by N. Papior, August 2019
 
 C **************************** INPUT **********************************
 C integer no_s                : Number of basis orbitals in supercell
-C integer nspin               : Number of spin components
-C integer maxspn              : Maximum number of spin components
-C                               nspin /= maxspn for spin-orbit
+C type(tSpin) spin            : Containing all spin-information
 C integer maxnh               : Maximum number of orbitals interacting
 C                               with any orbital
 C integer maxk                : Last dimension of kpoint and ek
-C integer numh(no_l)           : Number of nonzero elements of each row
+C integer numh(no_l)          : Number of nonzero elements of each row
 C                               of hamiltonian matrix
-C integer listhptr(no_l)       : Pointer to start of each row of the
+C integer listhptr(no_l)      : Pointer to start of each row of the
 C                               hamiltonian matrix
 C integer listh(maxlh)        : Nonzero hamiltonian-matrix element
 C                               column indexes for each matrix row
-C real*8  H(maxnh,nspin)      : Hamiltonian in sparse form
+C real*8  H(maxnh,spin%H)     : Hamiltonian in sparse form
 C real*8  S(maxnh)            : Overlap in sparse form
 C real*8  ef                  : Fermi energy
 C real*8  xij(3,maxnh)        : Vectors between orbital centers (sparse)
 C                               (not used if only gamma point)
 C integer no_u                : First dimension of ek
-C integer no_l               : Second dimension of H and S
-C integer indxuo(no_s)          : Index of equivalent orbital in unit cell
+C integer no_l                : Second dimension of H and S
+C integer indxuo(no_s)        : Index of equivalent orbital in unit cell
 C                               Unit cell orbitals must be the first in
 C                               orbital lists, i.e. indxuo.le.no_l, with
 C                               no_l the number of orbitals in unit cell
 C real*8  ef                  : Fermi energy
 C logical writeb              : This routine must write bands?
-C integer no_u              : Total number of orbitals in unit cell
+C integer no_u                : Total number of orbitals in unit cell
 C integer nk                  : Number of band k points
 C real*8  kpoint(3,maxk)      : k point vectors
 C real*8  occtol              : Occupancy threshold for DM build
 C *************************** OUTPUT **********************************
-C real*8  ek(no_u,maxspn,maxk) : Eigenvalues
+C real*8  ek(no_u,spin%spinor,maxk) : Eigenvalues
 C *************************** UNITS ***********************************
 C Lengths in atomic units (Bohr).
 C k vectors in reciprocal atomic units.
@@ -366,7 +366,7 @@
       use atmfuncs,     only : symfio, cnfigfio, labelfis, nofis
       use writewave,    only : wfs_filename
 
-      use m_spin,       only: NoMagn, SPpol, NonCol, SpOrb
+      use t_spin, only: tSpin
 
       use m_diag_option, only: ParallelOverK, Serial
       use m_diag, only: diag_init
@@ -374,13 +374,13 @@
 
       implicit          none
 
-      integer  ::   nspin
-      integer  ::   maxk, maxnh, maxspn, no_u, no_l, nk, no_s,
+      type(tSpin), intent(in) :: spin
+      integer  ::   maxk, maxnh, no_u, no_l, nk, no_s,
      .              indxuo(no_s), listh(maxnh), numh(no_l),
-     .              listhptr(*), nuo
+     .              listhptr(*)
       logical  ::   writeb
-      real(dp) ::   ef, ek(no_u,maxspn,maxk),
-     .              H(maxnh,nspin), kpoint(3,maxk),
+      real(dp) ::   ef, ek(no_u,spin%spinor,maxk),
+     .              H(maxnh,spin%H), kpoint(3,maxk),
      .              S(maxnh), xij(3,maxnh), occtol
       logical, intent(in) :: getPSI
 
@@ -394,7 +394,6 @@
       logical, parameter :: fixspin = .false.
 
       integer :: ik, il, io, ispin, iu, iu_wfs, iuo, naux, nhs, j
-
       logical :: SaveParallelOverK
       
       real(dp)
@@ -405,17 +404,10 @@
       real(dp), dimension(:), pointer :: aux => null()
 
       parameter ( eV = 1.d0 / 13.60580d0 )
+
       save Dnew, Enew, e1, e2, qk, qtot, temp, wk
-
       data Dnew, Enew, e1, e2, qk, qtot, temp, wk /8*0.d0/
 
-C Get number of local orbitals
-#ifdef MPI
-      call GetNodeOrbs(no_u,Node,Nodes,nuo)
-#else
-      nuo = no_u
-#endif
-
 C Start time counter
       call timer( 'bands', 1 )
 
@@ -430,12 +422,13 @@
       endif
 
 C     Allocate local arrays - only aux is relevant here
-      if ( nspin >=4 ) then
-         nhs  = 2 * (2*no_u) * (2*no_l)
+
+      if ( spin%Grid == 4 ) then
+         nhs = 2 * (2*no_u) * (2*no_l)
       else
          nhs = 2 * no_u*no_l
       endif
-      naux  = 2*no_u*5
+      naux = 2*no_u*5
       call allocDenseMatrix(nhs, nhs, nhs)
       call re_alloc( aux, 1, naux, 'aux', 'bands' )
 
@@ -448,7 +441,7 @@
         rewind (iu_wfs)
 
         write(iu_wfs) nk, .false. ! nk, Gamma, same file-format in WFS as for Gamma-point
-        write(iu_wfs) nspin
+        write(iu_wfs) spin%Grid
         write(iu_wfs) no_u
         write(iu_wfs) (iaorb(j),labelfis(isa(iaorb(j))),
      .            iphorb(j), cnfigfio(isa(iaorb(j)),iphorb(j)),
@@ -458,7 +451,7 @@
       endif
 
 C Find the band energies
-      if (NoMagn .or. SPpol) then
+      if ( spin%Grid < 4 ) then
 C fixspin and qs are not used in diagk, since getD=.false. ...
         qs(1) = 0.0_dp
         qs(2) = 0.0_dp
@@ -475,7 +468,7 @@
            call diag_init()
         end if
 
-        call diagk( nspin, no_l, no_s, maxspn, 
+        call diagk( spin%H, no_l, no_s, spin%spinor, 
      .              maxnh, maxnh, 
      .              no_u, numh, listhptr, listh, numh, listhptr,
      .              listh, H, S, getD, getPSI, fixspin, qtot, qs, temp,
@@ -487,29 +480,17 @@
         ParallelOverK = SaveParallelOverK
         if ( ParallelOverK ) Serial = .true.
 
-      elseif ( NonCol ) then
-         if (getPSI) then
-            if (node==0) then
-               write(6,*) "No WFS for non-colinear spin, yet..."
-            endif
-            RETURN
-         endif
+      elseif ( spin%NCol ) then
         call diag2k(no_l, no_s, maxnh, maxnh, no_u,
      .              numh, listhptr, listh, numh, listhptr,
-     .              listh, H, S, getD, qtot, temp, e1, e2,
+     .              listh, H, S, getD, getPSI, qtot, temp, e1, e2,
      .              xij, indxuo, nk, kpoint, wk,
      .              ek, qk, Dnew, Enew, ef, Entropy,
      .              Haux, Saux, psi, Haux, Saux, aux,
      .              no_u, occtol, 1, no_u )
 
-      elseif ( SpOrb ) then
-        if (getPSI) then
-           if (node==0) then
-              write(6,*) "No WFS for spin-orbit, yet..."
-           endif
-           return
-        end if
-        call diag3k(nuo, no_s, maxnh, maxnh, no_u, numh,
+      elseif ( spin%SO ) then
+        call diag3k(no_l, no_s, maxnh, maxnh, no_u, numh,
      .              listhptr, listh, numh, listhptr, listh,
      .              H, S, getD, getPSI, qtot, temp, e1, e2, xij,
      .              indxuo, nk, kpoint, wk, ek, qk, Dnew,
@@ -517,7 +498,7 @@
      .              Haux, Saux, psi, Haux, Saux, aux,
      .              no_u, occtol, 1, no_u )
       else
-        call die( 'bands: ERROR: incorrect value of nspin')
+        call die( 'bands: ERROR: incorrect value of spin%H')
       endif
 
 C Write bands
@@ -540,7 +521,7 @@
      .      path = path + sqrt( (kpoint(1,ik)-kpoint(1,ik-1))**2 +
      .                          (kpoint(2,ik)-kpoint(2,ik-1))**2 +
      .                          (kpoint(3,ik)-kpoint(3,ik-1))**2 )
-          do ispin = 1,maxspn
+          do ispin = 1, spin%spinor
             do io = 1, no_u
               emax = max( emax, ek(io,ispin,ik) )
               emin = min( emin, ek(io,ispin,ik) )
@@ -552,13 +533,14 @@
         write(iu,*) emin/eV, emax/eV
 
 C Write eigenvalues
-        if ( nspin <= 2 ) then
-          write(iu,*) no_u, maxspn, nk
-        else if ( nspin <= 8 ) then
-          write(iu,*) 2*no_u, 1, nk
-        else
-          call die( 'bands: ERROR: incorrect value of nspin' )
-        end if
+        if ( spin%Grid == 4 ) then
+          write(iu,*) 2*no_u, 1, nk     ! A single spin channel, double number of bands
+        else 
+          write(iu,*) no_u, spin%spinor, nk
+        endif
+
+        ! For non-collinear calculations, the ek array will contain the first no_u
+        ! bands in ek(:,1,ik), and the next no_u bands in ek(:,2,ik)   
         path = 0.d0
         do ik = 1,nk
           if (nlines .ge. 0) then
@@ -568,11 +550,11 @@
      .                            (kpoint(3,ik)-kpoint(3,ik-1))**2 )
             write(iu,'(f10.6,10f12.4,/,(10x,10f12.4))')
      .         path, ((ek(io,ispin,ik)/eV,io=1,no_u),
-     .         ispin=1,maxspn)
+     .         ispin=1,spin%spinor)
           else
             write(iu,'(3f9.5,8f12.4,/,(27x,8f12.4))')
      .        kpoint(1,ik), kpoint(2,ik), kpoint(3,ik),
-     .        ((ek(io,ispin,ik)/eV,io=1,no_u),ispin=1,maxspn)
+     .        ((ek(io,ispin,ik)/eV,io=1,no_u),ispin=1,spin%spinor)
           endif
         enddo
 
 
=== modified file 'Src/compute_dm.F'
--- Src/compute_dm.F	2018-11-02 09:03:25 +0000
+++ Src/compute_dm.F	2019-08-18 23:02:58 +0000
@@ -24,7 +24,7 @@
      &                    qtot, Qtots, no_l
       use sys, only: die, bye
       use Kpoint_grid
-      use m_energies,   only: Ebs, Ecorrec, Entropy, DE_NEGF
+      use m_energies,   only: Ebs, Ecorrec, Entropy
       use m_energies,   only: Ef, Efs
       use m_rmaxh
       use m_eo
@@ -231,7 +231,7 @@
          call transiesta(iscf,spin%H, block_dist, sparse_pattern,
      &        no_u == no_s, ucell, nsc, isc_off, no_u, na_u,
      &        lasto, xa, maxnh,
-     &        H, S, Dscf, Escf, Ef, Qtot, .false., DE_NEGF )
+     &        H, S, Dscf, Escf, Ef, Qtot, .false.)
 
          Ecorrec = 0._dp
          Entropy = 0.0_dp
 
=== modified file 'Src/compute_energies.F90'
--- Src/compute_energies.F90	2017-12-21 15:49:49 +0000
+++ Src/compute_energies.F90	2019-08-18 23:02:58 +0000
@@ -55,6 +55,8 @@
 #ifdef MPI
       use m_mpi_utils,     only: globalize_sum
 #endif
+      use m_ts_global_vars, only: TSrun
+      use ts_energies_m, only: ts_compute_energies
 
       integer, intent(in)   :: iscf
 
@@ -85,6 +87,10 @@
       ! E0 = Ena + Ekin + Enl + Eso - Eions
 
       call update_DEna()
+      ! Also call transiesta
+      if ( TSrun ) then
+        call ts_compute_energies()
+      end if
       call update_Etot()
 
 
@@ -94,9 +100,13 @@
 
       if (mix_charge) then   ! possibly add mixH here
          EHarrs = 0.0_dp
+         NEGF_Eharrs = 0._dp
       else
          call compute_DEharr()
          Eharrs = Etot + DEharr
+         if ( TSrun ) then
+           NEGF_Eharrs = NEGF_Etot + NEGF_DEharr
+         end if
       endif
 
 ! Possible correction to Etot if mixing the DM. This is purely
@@ -218,6 +228,8 @@
       use class_dSpData1D, only : val
       use class_dSpData2D, only : val
       use sparse_matrices, only: H_kin_1D, H_vkb_1D, H_so_2D
+      use ts_energies_m, only: ts_compute_energies
+      use m_ts_global_vars, only: TSrun
 
       type(filesOut_t)  :: filesOut  ! blank output file names
       real(dp), pointer :: H_vkb(:), H_kin(:), H_so(:,:)
@@ -281,7 +293,12 @@
          Eso = buffer1
 #endif
       end if
-      
+
+      ! Also call transiesta
+      if ( TSrun ) then
+        call ts_compute_energies()
+      end if
+       
       ! E0 = Ena + Ekin + Enl + Eso - Eions
 
       ! Clarify: Ecorrec (from O(N))
 
=== modified file 'Src/delk.F90'
--- Src/delk.F90	2016-03-01 14:24:48 +0000
+++ Src/delk.F90	2019-08-18 23:02:58 +0000
@@ -386,7 +386,7 @@
                    r2sp = sum(dxsp**2)
                    if ( r2sp < r2cut(is) ) then
 !$OMP critical
-                      call all_phi( is, +1, dxsp, nphiloc, phia(:,isp) )
+                      call all_phi( is, +1, dxsp, maxoa, nphiloc, phia(:,isp) )
 !$OMP end critical
                    else
                       phia(:,isp) = 0.0_dp
 
=== modified file 'Src/dfscf.f'
--- Src/dfscf.f	2018-04-22 00:13:43 +0000
+++ Src/dfscf.f	2019-08-18 23:02:58 +0000
@@ -303,7 +303,7 @@
               dxsp(1:3,isp) = xdop(1:3,iop)+xdsp(1:3,isp)-dxa(1:3,ia)
               r2sp = dxsp(1,isp)**2 + dxsp(2,isp)**2 + dxsp(3,isp)**2
               if (r2sp.lt.r2cut(is)) then
-                call all_phi( is,+1, dxsp(:,isp), nphiloc,
+                call all_phi( is,+1, dxsp(:,isp), maxoa, nphiloc,
      .                        phia(:,isp), grada(:,:,isp))
               else
                 phia(:,isp) = 0.0_dp
 
=== modified file 'Src/dhscf.F'
--- Src/dhscf.F	2019-06-27 10:49:55 +0000
+++ Src/dhscf.F	2019-08-18 23:02:58 +0000
@@ -948,7 +948,7 @@
         call de_alloc( DRho_par, 'DRho_par','dhscf' )
 
         if ( debug_dhscf ) then
-           write(*,debug_fmt) Node,'DRho',
+           write(*,debug_fmt) Node,'Rho',
      &          (sqrt(sum(DRho(:,ispin)**2)),ispin=1,nspin)
         end if
 
@@ -1141,6 +1141,11 @@
       enddo
 !$OMP end parallel do
 
+      if ( debug_dhscf ) then
+        write(*,debug_fmt) Node,'DRho',
+     &      (sqrt(sum(DRho(:,ispin)**2)),ispin=1,nspin)
+      end if
+
 C ----------------------------------------------------------------------
 C Save electron density difference
 C ----------------------------------------------------------------------
 
=== modified file 'Src/diag2g.F'
--- Src/diag2g.F	2018-06-25 11:33:42 +0000
+++ Src/diag2g.F	2019-08-18 23:02:58 +0000
@@ -7,7 +7,7 @@
 !
       subroutine diag2g( nuo, no, maxnh, maxnd, maxo,
      .                   numh, listhptr, listh, numd, listdptr,
-     .                   listd, H, S, getD, qtot, temp, e1, e2,
+     .                   listd, H, S, getD, getPSI, qtot, temp, e1, e2,
      .                   eo, qo, Dnew, Enew, ef, Entropy, 
      .                   Haux, Saux, psi, caux, 
      .                   nuotot, occtol, iscf, neigwanted)
@@ -19,6 +19,8 @@
       use sys
       use parallel,        only : Node, Nodes, BlockSize
       use parallelsubs,    only : LocalToGlobalOrb,GlobalToLocalOrb
+      use writewave,       only : writew
+      use iso_c_binding,   only : c_loc, c_f_pointer
       use m_fermid,        only : fermid, stepf
       use intrinsic_missing, only: MODP
 
@@ -100,16 +102,19 @@
       real(dp) Entropy, eo(maxo*2), H(maxnh,4), qo(maxo*2)
       real(dp) qtot, S(maxnh), temp, occtol
       
-      complex(dp), dimension(2,nuotot,2*nuo) :: psi
+      complex(dp), dimension(2,nuotot,2*nuo), target :: psi
       complex(dp), dimension(2,nuotot,2,nuo) :: Haux, Saux
-      complex(dp), dimension(2,nuotot) :: caux
-      logical               getD
+      complex(dp), dimension(2,nuotot), target :: caux
+      logical               getD, getPSI
       
 !     Internal variables .............................................
 
+      real(dp), pointer :: psi_real_1d(:)
+      real(dp), pointer :: aux(:)
+      
       integer           BNode, BTest, ie, ierror, iie, iio
       integer           ind, io, j, jo, nd, iuo, juo
-      real(dp)          ee, pipj, qe, t
+      real(dp)          ee, pipj, qe, t, k(3)
       complex(dp) :: cicj, D11, D22, D12, D21
 #ifdef MPI
       integer MPIerror
@@ -201,6 +206,14 @@
         call cdiag(Haux,Saux,2*nuotot,2*nuo,2*nuotot,eo,psi,
      .             2*neigwanted,iscf,ierror, 2*BlockSize)
       endif
+
+      if (getPSI) then
+         k(1:3) = 0.0d0
+         call c_f_pointer( c_loc(psi), psi_real_1d, [size(psi)*2] )
+         call writew(nuotot,nuo,1,k,1,
+     &        eo,psi_real_1d,gamma=.true.,
+     $        non_coll=.true., blocksize=2*BlockSize)
+      endif
       
 !     Check if we are done
       if (.not.getD) goto 1001
 
=== modified file 'Src/diag2k.F'
--- Src/diag2k.F	2018-04-14 23:14:53 +0000
+++ Src/diag2k.F	2019-08-18 23:02:58 +0000
@@ -7,7 +7,7 @@
 !
       subroutine diag2k( nuo, no, maxnh, maxnd, maxo,
      .                   numh, listhptr, listh, numd, listdptr, 
-     .                   listd, H, S, getD, qtot, temp, e1, e2,
+     .                   listd, H, S, getD, getPsi, qtot, temp, e1, e2,
      .                   xij, indxuo, nk, kpoint, wk,
      .                   eo, qo, Dnew, Enew, ef, Entropy,
      .                   Haux, Saux, psi, Dk, Ek, caux, 
@@ -20,7 +20,9 @@
       use sys
       use parallel,      only : Node, Nodes, BlockSize
       use parallelsubs,  only : LocalToGlobalOrb
+      use writewave,     only : writew
       use m_fermid,      only : fermid, stepf
+      use iso_c_binding, only : c_loc, c_f_pointer
 #ifdef MPI
       use mpi_siesta
 #endif
@@ -79,8 +81,8 @@
 C integer iscf                : SCF cycle number
 C integer neigwanted          : Number of eigenvalues wanted
 C *************************** OUTPUT **********************************
-C real*8 eo(maxo*4,nk)        : Eigenvalues
-C real*8 qo(maxo*4,nk)        : Occupations of eigenstates
+C real*8 eo(maxo*2,nk)        : Eigenvalues
+C real*8 qo(maxo*2,nk)        : Occupations of eigenstates
 C real*8 Dnew(maxnd,4)        : Output Density Matrix
 C real*8 Enew(maxnd,4)        : Output Energy-Density Matrix
 C real*8 ef                   : Fermi energy
@@ -116,11 +118,15 @@
       integer :: neigwanted
 
       complex(dp), dimension(2,nuotot,2,nuo) :: Haux, Saux, Dk, Ek
-      complex(dp), dimension(2,nuotot,2*nuo) :: psi
-      complex(dp), dimension(2,nuotot) :: caux
-      logical               getD
+      complex(dp), dimension(2,nuotot,2*nuo), target :: psi
+      complex(dp), dimension(2,nuotot), target       :: caux
+      logical, intent(in) ::        getD, getPsi
       
 !     Internal variables .............................................
+
+      ! For interface compliance using c_f_pointer
+      real(dp),    pointer :: aux(:)
+      real(dp),    pointer :: psi_real(:)
       
       integer  BNode, BTest, ie, ierror, iie, ik, ind, io, iio
       integer  iuo, j, jo, juo, neigneeded
@@ -170,6 +176,9 @@
 !
 ! 1. Hermiticity imposes H_{i,j}^{is,js}=H_{j,i}^{js,is}^*
 
+      ! Jump point for bands and wfs output only
+      if (getPSI .and. (.not. GetD)) goto 10
+      
 !     Find eigenvalues at every k point
       do ik = 1,nk
       
@@ -214,10 +223,10 @@
         endif
       enddo
       
-!-----------------------------------------------------------------------
-!     Check if we are done
-!-----------------------------------------------------------------------
-      if (.not.getD) goto 1001
+      ! Check if we are done (i.e.: pure bands only)
+      if (.not.getD .and. .not. getPSI) then
+         RETURN
+      end if
 !-----------------------------------------------------------------------
       
 !     Find new Fermi energy and occupation weights
@@ -240,16 +249,23 @@
       Dnew(:,:) = 0.0_dp
       Enew(:,:) = 0.0_dp
       
-!     Find maximum eigenvector that is required for this k point 
+ 10   continue      ! ---- Start here for (getPsi and (not getDM))
+
       do ik = 1,nk
-        neigneeded = 0
-        ie = 2*nuotot
-        do while (ie.gt.0.and.neigneeded.eq.0)
-          qe = qo(ie,ik)
-          if (abs(qe).gt.occtol) neigneeded = ie
-          ie = ie - 1
-        enddo
-      
+         !  Find maximum eigenvector index that is required for this k point 
+         if (getPSI) then
+             ! We do not have info about occupation
+             neigneeded = neigwanted
+          else
+             neigneeded = 0
+             ie = 2*nuotot    ! for mixed spins
+             do while (ie.gt.0.and.neigneeded.eq.0)
+                qe = qo(ie,ik)
+                if (abs(qe).gt.occtol) neigneeded = ie
+                ie = ie - 1
+             enddo
+          endif
+          
 !       Find eigenvectors 
         Saux = dcmplx(0.0_dp,0.0_dp)
         Haux = dcmplx(0.0_dp,0.0_dp)
@@ -310,8 +326,25 @@
           call cdiag(Haux,Saux,2*nuotot,2*nuo,2*nuotot,caux,psi,
      .               neigneeded,iscf,ierror,2*BlockSize)
         endif
-      
-!-----------------------------------------------------------------------	     
+
+              
+        if (getPSI) then
+           if (.not. getD) then
+              ! Fill in the missing eigenvalue information
+              ! This is useful if we are requesting WFS in a "bands" setting
+              call c_f_pointer(c_loc(caux),aux,[2*nuotot])
+              call kludge_copy(2*nuotot,eo(1,ik),aux)
+           endif
+           call c_f_pointer(c_loc(psi),psi_real,[2*size(psi)])
+           call writew(nuotot,nuo,ik,kpoint(1,ik),1, ! last '1' is 'spin-block number'
+     .                 eo(1,ik),       ! energies
+     .                 psi_real,gamma=.false.,non_coll=.true.,
+     $                 blocksize=2*BlockSize)
+        endif
+
+        if (.not. getD) CYCLE   ! process new k-point
+
+!-----------------------------------------------------------------------
 !     Store the products of eigenvectors in matrices Dk and Ek
 !     WARNING: Dk and Ek may be EQUIVALENCE'd to Haux and Saux
 !-----------------------------------------------------------------------	     
@@ -445,13 +478,22 @@
 
         enddo
         enddo
-      enddo
+      enddo  ! over k-points
 
- 1001 continue
-      
 #ifdef DEBUG
       call write_debug( '    POS diag2k' )
 #endif
+            
+      CONTAINS
+            ! Work around shape of aux array
+      subroutine kludge_copy(n,a,b)
+      integer, intent(in) :: n
+      real(dp), intent(out) :: a(n)
+      real(dp), intent(in)  :: b(n)
+!$OMP parallel workshare default(shared)
+      a(1:n) = b(1:n)
+!$OMP end parallel workshare
+      end subroutine kludge_copy
 
       end subroutine diag2k
       
 
=== modified file 'Src/diag3g.F'
--- Src/diag3g.F	2018-06-25 11:33:42 +0000
+++ Src/diag3g.F	2019-08-18 23:02:58 +0000
@@ -5,7 +5,7 @@
 !  or http://www.gnu.org/copyleft/gpl.txt.
 ! See Docs/Contributors.txt for a list of contributors.
 !
-      subroutine diag3g( nuo, no, maxuo, maxnh, maxnd, maxo,
+      subroutine diag3g( nuo, no, maxnh, maxnd, maxo,
      .                   numh, listhptr, listh, numd, listdptr,
      .                   listd, H, S, getD, getPSI, qtot, temp, e1, e2,
      .                   eo, qo, Dnew, Enew, ef, Entropy,
@@ -16,8 +16,10 @@
       use sys
       use parallel,        only : Node, Nodes, BlockSize
       use parallelsubs,    only : LocalToGlobalOrb,GlobalToLocalOrb
+      use writewave,       only : writew
       use m_fermid,        only : fermid, stepf
       use intrinsic_missing, only: MODP
+      use iso_c_binding,   only : c_loc, c_f_pointer
 #ifdef MPI
       use mpi_siesta
 #endif
@@ -33,7 +35,6 @@
 C **************************** INPUT **********************************
 C integer nuo                 : Number of basis orbitals on local node
 C integer no                  : Number of basis orbitals
-C integer maxuo               : Maximum number of basis  orbitals
 C integer maxnh               : Maximum number of orbitals interacting  
 C integer maxnd               : First dimension of Dnew and Enew
 C integer maxo                : First dimension of eo and qo
@@ -86,7 +87,7 @@
 !     Indices is and js are for spin components 
 !     Indices iuo and juo are for orbital components:
 ! *********************************************************************
-      integer maxo, maxuo, maxnd, maxnh
+      integer maxo, maxnd, maxnh
       integer no, nuo, nuotot, iscf, neigwanted
       
       integer listh(maxnh), numh(nuo), listhptr(nuo)
@@ -96,7 +97,8 @@
       real(dp) Entropy, eo(maxo*2), H(maxnh,8), qo(maxo*2)
       real(dp) qtot, S(maxnh), temp, occtol
       
-      complex(dp), dimension(2,nuotot,2*nuo) :: psi
+      complex(dp), dimension(2,nuotot,2*nuo), target :: psi
+      real(dp), pointer                              :: psi_real_1d(:)
       complex(dp), dimension(2,nuotot,2,nuo) :: Haux, Saux
       complex(dp), dimension(2,nuotot) :: caux
       logical               getD, getPSI
@@ -105,7 +107,7 @@
       
       integer           BNode, BTest, ie, ierror, iie, iio
       integer           ind, io, j, jo, nd, iuo, juo
-      real(dp)          ee, qe, t
+      real(dp)          ee, qe, t, k(3)
       complex(dp)       D11, D22, D12, D21
 #ifdef MPI
       integer MPIerror
@@ -193,7 +195,20 @@
         call cdiag(Haux,Saux,2*nuotot,2*nuo,2*nuotot,eo,psi,
      .             2*neigwanted,iscf,ierror,2*BlockSize)
       endif
-      
+
+      if (getPSI) then
+         k(1:3) = 0.0d0
+
+          ! We do not have info about occupation
+          ! In the current implementation, neigneeded
+          ! is ALWAYS nuotot.
+          ! This is because writewave expects the full spectrum
+         call c_f_pointer( c_loc(psi), psi_real_1d, [size(psi)*2] )
+         call writew(nuotot,nuo,1,k,1,
+     &        eo,psi_real_1d,gamma=.true.,
+     $        non_coll=.true.,blocksize=2*BlockSize)
+      endif
+
 !     Check if we are done
       if (.not.getD) return
       
 
=== modified file 'Src/diag3k.F'
--- Src/diag3k.F	2017-08-06 11:17:47 +0000
+++ Src/diag3k.F	2019-08-18 23:02:58 +0000
@@ -18,7 +18,9 @@
       use sys
       use parallel,      only : Node, Nodes, BlockSize
       use parallelsubs,  only : LocalToGlobalOrb
+      use writewave,     only : writew
       use m_fermid,      only : fermid, stepf
+      use iso_c_binding, only : c_f_pointer, c_loc
 #ifdef MPI
       use mpi_siesta
 #endif
@@ -114,12 +116,14 @@
       integer :: neigwanted
       
       complex(dp), dimension(2,nuotot,2,nuo) :: Haux, Saux, Dk, Ek
-      complex(dp), dimension(2,nuotot,2*nuo) :: psi
-      complex(dp), dimension(2,nuotot) :: caux
-      logical               getD, getPSI
-      
-!     TEMPOS, INTERNAL VARIABLES etc.
-      
+      complex(dp), dimension(2,nuotot,2*nuo), target :: psi
+      complex(dp), dimension(2,nuotot), target :: caux
+      logical, intent(in) ::               getD, getPSI
+      
+
+      real(dp),    pointer :: aux(:)
+      real(dp), pointer  :: psi_real(:)
+
       integer  BNode, BTest, ie, ierror, iie, ik, ind, io, iio
       integer  iuo, j, jo, juo, neigneeded
       real(dp) ee, qe, t
@@ -175,6 +179,9 @@
 !
 !
 
+      ! Jump point for bands and wfs output only
+      if (getPSI .and. (.not. GetD)) goto 10
+      
 !     Find eigenvalues at every k point
 
       do ik = 1,nk
@@ -214,11 +221,11 @@
           call die('Terminating due to failed diagonalisation')
         endif
       enddo
-      
-!-----------------------------------------------------------------------
-!     Check if we are done
-!-----------------------------------------------------------------------
-      if (.not.getD) return
+
+      ! Check if we are done (i.e.: pure bands only)
+      if (.not.getD .and. .not. getPSI) then
+         RETURN
+      end if
 !-----------------------------------------------------------------------
       
 !     Find new Fermi energy and occupation weights
@@ -240,16 +247,23 @@
 !     New density and energy-density matrices of unit-cell orbitals
       Dnew(:,:) = 0.0_dp
       Enew(:,:) = 0.0_dp
+
+ 10   continue   ! ---- Start here for (getPsi and (not getDM))
       
-!     Find maximum eigenvector that is required for this k point 
       do ik = 1,nk
-        neigneeded = 0
-        ie = 2*nuotot  ! for mixed spins
-        do while (ie.gt.0.and.neigneeded.eq.0)
-          qe = qo(ie,ik)
-          if (abs(qe).gt.occtol) neigneeded = ie
-          ie = ie - 1
-        enddo
+         !  Find maximum eigenvector index that is required for this k point 
+         if (getPSI) then
+             ! We do not have info about occupation
+             neigneeded = neigwanted
+         else
+             neigneeded = 0
+             ie = 2*nuotot      ! for mixed spins
+             do while (ie.gt.0.and.neigneeded.eq.0)
+                qe = qo(ie,ik)
+                if (abs(qe).gt.occtol) neigneeded = ie
+                ie = ie - 1
+             enddo
+         endif
       
 !       Find eigenvectors 
         Saux = dcmplx(0.0_dp,0.0_dp)
@@ -314,6 +328,22 @@
      .               neigneeded,iscf,ierror, 2*BlockSize)
         endif
       
+          if (getPSI) then
+             if (.not. getD) then
+                ! Fill in the missing eigenvalue information
+                ! This is useful if we are requesting WFS in a "bands" setting
+                call c_f_pointer(c_loc(caux),aux,[2*nuotot])
+                call kludge_copy(2*nuotot,eo(1,ik),aux)
+             endif
+             call c_f_pointer(c_loc(psi),psi_real,[2*size(psi)])
+             call writew(nuotot,nuo,ik,kpoint(1,ik),1,     ! last '1' is 'spin-block number'
+     .                   eo(1,ik),                         ! energies
+     .                   psi_real,gamma=.false.,non_coll=.true.,
+     $                   blocksize=2*BlockSize)
+          endif
+
+          if (.not. getD) CYCLE   ! process new k-point
+
 !***********************************************************************
 ! BUILD NEW DENSITY MATRIX
 !***********************************************************************
@@ -429,8 +459,18 @@
         enddo
       enddo
       
-!***********************************************************************      
-      return
+      CONTAINS
+            ! Work around shape of aux array
+      subroutine kludge_copy(n,a,b)
+      integer, intent(in) :: n
+      real(dp), intent(out) :: a(n)
+      real(dp), intent(in)  :: b(n)
+!$OMP parallel workshare default(shared)
+      a(1:n) = b(1:n)
+!$OMP end parallel workshare
+      end subroutine kludge_copy
+
       end subroutine diag3k
 !***********************************************************************      
+
       
 
=== modified file 'Src/diagg.F'
--- Src/diagg.F	2018-06-25 11:33:42 +0000
+++ Src/diagg.F	2019-08-18 23:02:58 +0000
@@ -91,7 +91,7 @@
       use m_spin,        only : spinor_dim, e_spin_dim
       use alloc
       use intrinsic_missing, only: MODP
-
+      use iso_c_binding, only : c_f_pointer, c_loc
 #ifdef MPI
       use mpi_siesta
 #endif
@@ -117,10 +117,9 @@
      &  qo(maxo,spinor_dim), qtot, qs(spinor_dim), S(maxnh), temp, 
      &  efs(spinor_dim), occtol
      
-      real(dp)
-     &  Haux(nuotot,nuo), Saux(nuotot,nuo), 
-     &  psi(nuotot,maxuo,spinor_dim) 
-
+      real(dp) Haux(nuotot,nuo), Saux(nuotot,nuo)
+      real(dp), target :: psi(nuotot,maxuo,spinor_dim) 
+      real(dp), pointer :: psi_real_1d(:)
       real(dp), dimension(1), parameter :: wk = (/ 1.0_dp /)
       integer, parameter                :: nk = 1
 
@@ -203,8 +202,11 @@
           do ix = 1,3
             k(ix) = 0.0d0
           enddo
+          call c_f_pointer(c_loc(psi(:,:,ispin)),psi_real_1d,
+     $                     [size(psi,1)*size(psi,2)])
           call writew(nuotot,nuo,1,k,ispin,
-     &                eo(1,ispin),psi(1,1,ispin),.true.)
+     &                eo(1,ispin),psi_real_1d,gamma=.true.,
+     $                non_coll=.false.,blocksize=BlockSize)
         endif
 
       enddo
 
=== modified file 'Src/diagk.F'
--- Src/diagk.F	2017-08-06 09:35:09 +0000
+++ Src/diagk.F	2019-08-18 23:02:58 +0000
@@ -101,6 +101,7 @@
       use writewave,     only : writew
       use m_fermid,      only : fermid, fermispin, stepf
       use m_spin,        only : spinor_dim, e_spin_dim
+      use iso_c_binding, only : c_loc, c_f_pointer
 #ifdef MPI
       use mpi_siesta
 #endif
@@ -143,6 +144,7 @@
       real(dp) :: qp1, qp2, eqp1, eqp2
 
       real(dp), pointer :: lpsi(:,:)
+      real(dp), pointer :: psi_real_1d(:)
 
       logical, allocatable :: done_juo(:)
 C     ....................
@@ -347,8 +349,10 @@
                 ! This is useful if we are requesting WFS in a "bands" setting
                 call kludge_copy(nuotot,eo(1,ispin,ik),aux)
              endif
+             call c_f_pointer(c_loc(psi),psi_real_1d,[size(psi)])
              call writew(nuotot,nuo,ik,kpoint(1,ik),ispin,
-     .                 aux,psi,.false.)
+     .                 aux,psi_real_1d,gamma=.false.,non_coll=.false.,
+     $                 blocksize=BlockSize)
           endif
 
           if (getD) then
 
=== modified file 'Src/diagon.F'
--- Src/diagon.F	2018-11-02 09:03:25 +0000
+++ Src/diagon.F	2019-08-18 23:02:58 +0000
@@ -266,7 +266,7 @@
        if (gamma) then
         call diag2g( nuo, no, maxnh, maxnd, maxo, numh,
      .               listhptr, listh, numd, listdptr, listd,
-     .               H, S, getD, qtot, temp, e1, e2, eo, qo, 
+     .               H, S, getD, getPSI, qtot, temp, e1, e2, eo, qo, 
      .               Dnew, Enew, ef, Entropy,
      .               Haux, Saux, psi, aux,
      .               nuotot, occtol, iscf, neigwanted )
@@ -281,7 +281,7 @@
        else
         call diag2k( nuo, no, maxnh, maxnd, maxo, numh,
      .               listhptr, listh, numd, listdptr, listd,
-     .               H, S, getD, qtot, temp, e1, e2, xij,
+     .               H, S, getD, getPsi, qtot, temp, e1, e2, xij,
      .               indxuo, nk, kpoint, wk, eo, qo, Dnew,
      .               Enew, ef, Entropy, 
      .               Haux, Saux, psi, Haux, Saux, aux,
@@ -289,7 +289,7 @@
        endif
       elseif ( spin%SO ) then
         if (gamma) then
-          call diag3g( nuo, no, maxuo, maxnh, maxnd, maxo, numh,
+          call diag3g( nuo, no, maxnh, maxnd, maxo, numh,
      .                 listhptr, listh, numd, listdptr, listd,
      .                 H, S, getD, getPSI, qtot, temp, e1, e2, eo, qo,
      .                 Dnew, Enew, ef, Entropy, 
 
=== modified file 'Src/ioeig.f'
--- Src/ioeig.f	2018-05-08 11:36:55 +0000
+++ Src/ioeig.f	2019-08-18 23:02:58 +0000
@@ -19,10 +19,10 @@
 
       implicit          none
 
-      integer,  intent(in) :: no
-      integer,  intent(in) :: nspin
+      integer,  intent(in) :: no     ! no_u: number of orbitals in unit cell
+      integer,  intent(in) :: nspin  ! 'nspin_grid': 1, 2, or 4
       integer,  intent(in) :: nk
-      integer,  intent(in) :: maxo
+      integer,  intent(in) :: maxo   ! no_u again
       integer,  intent(in) :: nspinor
       integer,  intent(in) :: maxk
       real(dp), intent(in) :: ef
@@ -45,11 +45,17 @@
 
       write(iu,"(e17.9)") ef/eV
       if ( nspin > nspinor ) then
-        write(iu,"(tr1,i10,i2,tr1,i10)")   no*2, 1, nk
+        ! NC/SOC case: a single block of wavefunctions (without spin tag)
+        ! nspin (4) will be used here to signal NC/SOC to utilities such as 
+        ! Eig2DOS
+        write(iu,"(tr1,i10,i2,tr1,i10)")   no*2, nspin, nk
       else
         write(iu,"(tr1,i10,i2,tr1,i10)")   no, min(nspin,2), nk
       end if
       do ik = 1,nk
+        ! This statement will correctly print eo in the NC/SOC case,
+        ! as the eigenvalues take up two complete 'io' columns,
+        ! and nspinor = 2. 
         write(iu,"(i10,10(tr1,e17.9),/,(tr10,10(tr1,e17.9)))")
      .          ik, ((eo(io,is,ik)/eV,io=1,no),is=1,nspinor)
       enddo
@@ -83,7 +89,7 @@
             if ( is == 1 .and. nspinor > 1 ) then
                call cmlAddProperty(xf=mainXML, value="up", 
      .              dictRef="siesta:spin")
-            else if ( nspinor > 1 ) then
+            else if ( nspinor > 1) then
                call cmlAddProperty(xf=mainXML, value="down", 
      .              dictRef="siesta:spin")
             end if
 
=== modified file 'Src/iosockets.F90'
--- Src/iosockets.F90	2018-11-27 11:01:23 +0000
+++ Src/iosockets.F90	2019-08-18 23:02:58 +0000
@@ -181,6 +181,8 @@
   if (IOnode) then
     if (leqi(master,"i-pi") .and. trim(header)=="POSDATA") then 
       call readbuffer(socket, c, 9)
+      ! Please see below for the cell array
+      ! If this is to be used, it should *ALSO* be transposed!
       call readbuffer(socket, aux, 9)    ! not used in siesta
       master_xunit = ipi_xunit
       master_eunit = ipi_eunit
@@ -201,7 +203,15 @@
                  MPI_Comm_World, MPIerror)
   call MPI_Bcast(c,9, MPI_Double_Precision,0, MPI_Comm_World, MPIerror)
 #endif
-  cell = RESHAPE( c, (/3,3/) )
+  ! I-Pi assumes row-major order of *only* the cell parameters
+  ! So we need to transpose the cell
+  ! This is a very bad practice since the same is happening in
+  ! ASE I-pi implementation.
+  ! The cell is transposed when transfering, but not the coordinates.
+  ! Essentially one could leave out *any* transposes in all implementations
+  ! and it would work! However, this is now a legacy implementation
+  ! that should not be changed, neither in I-pi, nor ASE.
+  cell = TRANSPOSE( RESHAPE( c, (/3,3/) ) )
 
 ! Read and check number of atoms
   if (ionode) then
 
=== modified file 'Src/m_energies.F90'
--- Src/m_energies.F90	2018-07-03 13:43:29 +0000
+++ Src/m_energies.F90	2019-08-18 23:02:58 +0000
@@ -47,7 +47,18 @@
   real(dp):: Eldau      
   real(dp):: DEldau
 
-  real(dp) :: DE_NEGF  ! NEGF total energy contribution = - e * \sum_i N_i \mu_i
+  real(dp) :: NEGF_DE  ! NEGF total energy contribution = - e * \sum_i N_i \mu_i
+  ! Generally we should only calculate energies in the regions where we are updating elements
+  ! As such we need a specific energy for the NEGF part
+  ! Their meaning is directly transferable to the above listed energies (in the updating regions)
+  real(dp) :: NEGF_Ebs
+  real(dp) :: NEGF_Ekin
+  real(dp) :: NEGF_Enl
+  real(dp) :: NEGF_Eso
+  real(dp) :: NEGF_DEharr
+  real(dp) :: NEGF_Eharrs
+  real(dp) :: NEGF_Etot
+  real(dp) :: NEGF_FreeE
 
 contains
 
@@ -85,7 +96,17 @@
     Eso = 0._dp
     Eldau = 0._dp      
     DEldau = 0._dp
-    DE_NEGF = 0._dp
+
+    ! NEGF part
+    NEGF_DE = 0._dp
+    NEGF_Ebs = 0._dp
+    NEGF_Ekin = 0._dp
+    NEGF_Enl = 0._dp
+    NEGF_Eso = 0._dp
+    NEGF_DEharr = 0._dp
+    NEGF_Eharrs = 0._dp
+    NEGF_Etot = 0._dp
+    NEGF_FreeE = 0._dp
 
   end subroutine init_Energies
 
@@ -102,27 +123,36 @@
   subroutine update_E0()
 
     E0 = Ena + Ekin + Enl + Eso - Eions
-    
+
   end subroutine update_E0
   
   subroutine update_Etot()
+    use m_ts_global_vars, only: TSrun
     
     ! DUext (external electric field) -- should it be in or out?
     Etot = Ena + Ekin + Enl + Eso - Eions + &
-         DEna + DUscf + DUext + Exc + &
-         Ecorrec + Emad + Emm + Emeta + Eldau
-    ! Commented out the NEGF contribution to the total energy
-    ! We know it is wrong, but we estimate it. See output
-    !    Etot = Etot + DE_NEGF
+        DEna + DUscf + DUext + Exc + &
+        Ecorrec + Emad + Emm + Emeta + Eldau
 
+    if ( TSrun ) then
+      NEGF_Etot = Ena + NEGF_Ekin + NEGF_Enl + NEGF_Eso - Eions + &
+          DEna + DUscf + DUext + Exc + Ecorrec + Emad + Emm + Emeta + &
+          Eldau + NEGF_DE
+    end if
+    
   end subroutine update_Etot
 
   !> @param kBT the temperature in energy
   subroutine update_FreeE( kBT )
+    use m_ts_global_vars, only: TSrun
     real(dp), intent(in) :: kBT
 
     FreeE = Etot - kBT * Entropy
 
+    if ( TSrun ) then
+      NEGF_FreeE = NEGF_Etot - kBT * Entropy
+    end if
+
   end subroutine update_FreeE
 
   !> @param kBT the temperature in energy
 
=== modified file 'Src/m_io_yaml.F90'
--- Src/m_io_yaml.F90	2018-05-30 08:58:52 +0000
+++ Src/m_io_yaml.F90	2019-08-18 23:02:58 +0000
@@ -174,7 +174,6 @@
     write(unit=yaml_fd, fmt='(2X,A,":",1X,E24.8)') "DEna", DEna
     write(unit=yaml_fd, fmt='(2X,A,":",1X,E24.8)') "DUscf", DUscf
     write(unit=yaml_fd, fmt='(2X,A,":",1X,E24.8)') "DUext", DUext
-    write(unit=yaml_fd, fmt='(2X,A,":",1X,E24.8)') "Enegf", DE_NEGF
     write(unit=yaml_fd, fmt='(2X,A,":",1X,E24.8)') "Exc", Exc
     write(unit=yaml_fd, fmt='(2X,A,":",1X,E24.8)') "Ecorrec", Ecorrec
     write(unit=yaml_fd, fmt='(2X,A,":",1X,E24.8)') "Emadel", Emad
 
=== modified file 'Src/m_mixing.F90'
--- Src/m_mixing.F90	2019-06-20 10:46:56 +0000
+++ Src/m_mixing.F90	2019-08-18 23:02:58 +0000
@@ -423,25 +423,46 @@
 
          ! Do options so that a pulay option may refer to
          ! the actual names of the constants
+         
          if ( m%m == MIX_PULAY ) then
-
-            ! The linear mixing weight
-            if ( leqi(opt,'weight.linear') &
-                 .or. leqi(opt,'w.linear') ) then
-               
-               m%rv(1) = fdf_breals(pline,1)
-
-            else if ( leqi(opt,'svd.cond') ) then
-
-               ! This is only applicable to the Pulay
-               ! mixing scheme...
-               
-               m%rv(I_SVD_COND) = fdf_bvalues(pline,1)
-               
-            end if
-
+           if ( leqi(opt,'weight.linear') &
+               .or. leqi(opt,'w.linear') ) then
+             
+             m%rv(1) = fdf_breals(pline,1)
+             if ( m%rv(1) <= 0._dp .or. 1._dp < m%rv(1) ) then
+               call die("m_mixing: Mixing weight should be 0 < weight <= 1")
+             end if
+             
+           else if ( leqi(opt,'svd.cond') ) then
+             m%rv(I_SVD_COND) = fdf_bvalues(pline,1)
+           end if
+           
+         else if ( m%m == MIX_BROYDEN ) then
+           
+           ! The linear mixing weight
+           if ( leqi(opt,'weight.linear') &
+               .or. leqi(opt,'w.linear') ) then
+             
+             m%rv(1) = fdf_breals(pline,1)
+             if ( m%rv(1) <= 0._dp .or. 1._dp < m%rv(1) ) then
+               call die("m_mixing: Linear mixing weight should be 0 < weight <= 1")
+             end if
+
+           else if ( leqi(opt,'weight.prime') &
+               .or. leqi(opt,'w.prime') ) then
+             
+             m%rv(2) = fdf_breals(pline,1)
+             if ( m%rv(2) < 0._dp .or. 1._dp < m%rv(2) ) then
+               call die("m_mixing: Prime weight should be 0 <= weight <= 1")
+             end if
+
+           else if ( leqi(opt,'svd.cond') ) then
+             
+             m%rv(I_SVD_COND) = fdf_bvalues(pline,1)
+             
+           end if
+           
          end if
-
          
          ! Generic options for all advanced methods...
          if ( leqi(opt,'next.p') ) then
@@ -473,6 +494,10 @@
     type(tMixer), intent(inout) :: mix
     integer :: n
 
+    if ( mix%w <= 0._dp .or. 1._dp < mix%w ) then
+      call die("m_mixing: Mixing weight should be: 0 < weight <= 1")
+    end if
+
     ! Correct amount of history in the mixing.
     if ( 0 < mix%restart .and. &
          mix%restart < mix%n_hist ) then
@@ -518,7 +543,7 @@
        
        ! allocate temporary array
        mix%n_hist = max(2, mix%n_hist)
-       n = 1 + mix%n_hist
+       n = 2 + mix%n_hist
        allocate(mix%rv(I_SVD_COND:n))
        mix%rv(1:n) = mix%w
 
@@ -702,7 +727,7 @@
     type(tMixer), intent(in), target :: mixers(:)
 
     type(tMixer), pointer :: m
-    character(len=50) :: fmt
+    character(len=64) :: fmt
 
     logical :: bool
     integer :: i
@@ -795,9 +820,13 @@
           write(*,'(2a,t50,''= '',i0)') trim(fmt), &
                '    History steps',m%n_hist
           write(*,'(2a,t50,''= '',f12.6)') trim(fmt), &
-               '    Jacobian weight',m%w
-          write(*,'(2a,t50,''= '',f12.6)') trim(fmt), &
-               '    Weight prime',m%rv(1)
+               '    Linear mixing weight',m%rv(1)
+          write(*,'(2a,t50,''= '',f12.6)') trim(fmt), &
+               '    Inverse Jacobian weight',m%w
+          write(*,'(2a,t50,''= '',f12.6)') trim(fmt), &
+               '    Weight prime',m%rv(2)
+          write(*,'(2a,t50,''= '',e10.4)') trim(fmt), &
+               '    SVD condition',m%rv(I_SVD_COND)
           if ( m%rv(I_P_NEXT) > 0._dp ) then
              write(*,'(2a,t50,''= '',f6.4)') trim(fmt), &
                   '    Step mixer parameter',m%rv(I_P_NEXT)
@@ -921,8 +950,11 @@
        ! For Broyden this is the inverse Jacobian
        write(*,'(t3,a,f6.4)') 'weight ', m%w
        select case ( m%m )
-       case ( MIX_PULAY, MIX_BROYDEN )
-          write(*,'(t3,a,f6.4)') 'weight.linear ', m%rv(1)
+       case ( MIX_PULAY )
+         write(*,'(t3,a,f6.4)') 'weight.linear ', m%rv(1)
+       case ( MIX_BROYDEN )
+         write(*,'(t3,a,f6.4)') 'weight.linear ', m%rv(1)
+         write(*,'(t3,a,f6.4)') 'weight.prime ', m%rv(2)
        end select
           
        if ( m%n_hist > 0 ) then
@@ -1685,7 +1717,7 @@
       ! This is the modified Broyden algorithm...
 
       ! Retrieve the previous weights
-      w => mix%rv(2:1+nh)
+      w => mix%rv(3:2+nh)
       select case ( mix%v )
       case ( 2 ) ! Unity Broyden
          
@@ -1779,9 +1811,9 @@
 
       ! Add the diagonal term
       ! This should also prevent it from being
-      ! singular (unless mix%w == 0)
+      ! singular (unless mix%rv(2) == 0)
       do i = 1 , nh
-         A(i,i) = mix%rv(1) ** 2 + A(i,i)
+         A(i,i) = mix%rv(2) ** 2 + A(i,i)
       end do
 
       ! Calculate the inverse
@@ -2006,7 +2038,7 @@
          
       end if
 
-      ! Get the linear mixing term...
+      ! Get the inverse Jacobian term...
       G = mix%w
 
       ! if debugging print out the different variables
@@ -2242,7 +2274,7 @@
 
       ! Update weights (if necessary)
       if ( nh > 1 ) then
-         do i = 2 , nh
+         do i = 3 , nh + 1
             mix%rv(i) = mix%rv(i+1)
          end do
       end if
 
=== modified file 'Src/m_new_dm.F90'
--- Src/m_new_dm.F90	2019-08-16 10:13:21 +0000
+++ Src/m_new_dm.F90	2019-08-18 23:02:58 +0000
@@ -335,7 +335,7 @@
     ! Determine how the mixing of the first step should be performed
     !
     ! The idea is that one will allow mixing on the first SCF step
-    ! only for atomicly filled orbitals. This will in most cases
+    ! only for atomically filled orbitals. This will in most cases
     ! be a good initial choice, while in certain systems (spin-orbit)
     ! it may not be so good.
     ! Subsequently for any MD steps beyond the initial step, we will not
@@ -352,8 +352,8 @@
       mix_scf_first = .true.
       if ( IONode .and. init_method < 0 ) then
         ! Warn the user about this
-        write(*,"(a)") "Mixing first iteration is *forced* although the sparsity pattern has changed..."
-        write(*,"(a)") "Mixing non-compatible matrices may result in non-idempotency problems."
+        write(*,"(a)") "Mixing first scf iteration is *forced* although the sparsity pattern has changed..."
+        write(*,"(a)") "Mixing non-compatible matrices might result in problems."
         write(*,"(a)") "Please use a linear mixer for the first few steps to remove history effects."
       end if
     else if ( mix_scf_first .and. init_method < 0 ) then
 
=== modified file 'Src/m_spin.F90'
--- Src/m_spin.F90	2019-01-13 16:11:47 +0000
+++ Src/m_spin.F90	2019-08-18 23:02:58 +0000
@@ -355,6 +355,8 @@
        write(*,'(a)') repeat('#',60)
        write(*,'(a,t16,a,t60,a)') '#','Spin-orbit coupling is in beta','#'
        write(*,'(a,t13,a,t60,a)') '#','Several options may not be compatible','#'
+       call message("WARNING","This spin-orbit implementation uses a local approximation.")
+       call message("WARNING","You are strongly advised to use the newer version.")
        write(*,'(a)') repeat('#',60)
     end if
 
 
=== modified file 'Src/m_transiesta.F90'
--- Src/m_transiesta.F90	2019-02-13 17:39:22 +0000
+++ Src/m_transiesta.F90	2019-08-18 23:02:58 +0000
@@ -48,7 +48,7 @@
        sp_dist, sparse_pattern, &
        no_aux_cell, ucell, nsc, isc_off, no_u, na_u, lasto, xa, n_nzs, &
        H, S, DM, EDM, Ef, &
-       Qtot, Fermi_correct, DE_NEGF)
+       Qtot, Fermi_correct)
 
     use units, only : eV
     use alloc, only : re_alloc, de_alloc
@@ -75,6 +75,8 @@
     use m_ts_gf, only : read_Green
     use m_interpolate
 
+    use m_energies, only: NEGF_DE
+
 ! ********************
 ! * INPUT variables  *
 ! ********************
@@ -94,7 +96,6 @@
     real(dp), intent(in) :: Qtot
     real(dp), intent(inout) :: Ef
     logical, intent(in) :: Fermi_correct
-    real(dp), intent(inout) :: DE_NEGF
 
 ! ******************** IO descriptors ************************
     integer, allocatable :: uGF(:)
@@ -127,7 +128,7 @@
     ! Note that this will *only* be updated in case V /= 0.
     ! This energy corresponds to the non-equilibrium energies:
     !   e \sum_i N_i * \mu_i
-    DE_NEGF = 0._dp
+    NEGF_DE = 0._dp
 
     if ( TSiscf == 1 ) then
        ! We need to initialize TRANSIESTA
@@ -256,14 +257,14 @@
                   nq, uGF, nspin, na_u, lasto, &
                   sp_dist, sparse_pattern, &
                   no_u, n_nzs, &
-                  H, S, DM, EDM, Ef, DE_NEGF)
+                  H, S, DM, EDM, Ef, NEGF_DE)
           else
              call ts_fullk(N_Elec,Elecs, &
                   nq, uGF, &
                   ucell, nspin, na_u, lasto, &
                   sp_dist, sparse_pattern, &
                   no_u, n_nzs, &
-                  H, S, DM, EDM, Ef, DE_NEGF)
+                  H, S, DM, EDM, Ef, NEGF_DE)
           end if
        else if ( ts_method == TS_BTD ) then
           if ( ts_Gamma ) then
@@ -271,14 +272,14 @@
                   nq, uGF, nspin, na_u, lasto, &
                   sp_dist, sparse_pattern, &
                   no_u, n_nzs, &
-                  H, S, DM, EDM, Ef, DE_NEGF)
+                  H, S, DM, EDM, Ef, NEGF_DE)
           else
              call ts_trik(N_Elec,Elecs, &
                   nq, uGF, &
                   ucell, nspin, na_u, lasto, &
                   sp_dist, sparse_pattern, &
                   no_u, n_nzs, &
-                  H, S, DM, EDM, Ef, DE_NEGF)
+                  H, S, DM, EDM, Ef, NEGF_DE)
           end if
 #ifdef SIESTA__MUMPS
        else if ( ts_method == TS_MUMPS ) then
@@ -287,14 +288,14 @@
                   nq, uGF, nspin, na_u, lasto, &
                   sp_dist, sparse_pattern, &
                   no_u, n_nzs, &
-                  H, S, DM, EDM, Ef, DE_NEGF)
+                  H, S, DM, EDM, Ef, NEGF_DE)
           else
              call ts_mumpsk(N_Elec,Elecs, &
                   nq, uGF, &
                   ucell, nspin, na_u, lasto, &
                   sp_dist, sparse_pattern, &
                   no_u, n_nzs, &
-                  H, S, DM, EDM, Ef, DE_NEGF)
+                  H, S, DM, EDM, Ef, NEGF_DE)
           end if
 #endif
        else
 
=== modified file 'Src/m_ts_options.F90'
--- Src/m_ts_options.F90	2019-06-11 08:38:16 +0000
+++ Src/m_ts_options.F90	2019-08-18 23:02:58 +0000
@@ -375,7 +375,7 @@
 
     ! Whether we should always set the DM to bulk
     ! values (by reading in from electrode DM)
-    if ( TS_scf_mode == 1 ) then
+    if ( TS_scf_mode == 1 .or. .not. IsVolt ) then
        chars = 'bulk'
     else
        chars = 'diagon'
 
=== modified file 'Src/mixer.F'
--- Src/mixer.F	2018-11-27 11:01:23 +0000
+++ Src/mixer.F	2019-08-18 23:02:58 +0000
@@ -30,7 +30,8 @@
       use m_mixing_scf, only: scf_mix
       use m_mixing, only: mixing
       
-      use m_spin,           only: h_spin_dim, SpOrb
+      use m_spin,           only: spin
+
       use parallel,         only: IONode
 
       implicit none
@@ -42,6 +43,7 @@
 
       real(dp)              :: dtmp
       integer               :: iiscf, i, is
+      integer :: nspin_mix
 
       external :: mulliken
 !-------------------------------------------------------------------- BEGIN
@@ -52,15 +54,17 @@
          ! Mix Hamiltonian
          Xin => Hold
          Xout => H
+         nspin_mix = spin%H
       else
          ! Mix density matrix
          Xin => Dold
          Xout => Dscf
+         nspin_mix = spin%DM
       end if
 
 
       ! Create residual function to minimize
-      allocate(F(maxnh,h_spin_dim))
+      allocate(F(maxnh,nspin_mix))
 
 !$OMP parallel default(shared), private(dtmp,i)
 
@@ -103,15 +107,15 @@
       ! Upon exit Xout contains the mixed quantity
       select case ( mix_spin )
       case ( MIX_SPIN_ALL )
-         call mixing( scf_mix, maxnh, h_spin_dim, Xin, F, Xout)
+         call mixing( scf_mix, maxnh, nspin_mix, Xin, F, Xout)
       case ( MIX_SPIN_SPINOR )
-         call mixing( scf_mix, maxnh, h_spin_dim, Xin, F, Xout,
+         call mixing( scf_mix, maxnh, nspin_mix, Xin, F, Xout,
      &        nsub=2)
       case ( MIX_SPIN_SUM )
-         call mixing( scf_mix, maxnh, h_spin_dim, Xin, F, Xout,
+         call mixing( scf_mix, maxnh, nspin_mix, Xin, F, Xout,
      &        nsub=1)
       case ( MIX_SPIN_SUM_DIFF )
-         call mixing( scf_mix, maxnh, h_spin_dim, Xin, F, Xout,
+         call mixing( scf_mix, maxnh, nspin_mix, Xin, F, Xout,
      &        nsub=2)
       end select
 
@@ -148,31 +152,23 @@
       ! Correctly handle mixed quantity
       ! move over mixed quantity to "input"
       if ( mix_scf_first ) then
-         
-         ! always allow mixing
-!$OMP do
-         do is = 1 , size(Xin, 2)
-            do i = 1 , size(Xin, 1)
-               Xin(i,is) = Xout(i,is)
-            end do
-         end do
-!$OMP end do nowait
-         
+
+        ! always allow mixing
+        ! I.e. we do nothing
+        
       else if ( iscf == 1 ) then
          
-         ! We are not allowed to mix the first SCF
-         ! Remember that Xout contains the MIXED
-         ! quantity and F is the current residual
-         ! hence:
-         !   Xout = Xin + F
+        ! We are not allowed to mix the first SCF
+        ! Remember that Xout contains the MIXED
+        ! quantity and F is the current residual
+        ! hence for no mixing we re-create Xout:
+        !   Xout = Xin + F
 !$OMP do
-         do is = 1 , size(Xin, 2)
-            do i = 1 , size(Xin, 1)
-               Xin(i,is) = Xin(i,is) + F(i,is)
-               ! we require that Xin == Xout:
-               Xout(i,is) = Xin(i,is)
-            end do
-         end do
+        do is = 1 , nspin_mix
+          do i = 1 , size(Xin, 1)
+            Xout(i,is) = Xin(i,is) + F(i,is)
+          end do
+        end do
 !$OMP end do nowait
 
       end if
@@ -188,7 +184,7 @@
 
       if (muldeb .and. (.not. MixH) ) then 
          if (IONode) write (6,"(/a)") 'Using DM after mixing:'
-         if ( SpOrb .and. orbmoms) then
+         if ( spin%SO .and. orbmoms) then
             call moments( 1, na_u, no_u, maxnh, numh, listhptr,
      .           listh, S, Dscf, isa, lasto, iaorb, iphorb,
      .           indxuo )
 
=== modified file 'Src/print_spin.F90'
--- Src/print_spin.F90	2018-04-11 09:52:01 +0000
+++ Src/print_spin.F90	2019-08-18 23:02:58 +0000
@@ -2,10 +2,10 @@
   !
   ! Prints spin in output and CML files
   !
-  use m_spin,          only: nspin
+  use m_spin,          only: spin
   use atomlist,        only: no_l
   use sparse_matrices, only: listhptr, numh
-  use sparse_matrices, only: S, Dscf
+  use sparse_matrices, only: S, Dscf   ! Dscf could have 1, 2, 4, or 8 components
   use siesta_cml
   use parallel,        only: IOnode
   use precision,       only: dp
@@ -15,58 +15,73 @@
 
   implicit none
   
-  real(dp), intent(out)  :: qspin(4)
+  real(dp), intent(out)  :: qspin(spin%Grid)
 
   integer  :: ispin, io, j, ind
   real(dp) :: qaux
   real(dp) :: Stot        ! Total spin magnitude
   real(dp) :: Svec(3)     ! Total spin vector
 #ifdef MPI
-  real(dp) :: qtmp(4)
-#endif
-
-  if (nspin .ge. 2) then
-     do ispin = 1,nspin
-        qspin(ispin) = 0.0_dp
-        do io = 1,no_l
-           do j = 1,numh(io)
-              ind = listhptr(io)+j
-              qspin(ispin) = qspin(ispin) + Dscf(ind,ispin) * S(ind)
-           enddo
-        enddo
-     enddo
-
-#ifdef MPI
-     !       Global reduction of spin components
-     call globalize_sum(qspin(1:nspin),qtmp(1:nspin))
-     qspin(1:nspin) = qtmp(1:nspin)
-#endif
-
-     if (nspin .eq. 2) then
-
-        if (IOnode) then
-           Svec(1) = 0.0_dp
-           Svec(2) = 0.0_dp
-           Svec(3) = qspin(1) - qspin(2)
-           Stot = Svec(3)
-           write(6,'(5x,a,f10.5,2f10.1,f10.5)') 'spin moment: S , {S} = ', Stot, Svec
-        endif
-        if (cml_p) call cmlAddProperty(xf=mainXML,            &
-             value=qspin(1)-qspin(2), dictref='siesta:stot', &
-             units='siestaUnits:spin')
-
-     elseif (nspin .eq. 4) then
-
-        call spnvec( nspin, qspin, qaux, Stot, Svec )
-        if (IONode) then
-           write(6,'(5x,a,4f10.5)') 'spin moment: S , {S} = ', Stot, Svec
-           if (cml_p) then
-              call cmlAddProperty(xf=mainXML, value=Stot,  &
-                   dictref='siesta:stot', units='siestaUnits:spin')
-              call cmlAddProperty(xf=mainXML, value=Svec,  &
-                   dictref='siesta:svec', units='siestaUnits:spin')
-           endif !cml_p
-        endif
-     endif
+  real(dp) :: qtmp(spin%Grid)
+#endif
+
+  qspin(:) = 0.0_dp
+
+  if ( spin%Grid < 2 ) return
+
+  if ( spin%SO ) then
+     
+    do io = 1,no_l
+      do j = 1,numh(io)
+        ind = listhptr(io)+j
+        ! In the SOC case, hermitify Dscf
+        qspin(1:2) = qspin(1:2) + dscf(ind,1:2) * S(ind)
+        qspin(3) = qspin(3) + 0.5_dp*(dscf(ind,3)+dscf(ind,7)) * S(ind)
+        qspin(4) = qspin(4) + 0.5_dp*(dscf(ind,4)+dscf(ind,8)) * S(ind)
+      end do
+    end do
+
+  else
+     
+    do io = 1,no_l
+      do j = 1,numh(io)
+        ind = listhptr(io)+j
+        qspin(:) = qspin(:) + Dscf(ind,:) * S(ind)
+      end do
+    end do
+     
   endif
+#ifdef MPI
+  ! Global reduction of spin components
+  call globalize_sum(qspin(1:spin%Grid),qtmp(1:spin%Grid))
+  qspin(1:spin%Grid) = qtmp(1:spin%Grid)
+#endif
+
+  ! We are left with printing out to stdout
+  if ( .not. IONode ) return
+  
+  if ( spin%Grid == 2) then
+
+    Svec(1) = 0.0_dp
+    Svec(2) = 0.0_dp
+    Svec(3) = qspin(1) - qspin(2)
+    Stot = Svec(3)
+    write(6,'(5x,a,f10.5,2f10.1,f10.5)') 'spin moment: S , {S} = ', Stot, Svec
+    if (cml_p) call cmlAddProperty(xf=mainXML,            &
+        value=qspin(1)-qspin(2), dictref='siesta:stot', &
+        units='siestaUnits:spin')
+    
+  else if ( spin%Grid == 4 ) then
+
+    call spnvec( spin%Grid, qspin, qaux, Stot, Svec )
+    write(6,'(5x,a,4f10.5)') 'spin moment: S , {S} = ', Stot, Svec
+    if (cml_p) then
+      call cmlAddProperty(xf=mainXML, value=Stot,  &
+          dictref='siesta:stot', units='siestaUnits:spin')
+      call cmlAddProperty(xf=mainXML, value=Svec,  &
+          dictref='siesta:svec', units='siestaUnits:spin')
+    end if !cml_p
+
+  end if
+
 end subroutine print_spin
 
=== modified file 'Src/read_options.F90'
--- Src/read_options.F90	2019-08-16 10:13:21 +0000
+++ Src/read_options.F90	2019-08-18 23:02:58 +0000
@@ -445,9 +445,9 @@
 
   ! Density Matrix Mixing  (proportion of output DM in new input DM)
   wmix = fdf_get('DM.MixingWeight',0.25_dp)
-  if (ionode) then
-     write(6,6) 'redata: New DM Mixing Weight',wmix
-  endif
+!!$  if (ionode) then
+!!$     write(6,6) 'redata: New DM Mixing Weight',wmix
+!!$  endif
 
   if (cml_p) then
      call cmlAddParameter( xf=mainXML,name='DM.MixingWeight', &
 
=== modified file 'Src/rhoofd.F90'
--- Src/rhoofd.F90	2016-09-13 13:22:20 +0000
+++ Src/rhoofd.F90	2019-08-18 23:02:58 +0000
@@ -294,7 +294,7 @@
                  r2sp = sum(dxsp**2)
                  if ( r2sp < r2cut(is) ) then
 !$OMP critical
-                    call all_phi( is, +1, dxsp, nphiloc, phia(:,isp) )
+                    call all_phi( is, +1, dxsp, maxoa, nphiloc, phia(:,isp) )
 !$OMP end critical
                  else
                     phia(:,isp) = 0.0_dp
 
=== modified file 'Src/rhoofdsp.f'
--- Src/rhoofdsp.f	2016-01-25 16:00:16 +0000
+++ Src/rhoofdsp.f	2019-08-18 23:02:58 +0000
@@ -306,7 +306,8 @@
                 dxsp(:) = xdsp(:,isp) + xdop(:,iop) - dxa(:,ia)
                 r2sp = sum(dxsp**2)
                 if (r2sp.lt.r2cut(is)) then
-                  call all_phi( is, +1, dxsp, nphiloc, phia(:,isp) )
+                  call all_phi( is, +1, dxsp, maxoa,
+     &                nphiloc, phia(:,isp) )
                 else
                   phia(:,isp) = 0.0_dp
                 endif
 
=== modified file 'Src/siesta_analysis.F'
--- Src/siesta_analysis.F	2018-06-25 11:33:42 +0000
+++ Src/siesta_analysis.F	2019-08-18 23:02:58 +0000
@@ -46,8 +46,7 @@
       use m_energies
       use m_steps, only: final
       use m_ntm
-      use m_spin,         only: nspin, spinor_dim, h_spin_dim
-      use m_spin,         only: SpOrb, NonCol, SPpol, NoMagn
+      use m_spin,         only: spin
       use m_dipol
       use m_eo
       use m_forces,          only: fa
@@ -68,15 +67,15 @@
 
       real(dp)          :: dummy_str(3,3)
       real(dp)          :: dummy_strl(3,3)
-      real(dp)          :: qspin(4)         ! Local
+      real(dp)          :: qspin(spin%Grid)         ! Local
 
-      real(dp)          :: polxyz(3,nspin)  ! Autom., small
-      real(dp)          :: polR(3,nspin)    ! Autom., small
+      real(dp)          :: polxyz(3,spin%Grid)  ! Autom., small
+      real(dp)          :: polR(3,spin%Grid)    ! Autom., small
       real(dp)          :: qaux
       real(dp), pointer :: ebk(:,:,:)       ! Band energies
 
       integer           :: j, ix, ind, ik, io, ispin
-      integer           :: wfs_band_min, wfs_band_max
+      integer           :: wfs_band_min, wfs_band_max, max_n_states
       real(dp)          :: g2max, current_ef
       type(filesOut_t)  :: filesOut  ! blank output file names
 
@@ -127,7 +126,7 @@
 
       if (fdf_get("Read-H-from-file",.false.)) then
          if (SIESTA_worker) then
-            call read_spmatrix(maxnh, no_l, h_spin_dim, numh,
+            call read_spmatrix(maxnh, no_l, spin%H, numh,
      .           listhptr, listh, H, found, userfile="H_IN")
             if (.not. found) call die("Could not find H_IN")
             current_ef = ef
@@ -137,7 +136,7 @@
 
 #ifdef SIESTA__PEXSI
       if (fdf_get("PEXSI.DOS",.false.)) then
-         call pexsi_dos(no_u, no_l, spinor_dim,
+         call pexsi_dos(no_u, no_l, spin%spinor,
      $        maxnh, numh, listhptr, listh, H, S, qtot, ef)
          
       endif
@@ -263,6 +262,17 @@
 !        latest DM, although this is probably too much).
 !        See the logic in siesta_forces.
 
+!     Setup the number of states depending on the used method
+!     For polarized calculations we use no_u and separate spin-channels.
+!     For NC/SO we have mixed spin-channels and separating makes no
+!     sense.
+      if ( spin%Grid == 4 ) then
+!       We are NC/SO
+        max_n_states = no_u * 2
+      else
+        max_n_states = no_u
+      end if
+
 !     Find and print wavefunctions at selected k-points
 !**   This uses H,S, and xa
       if (nwk.gt.0) then
@@ -270,7 +280,7 @@
         if (IONode) print "(a)",
      $              "Writing WFSX for selected k-points in "
      $                           // trim(wfs_filename)
-        call wwave( no_s, h_spin_dim, spinor_dim, no_u, no_l, maxnh, 
+        call wwave( no_s, spin, no_u, no_l, maxnh, 
      &              nwk,
      &              numh, listhptr, listh, H, S, Ef, xijo, indxuo,
      &              gamma_wavefunctions, nwk, wfk, no_u, occtol )
@@ -278,19 +288,20 @@
 
 
 !**   This uses H,S, and xa
-      if (write_coop) then
+      if ( write_coop ) then
         ! Output the wavefunctions for the kpoints in the SCF set
         ! Note that we allow both a band number and an energy range
         ! The user is responsible for using appropriate values.
         wfs_band_min = fdf_get("WFS.BandMin",1)
-        wfs_band_max = fdf_get("WFS.BandMax",no_u)
-        call setup_wfs_list(nkpnt,no_u,wfs_band_min,wfs_band_max,
+        wfs_band_max = fdf_get("WFS.BandMax",max_n_states)
+        call setup_wfs_list(nkpnt,max_n_states,
+     $                      wfs_band_min,wfs_band_max,
      $                      use_scf_weights=.true.,
      $                      use_energy_window=.true.)
          wfs_filename = trim(slabel)//".fullBZ.WFSX"
          if (IONode) print "(a)", "Writing WFSX for COOP/COHP in " 
      $                           // trim(wfs_filename)
-         call wwave( no_s, h_spin_dim, spinor_dim, no_u, no_l, maxnh, 
+         call wwave( no_s, spin, no_u, no_l, maxnh, 
      .        nkpnt,
      .        numh, listhptr, listh, H, S, Ef, xijo, indxuo,
      .        gamma_SCF, nkpnt, kpoint, no_u, occtol)
@@ -299,82 +310,101 @@
 !     Compute bands
 !**   This uses H,S, and xa
       nullify( ebk )
-      call re_alloc( ebk, 1, no_u, 1, spinor_dim, 1, maxbk,
-     &               'ebk', 'siesta_analysis' )
-
-      if (nbk.gt.0) then
+      if ( spin%Grid == 4 ) then
+        call re_alloc( ebk, 1, no_u*2, 1, 1, 1, maxbk,
+     &      'ebk', 'siesta_analysis' )
+      else
+        call re_alloc( ebk, 1, no_u, 1, spin%spinor, 1, maxbk,
+     &      'ebk', 'siesta_analysis' )
+      end if
+      
+      if ( nbk > 0 ) then
         if (IONode) print "(a)", "Computing bands..."
         getPSI = fdf_get('WFS.Write.For.Bands', .false.)
         if (getPSI) then
-           wfs_filename = trim(slabel)//".bands.WFSX"
-         if (IONode) print "(a)", "Writing WFSX for bands in "
-     $                           // trim(wfs_filename)
-           wfs_band_min = fdf_get("WFS.BandMin",1)
-           wfs_band_max = fdf_get("WFS.BandMax",no_u)
-           call setup_wfs_list(nbk,no_u,wfs_band_min,wfs_band_max,
-     $          use_scf_weights=.false.,
-     $          use_energy_window=.false.)
-        endif
-        call bands( no_s, h_spin_dim, spinor_dim, no_u, no_l, maxnh, 
+          wfs_filename = trim(slabel)//".bands.WFSX"
+          if (IONode) print "(a)", "Writing WFSX for bands in "
+     $        // trim(wfs_filename)
+          wfs_band_min = fdf_get("WFS.BandMin",1)
+          wfs_band_max = fdf_get("WFS.BandMax",max_n_states)
+          call setup_wfs_list(nbk,max_n_states,
+     $        wfs_band_min,wfs_band_max,
+     $        use_scf_weights=.false.,
+     $        use_energy_window=.false.)
+        end if
+        call bands( no_s, spin, no_u, no_l, maxnh, 
      .              maxbk,
      .              numh, listhptr, listh, H, S, Ef, xijo, indxuo,
-     .              .true., nbk, bk, ebk, occtol, getPSI )
-        if (IOnode) then
+     .      .true., nbk, bk, ebk, occtol, getPSI )
+
+        if ( IOnode ) then
           if ( writbk ) then
-            write(6,'(/,a,/,a4,a12)')
-     &       'siesta: Band k vectors (Bohr**-1):', 'ik', 'k'
+            write(6,'(/,a,/,a4,tr1,a12)')
+     &          'siesta: Band k vectors (Bohr**-1):', 'ik', 'k'
             do ik = 1,nbk
-              write(6,'(i4,3f12.6)') ik, (bk(ix,ik),ix=1,3)
-            enddo
-          endif
+              write(6,'(i4,3(tr1,f12.6))') ik, (bk(ix,ik),ix=1,3)
+            end do
+          end if
         
           if ( writb ) then
-            write(6,'(/,a,/,a4,a3,a7)')
-     &       'siesta: Band energies (eV):', 'ik', 'is', 'eps'
-            do ispin = 1, spinor_dim
+            if ( spin%Grid == 4 ) then
+              write(6,'(/,a,/,a4,tr1,a9)')
+     &            'siesta: Band energies (eV):', 'ik', 'eps'
               do ik = 1,nbk
-                write(6,'(i4,i3,10f7.2)')
-     &            ik, ispin, (ebk(io,ispin,ik)/eV,io=1,min(10,no_u))
-                if (no_u.gt.10) write(6,'(7x,10f7.2)')
-     &              (ebk(io,ispin,ik)/eV,io=11,no_u)
+                write(6,'(i4,10(tr1,f9.4))')
+     &              ik, (ebk(io,1,ik)/eV,io=1,min(10,2*no_u))
+                if ( 2*no_u > 10 ) write(6,'(4x,10(tr1,f9.4))')
+     &              (ebk(io,1,ik)/eV,io=11,no_u*2)
+              end do
+
+            else
+              write(6,'(/,a,/,a4,a3,tr1,a9)')
+     &            'siesta: Band energies (eV):', 'ik', 'is', 'eps'
+              do ispin = 1, spin%spinor
+                do ik = 1,nbk
+                  write(6,'(i4,i3,10(tr1,f9.4))')
+     &                ik, ispin, (ebk(io,ispin,ik)/eV,io=1,min(10,no_u))
+                  if ( no_u > 10 ) write(6,'(7x,10(tr1,f9.4))')
+     &                (ebk(io,ispin,ik)/eV,io=11,no_u)
+                enddo
               enddo
-            enddo
+            end if
           endif
+          
         endif
       endif
 
 !     Print eigenvalues
-      if (IOnode .and. writeig) then
-        if ((isolve.eq.SOLVE_DIAGON .or.
-     &       ((isolve.eq.SOLVE_MINIM) .and. minim_calc_eigenvalues))
-     &      .and. no_l.lt.1000) then
-          if ( h_spin_dim <= 2 ) then
-            write(6,'(/,a,/,a4,a3,a7)')
-     &       'siesta: Eigenvalues (eV):', 'ik', 'is', 'eps'
-            do ik = 1,nkpnt
-              do ispin = 1,spinor_dim
-                write(6,'(i4,i3,10f7.2)')
+      if ( IOnode .and. writeig .and. no_l < 1000 .and. 
+     &    (isolve.eq.SOLVE_DIAGON .or.
+     &    (isolve.eq.SOLVE_MINIM .and. minim_calc_eigenvalues)) ) then
+
+        if ( spin%Grid == 4 ) then
+          write(6,'(/,a)') 'siesta: Eigenvalues (eV):'
+          do ik = 1,nkpnt
+            write(6,'(a,i6)') 'ik =', ik
+            write(6,'(10(tr1,f9.4))') (eo(io,1,ik)/eV,io=1,2*neigwanted)
+          end do
+
+        else
+          write(6,'(/,a,/,a4,a3,tr1,a9)')
+     &        'siesta: Eigenvalues (eV):', 'ik', 'is', 'eps'
+          do ik = 1,nkpnt
+            do ispin = 1, spin%spinor
+              write(6,'(i4,i3,10(tr1,f9.4))')
      &            ik,ispin,(eo(io,ispin,ik)/eV,io=1,min(10,neigwanted))
-                if (no_u.gt.10) write(6,'(7x,10f7.2)')
+              if (no_u.gt.10) write(6,'(7x,10(tr1,f9.4))')
      &            (eo(io,ispin,ik)/eV,io=11,neigwanted)
-              enddo
-            enddo
-          else
-            write(6,'(/,a)') 'siesta: Eigenvalues (eV):'
-            do ik = 1,nkpnt
-              write(6,'(a,i6)') 'ik =', ik
-              write(6,'(10f7.2)')
-     &          ((eo(io,ispin,ik)/eV,io=1,neigwanted),ispin=1,2)
-            enddo
-          endif
-          write(6,'(a,f15.6,a)') 'siesta: Fermi energy =', ef/eV, ' eV'
-        endif
+            end do
+          end do
+        end if
+        write(6,'(a,f15.6,a)') 'siesta: Fermi energy =', ef/eV, ' eV'
       endif
 
       if (((isolve.eq.SOLVE_DIAGON).or.
      &     ((isolve.eq.SOLVE_MINIM).and.minim_calc_eigenvalues))
      &     .and.IOnode)
-     &     call ioeig(eo,ef,neigwanted,nspin,nkpnt,no_u,spinor_dim,
+     &     call ioeig(eo,ef,neigwanted,spin%H,nkpnt,no_u,spin%spinor,
      &     nkpnt,kpoint, kweight)
 
 
@@ -430,7 +460,7 @@
 !     Calculation of the bulk polarization using the Berry phase
 !     formulas by King-Smith and Vanderbilt
       if (nkpol.gt.0 .and. .not.bornz) then
-        if (NonCol .or. SpOrb) then
+        if ( spin%NCol .or. spin%SO ) then
           if (IOnode) then
             write(6,'(/a)')
      .       'siesta_analysis: bulk polarization implemented only for'
@@ -439,7 +469,7 @@
           endif
         else
          call KSV_pol(na_u, na_s, xa_last, rmaxo, scell_last, 
-     &               ucell_last,no_u, no_l, no_s, nspin, qspin, 
+     &               ucell_last,no_u, no_l, no_s, spin%Grid, qspin, 
      &               maxnh, nkpol, numh, listhptr, listh, 
      &               H, S, xijo, indxuo, isa, iphorb, 
      &               iaorb, lasto, shape,
@@ -449,7 +479,7 @@
 
 !     Calculation of the optical conductivity
       call optical(na_u, na_s, xa_last, scell_last, ucell_last,
-     &             no_u, no_l, no_s, nspin, qspin,
+     &             no_u, no_l, no_s, spin%Grid, qspin,
      &             maxnh, numh, listhptr, listh, H, S, xijo,
      $             indxuo, ebk, ef, temp,
      &             isa, iphorb, iphKB, lasto, lastkb, shape )
@@ -479,7 +509,7 @@
         g2max = g2cut
         dummy_str  = 0.0
         dummy_strl = 0.0
-        call dhscf( nspin, no_s, iaorb, iphorb, no_l,
+        call dhscf( spin%Grid, no_s, iaorb, iphorb, no_l,
      .              no_u, na_u, na_s, isa, xa_last, indxua, 
      &              ntm, 0, 0, 0, filesOut, 
      &              maxnh, numh, listhptr, listh, Dscf, Datm,
 
=== modified file 'Src/siesta_dicts.F90'
--- Src/siesta_dicts.F90	2018-09-06 10:00:24 +0000
+++ Src/siesta_dicts.F90	2019-08-18 23:02:58 +0000
@@ -316,8 +316,19 @@
          ('E.spin_orbit'.kvp.Eso)
     variables = variables // &
          ('E.ldau'.kvp.Eldau)
-    variables = variables // &
-         ('E.negf'.kvp.DE_NEGF)
+    
+    variables = variables // &
+         ('E.negf.dN'.kvp.NEGF_DE)
+    variables = variables // &
+         ('E.negf.spin_orbit'.kvp.NEGF_Eso)
+    variables = variables // &
+         ('E.negf.harris'.kvp.NEGF_Eharrs)
+    variables = variables // &
+         ('E.negf.total'.kvp.NEGF_Etot)
+    variables = variables // &
+         ('E.negf.kinetic'.kvp.NEGF_Ekin)
+    variables = variables // &
+         ('E.negf.band_structure'.kvp.NEGF_Ebs)
 
     ! Add the number of charges to the system
     variables = variables // &
 
=== modified file 'Src/siesta_forces.F'
--- Src/siesta_forces.F	2018-09-24 07:27:11 +0000
+++ Src/siesta_forces.F	2019-08-18 23:02:58 +0000
@@ -84,7 +84,6 @@
       use m_pexsi, only: pexsi_finalize_scfloop
 #endif     
 
-      use m_energies,            only: DE_NEGF
       use m_ts_options, only : N_Elec
       use m_ts_method
       use m_ts_global_vars,      only: TSmode, TSinit, TSrun
@@ -380,7 +379,7 @@
               call transiesta(iscf,spin%H, 
      &             block_dist, sparse_pattern, Gamma_Scf, ucell, nsc,
      &             isc_off, no_u, na_u, lasto, xa, maxnh, H, S,
-     &             Dscf, Escf, Ef, Qtot, .true., DE_NEGF) 
+     &             Dscf, Escf, Ef, Qtot, .true.) 
            
               ! We will not have not converged as we have just
               ! changed the Fermi-level
 
=== modified file 'Src/spher_harm.f'
--- Src/spher_harm.f	2017-02-19 19:26:15 +0000
+++ Src/spher_harm.f	2019-08-18 23:02:58 +0000
@@ -68,12 +68,15 @@
       PARAMETER (TINY=1.e-14_dp, ZERO=0._dp, HALF=0.5_dp, ONE=1._dp,
      .           TWO=2._dp, THREE=3._dp, SIX=6._dp)
 
+      real(dp), parameter :: pi = 3.14159265358979323846264338327950_dp
+      real(dp), parameter :: pi4 = 4 * pi
+
 C Internal variables
       INTEGER
-     .  I, ILM, ILM0, L, LMXMX, M, MS
+     .  I, ILM, ILM0, L, LMXMX, M
       REAL(DP)
      .  C(0:MAXLP1*MAXLP1), COSM, COSMM1, COSPHI,
-     .  ZP(0:MAXLP1,0:MAXLP1), FAC, FOURPI, GY(3),
+     .  ZP(0:MAXLP1,0:MAXLP1), FAC, GY(3),
      .  P(0:MAXLP1,0:MAXLP1),
      .  RL(-1:MAXL), RSIZE, RX, RY, RZ, RXY,
      .  SINM, SINMM1, SINPHI, YY
@@ -83,11 +86,10 @@
 C Evaluate normalization constants once and for all
       IF (LMAX.GT.LMXMX) THEN
          IF (LMAX.GT.MAXL) call die('YLM: MAXL too small')
-         FOURPI=TWO**4*ATAN(ONE)
          DO 20 L=0,LMAX
             ILM0=L*L+L
             DO 15 M=0,L
-               FAC=(2*L+1)/FOURPI
+               FAC=(2*L+1)/pi4
                DO 10 I=L-M+1,L+M
                   FAC=FAC/I
    10          CONTINUE
@@ -202,27 +204,25 @@
       SINM=ZERO
       DO 90 M=0,LMAX
         DO 80 L=M,LMAX
-          DO 75 MS = -1,1,2
-            IF (MS.EQ.-1) THEN
-              ILM=L*L+L-M
-              YY=C(ILM)*P(L,M)*SINM
-              GY(1)=(-ZP(L,M))*RX *RZ *SINM - P(L,M)*M*COSM*SINPHI/RXY
-              GY(2)=(-ZP(L,M))*RY *RZ *SINM + P(L,M)*M*COSM*COSPHI/RXY
-              GY(3)= ZP(L,M)*RXY*RXY*SINM
-            ELSE
-              ILM=L*L+L+M
-              YY=C(ILM)*P(L,M)*COSM
-              GY(1)=(-ZP(L,M))*RX *RZ *COSM + P(L,M)*M*SINM*SINPHI/RXY
-              GY(2)=(-ZP(L,M))*RY *RZ *COSM - P(L,M)*M*SINM*COSPHI/RXY
-              GY(3)= ZP(L,M)*RXY*RXY*COSM
-            ENDIF
-            GY(1)= GY(1)*C(ILM)/RSIZE
-            GY(2)= GY(2)*C(ILM)/RSIZE
-            GY(3)= GY(3)*C(ILM)/RSIZE
-            RLY(ILM)=RL(L)*YY
-            GRLY(1,ILM)= RX*L*RL(L-1)*YY + RL(L)*GY(1)
-            GRLY(2,ILM)= RY*L*RL(L-1)*YY + RL(L)*GY(2)
-            GRLY(3,ILM)= RZ*L*RL(L-1)*YY + RL(L)*GY(3)
+          ILM=L*L+L-M
+          GY(1)=(-ZP(L,M))*RX *RZ *SINM - P(L,M)*M*COSM*SINPHI/RXY
+          GY(2)=(-ZP(L,M))*RY *RZ *SINM + P(L,M)*M*COSM*COSPHI/RXY
+          GY(3)= ZP(L,M)*RXY*RXY*SINM
+          YY=C(ILM)*P(L,M)*SINM
+          RLY(ILM)=RL(L)*YY
+          GRLY(1,ILM)= RX*L*RL(L-1)*YY + RL(L)*GY(1)*C(ILM)/RSIZE
+          GRLY(2,ILM)= RY*L*RL(L-1)*YY + RL(L)*GY(2)*C(ILM)/RSIZE
+          GRLY(3,ILM)= RZ*L*RL(L-1)*YY + RL(L)*GY(3)*C(ILM)/RSIZE
+          
+          ILM=L*L+L+M
+          GY(1)=(-ZP(L,M))*RX *RZ *COSM + P(L,M)*M*SINM*SINPHI/RXY
+          GY(2)=(-ZP(L,M))*RY *RZ *COSM - P(L,M)*M*SINM*COSPHI/RXY
+          GY(3)= ZP(L,M)*RXY*RXY*COSM
+          YY=C(ILM)*P(L,M)*COSM
+          RLY(ILM)=RL(L)*YY
+          GRLY(1,ILM)= RX*L*RL(L-1)*YY + RL(L)*GY(1)*C(ILM)/RSIZE
+          GRLY(2,ILM)= RY*L*RL(L-1)*YY + RL(L)*GY(2)*C(ILM)/RSIZE
+          GRLY(3,ILM)= RZ*L*RL(L-1)*YY + RL(L)*GY(3)*C(ILM)/RSIZE
    75     CONTINUE
    80   CONTINUE
         COSMM1=COSM
 
=== added file 'Src/ts_energies.F90'
--- Src/ts_energies.F90	1970-01-01 00:00:00 +0000
+++ Src/ts_energies.F90	2019-08-18 23:02:58 +0000
@@ -0,0 +1,206 @@
+!
+! Copyright (C) 1996-2016	The SIESTA group
+!  This file is distributed under the terms of the
+!  GNU General Public License: see COPYING in the top directory
+!  or http://www.gnu.org/copyleft/gpl.txt.
+! See Docs/Contributors.txt for a list of contributors.
+!
+! This code segment has been fully created by:
+! Nick Papior Andersen, 2019, [e-mail]
+! Please conctact the author, prior to re-using this code.
+
+! Module for calculating energy contributions for the transiesta
+! calculations.
+! Effectively many of the energy contributions stem from Hamiltonian
+! and/or DM elements.
+! However, in TranSiesta we only update/use a subset of the full
+! matrices. As such the energies should only be calculated
+! on the used elements rather than the full.
+!
+! There are many more elements that need to be split, while currently
+! we only calculate a subset of what is actually needed.
+! The main problem in calculating NEGF energies is:
+!  1. the open-boundary problem, and
+!  2. how to handle real-space energies such as Exc from dhscf.
+module ts_energies_m
+
+  implicit none
+
+contains
+
+  subroutine ts_compute_energies()
+
+    use precision, only: dp
+    use m_ts_options, only: N_Elec, Elecs
+    use m_spin, only: spin
+
+    use sparse_matrices, only: dit => block_dist
+    use sparse_matrices, only: n_nzs => maxnh
+    use sparse_matrices, only: Dold, Dscf, H
+    use sparse_matrices, only: H_kin_1D, H_vkb_1D, H_so_2D
+    use sparse_matrices, only: sp => sparse_pattern
+    
+    use m_ts_method
+    use parallel, only : Node
+#ifdef MPI
+    use mpi_siesta
+#endif
+    use class_OrbitalDistribution
+    use class_Sparsity
+    use class_dSpData1D
+    use class_dSpData2D
+
+    use geom_helper, only : UCORB
+    use m_ts_electype, only: Elec
+    use m_energies, only: NEGF_Ebs, NEGF_Ekin, NEGF_Eso, NEGF_Etot, NEGF_Enl
+    use m_energies, only: NEGF_DEharr
+
+! **********************
+! * LOCAL variables    *
+! **********************
+    integer, pointer :: l_ncol(:), l_ptr(:), l_col(:)
+    integer :: no_lo, no_u, lio, io, ind, jo, ir, jr, r, ispin
+    real(dp), pointer :: H_vkb(:), H_kin(:), H_so(:,:)
+    real(dp) :: Etmp(5,0:1+1+N_Elec*2)
+#ifdef MPI
+    real(dp) :: tmp(5,0:1+1+N_Elec*2)
+    integer :: MPIerror
+#endif
+
+    H_vkb => val(H_vkb_1D)
+    H_kin => val(H_kin_1D)
+    if ( spin%SO ) then
+      H_so => val(H_so_2D)
+    end if
+
+    ! Retrieve information about the sparsity pattern
+    call attach(sp, &
+        n_col=l_ncol,list_ptr=l_ptr,list_col=l_col, &
+        nrows=no_lo,nrows_g=no_u)
+    
+    ! Initialize energies
+    Etmp(:,:) = 0._dp
+    
+!$OMP parallel do default(shared), &
+!$OMP&private(lio,io,ir,ind,jo,jr,r,ispin), &
+!$OMP&reduction(+:Etmp)
+    do lio = 1 , no_lo
+
+      ! obtain the global index of the orbital.
+      io = index_local_to_global(dit,lio,Node)
+      ir = orb_type(io)
+      
+      ! Loop number of entries in the row... (index frame)
+      do ind = l_ptr(lio) + 1 , l_ptr(lio) + l_ncol(lio)
+        
+        ! as the local sparsity pattern is a super-cell pattern,
+        ! we need to check the unit-cell orbital
+        ! The unit-cell column index
+        jo = UCORB(l_col(ind),no_u)
+        jr = orb_type(jo)
+        
+        if      ( all((/ir,jr/) == TYP_BUFFER) ) then
+          r = 1 ! buffer
+        else if ( any((/ir,jr/) == TYP_BUFFER) ) then
+          r = 0 ! other
+        else if ( all((/ir,jr/) == TYP_DEVICE) ) then
+          r = 2 ! device
+        else if ( any((/ir,jr/) == TYP_DEVICE) ) then
+          r = 4+(ir+jr-1)*2 ! device/electrode
+        else if ( ir == jr ) then
+          r = 3+(ir-1)*2 ! electrode/electrode
+        else
+          r = 0 ! other
+        end if
+
+        ! Ebs
+        if ( spin%SO ) then
+          Etmp(1,r) = Etmp(1,r) + H(ind,1) * Dscf(ind,1) &
+              + H(ind,2) * Dscf(ind,2) &
+              + H(ind,3) * Dscf(ind,7) &
+              + H(ind,4) * Dscf(ind,8) &
+              - H(ind,5) * Dscf(ind,5) &
+              - H(ind,6) * Dscf(ind,6) &
+              + H(ind,7) * Dscf(ind,3) &
+              + H(ind,8) * Dscf(ind,4)
+        else if ( spin%NCol ) then
+          Etmp(1,r) = Etmp(1,r) + H(ind,1) * Dscf(ind,1) &
+              + H(ind,2) * Dscf(ind,2) &
+              + (H(ind,3) * Dscf(ind,3) &
+              + H(ind,4) * Dscf(ind,4) ) * 2
+        else
+          Etmp(1,r) = Etmp(1,r) + sum(H(ind,:) * Dscf(ind,:) )
+        end if
+
+        do ispin = 1, spin%spinor
+          ! Ekin
+          Etmp(2,r) = Etmp(2,r) + H_kin(ind) * Dscf(ind,ispin)
+          ! Enl
+          Etmp(3,r) = Etmp(3,r) + H_vkb(ind) * Dscf(ind,ispin)
+        end do
+
+        ! Eso
+        if ( spin%SO ) then
+          Etmp(4,r) = Etmp(4,r) + H_so(ind,1)*Dscf(ind,7) + H_so(ind,2)*Dscf(ind,8) &
+              + H_so(ind,5)*Dscf(ind,3) + H_so(ind,6)*Dscf(ind,4) &
+              - H_so(ind,3)*Dscf(ind,5) - H_so(ind,4)*Dscf(ind,6)
+
+        end if
+
+        ! DEharr
+        if ( spin%SO ) then
+          Etmp(5,r) = Etmp(5,r) + H(ind,1) * ( Dscf(ind,1) - Dold(ind,1) )  &
+                          + H(ind,2) * ( Dscf(ind,2) - Dold(ind,2) )  &
+                          + H(ind,3) * ( Dscf(ind,7) - Dold(ind,7) )  &
+                          + H(ind,4) * ( Dscf(ind,8) - Dold(ind,8) )  &
+                          - H(ind,5) * ( Dscf(ind,5) - Dold(ind,5) )  &
+                          - H(ind,6) * ( Dscf(ind,6) - Dold(ind,6) )  &
+                          + H(ind,7) * ( Dscf(ind,3) - Dold(ind,3) )  &
+                          + H(ind,8) * ( Dscf(ind,4) - Dold(ind,4) )
+        else if ( spin%NCol ) then
+          Etmp(5,r) = Etmp(5,r) + H(ind,1) * ( Dscf(ind,1) - Dold(ind,1) )  &
+              + H(ind,2) * ( Dscf(ind,2) - Dold(ind,2) )  &
+              + 2.0_dp * H(ind,3) * ( Dscf(ind,3) - Dold(ind,3) )  &
+              + 2.0_dp * H(ind,4) * ( Dscf(ind,4) - Dold(ind,4) )
+        else
+          do ispin = 1, spin%spinor
+            Etmp(5,r) = Etmp(5,r) + H(ind,ispin) * (Dscf(ind,ispin) - Dold(ind,ispin))
+          end do
+        end if
+
+      end do
+    end do
+!$OMP end parallel do
+
+    ! Now add the *other* contributions
+    do ir = 1, N_Elec
+      if ( Elecs(ir)%DM_update >= 1 ) then
+        ! add cross-terms
+        r = 4 + (TYP_DEVICE+ir - 1) * 2
+        Etmp(:,2) = Etmp(:,2) + Etmp(:,r)
+      end if
+      if ( Elecs(ir)%DM_update == 2 ) then
+        r = 3 + (ir - 1) * 2
+        ! add diagonal electrode terms
+        Etmp(:,2) = Etmp(:,2) + Etmp(:,r)
+      end if
+    end do
+
+#ifdef MPI
+    call MPI_AllReduce(Etmp(1,2),tmp(1,2),size(Etmp, 1), &
+        MPI_Double_Precision,MPI_SUM, MPI_Comm_World,MPIerror)
+    Etmp(:,2) = tmp(:,2)
+#endif
+
+    ! Copy data over
+    NEGF_Ebs = Etmp(1,2)
+    NEGF_Ekin = Etmp(2,2)
+    NEGF_Enl = Etmp(3,2)
+    NEGF_Eso = Etmp(4,2)
+    NEGF_DEharr = Etmp(5,2)
+
+  end subroutine ts_compute_energies
+
+end module ts_energies_m
+
+  
 
=== modified file 'Src/vmat.F90'
--- Src/vmat.F90	2016-06-22 08:57:57 +0000
+++ Src/vmat.F90	2019-08-18 23:02:58 +0000
@@ -339,7 +339,7 @@
                    r2sp = sum(dxsp**2)
                    if ( r2sp < r2cut(is) ) then
 !$OMP critical
-                      call all_phi( is, +1, dxsp, nphiloc, phia(:,isp) )
+                      call all_phi( is, +1, dxsp, maxoa, nphiloc, phia(:,isp) )
 !$OMP end critical
                    else
                       phia(:,isp) = 0.0_dp
 
=== modified file 'Src/vmatsp.f'
--- Src/vmatsp.f	2016-01-25 16:00:16 +0000
+++ Src/vmatsp.f	2019-08-18 23:02:58 +0000
@@ -309,7 +309,8 @@
                 enddo
                 r2sp = sum(dxsp**2)
                 if (r2sp.lt.r2cut(is)) then
-                  call all_phi( is, +1, dxsp, nphiloc, phia(:,isp) )
+                  call all_phi( is, +1, dxsp, maxoa,
+     &                nphiloc, phia(:,isp) )
                 else
                   phia(:,isp) = 0.0_dp
                 endif
 
=== modified file 'Src/write_subs.F'
--- Src/write_subs.F	2017-11-23 14:17:27 +0000
+++ Src/write_subs.F	2019-08-18 23:02:58 +0000
@@ -296,7 +296,7 @@
       use units
       use m_energies 
       use m_spin
-      use m_ts_global_vars, only: TSinit, TSrun
+      use m_ts_global_vars, only: TSrun
       implicit none
 
       integer              :: iscf
@@ -304,16 +304,10 @@
       real(dp), intent(in) :: dHmax ! Max. change in H elements
 
       character(len=64) :: fmt
-      character(len=6) :: scf_name
 
       logical              :: first_scf_step
       integer              :: i
 
-      scf_name = 'scf'
-      if ( TSrun ) then
-         scf_name = 'ts-scf'
-      end if
-      
       first_scf_step = (iscf == 1)
       ! Only print out full decomposition at very beginning and end.
       if ((istp==1.and.first_scf_step).or.final) then
@@ -329,7 +323,6 @@
      .     'siesta: DEna    =', DEna/eV,
      .     'siesta: DUscf   =', DUscf/eV,
      .     'siesta: DUext   =', DUext/eV,
-     .     'siesta: Enegf   =', DE_NEGF/eV,
      .     'siesta: Exc     =', Exc/eV,
      .     'siesta: eta*DQ  =', Ecorrec/eV,
      .     'siesta: Emadel  =', Emad/eV,
@@ -339,6 +332,18 @@
      .     'siesta: Eharris =', (Eharrs+Ekinion)/eV,
      .     'siesta: Etot    =', (Etot+Ekinion)/eV,
      .     'siesta: FreeEng =', (FreeE+Ekinion)/eV
+        if ( TSrun ) then
+        write(6,'(a,f17.6)')
+     .     'transiesta: E-dN      =', NEGF_DE/eV,
+     .     'transiesta: Band Stru =', NEGF_Ebs/eV,
+     .     'transiesta: Kinetic   =', NEGF_Ekin/eV,
+     .     'transiesta: Ion-elec  =', (Enascf+NEGF_Enl+DUscf-
+     .      Uscf-Uatm)/eV,
+     .     'transiesta: Eso       =', NEGF_Eso/eV,
+     .     'transiesta: Eharris   =', (NEGF_Eharrs+Ekinion)/eV,
+     .     'transiesta: Etot      =', (NEGF_Etot+Ekinion)/eV,
+     .     'transiesta: FreeEng   =', (NEGF_FreeE+Ekinion)/eV
+        end if
         if (cml_p) then
           call cmlStartPropertyList(mainXML,
      .         title='Energy Decomposition')
@@ -372,9 +377,6 @@
           call cmlAddProperty(xf=mainXML, value=DUext/eV, 
      .         units='siestaUnits:eV', 
      .         dictref='siesta:DUext', fmt='r6')
-          call cmlAddProperty(xf=mainXML, value=DE_NEGF/eV, 
-     .         units='siestaUnits:eV', 
-     .         dictref='siesta:Enegf', fmt='r6')
           call cmlAddProperty(xf=mainXML, value=Exc/eV, 
      .         units='siestaUnits:eV', 
      .         dictref='siesta:Exc', fmt='r6')
@@ -402,6 +404,29 @@
           call cmlAddProperty(xf=mainXML, value=(FreeE+Ekinion)/eV, 
      .         units='siestaUnits:eV', 
      .         dictref='siesta:FreeEK', fmt='r6')
+
+          if ( TSrun ) then
+          ! NEGF energies
+          call cmlAddProperty(xf=mainXML, value=NEGF_DE/eV, 
+     .         units='siestaUnits:eV', 
+     .         dictref='siesta:EdN-GF', fmt='r6')
+          call cmlAddProperty(xf=mainXML, value=NEGF_Ebs/eV, 
+     .         units='siestaUnits:eV', 
+     .         dictref='siesta:Ebs-GF', fmt='r6')
+          call cmlAddProperty(xf=mainXML, value=NEGF_Ekin/eV, 
+     .         units='siestaUnits:eV', 
+     .         dictref='siesta:Ekin-GF', fmt='r6')
+          call cmlAddProperty(xf=mainXML,
+     .         value=(NEGF_Eharrs+Ekinion)/eV, 
+     .         units='siestaUnits:eV', 
+     .         dictref='siesta:EharrsK-GF', fmt='r6')
+          call cmlAddProperty(xf=mainXML, value=(NEGF_Etot+Ekinion)/eV, 
+     .         units='siestaUnits:eV', 
+     .         dictref='siesta:EtotK-GF', fmt='r6')
+          call cmlAddProperty(xf=mainXML, value=(NEGF_FreeE+Ekinion)/eV, 
+     .         units='siestaUnits:eV', 
+     .         dictref='siesta:FreeEK-GF', fmt='r6')
+          end if
           call cmlEndPropertyList(mainXML)
         endif
       endif
@@ -414,6 +439,11 @@
           call cmlAddProperty(xf=mainXML, value=Eharrs/eV, 
      .         units="siestaUnits:eV", 
      .         dictRef="siesta:Eharrs", fmt="r7")
+          if ( TSrun ) then
+          call cmlAddProperty(xf=mainXML, value=NEGF_Eharrs/eV, 
+     .         units="siestaUnits:eV", 
+     .         dictRef="siesta:Eharrs-GF", fmt="r7")
+          end if
           if ( .not. harrisfun ) then
              ! store dDmax and dHmax
              call cmlAddProperty(xf=mainXML, value=dDmax, 
@@ -438,6 +468,14 @@
              call cmlAddProperty(xf=mainXML, value=FreeE/eV, 
      .             units="siestaUnits:eV", 
      .             dictRef="siesta:FreeE", fmt="r7")
+             if ( TSrun ) then
+             call cmlAddProperty(xf=mainXML, value=NEGF_Etot/eV, 
+     .             units="siestaUnits:eV", 
+     .             dictRef="siesta:Etot-GF", fmt="r7")
+             call cmlAddProperty(xf=mainXML, value=NEGF_FreeE/eV, 
+     .             units="siestaUnits:eV", 
+     .             dictRef="siesta:FreeE-GF", fmt="r7")
+             end if
              if ( fixspin ) then
                 call cmlAddProperty(xf=mainXML, value=Efs(1)/eV, 
      .               units="siestaUnits:eV", 
@@ -455,25 +493,49 @@
              end if
           endif
 
-          if ( fixspin ) then
-             if ( (iscf == 1) .or. muldeb ) then
-                write(6,'(/,a12,3a16,4a10)')
-     .           'iscf', 'Eharris(eV)', 'E_KS(eV)', 'FreeEng(eV)', 
-     .           'dDmax', 'Ef_up', 'Ef_dn(eV)','dHmax(eV)'
-             end if
-             write(6,'(a8,i4,3f16.6,4f10.6)')
-     .  trim(scf_name)//': ',iscf, Eharrs/eV, Etot/eV, FreeE/eV, 
-     .           dDmax, Efs(1:2)/eV, dHmax/eV
-          else                  ! fixspin
-             if ( (iscf == 1) .or. muldeb ) then
-                write(6,'(/,a12,3a16,3a10)')
-     .           'iscf', 'Eharris(eV)', 'E_KS(eV)', 'FreeEng(eV)', 
-     .           'dDmax','Ef(eV)','dHmax(eV)'
-             end if
-             write(6,'(a8,i4,3f16.6,3f10.6)')
-     .  trim(scf_name)//': ',iscf, Eharrs/eV, Etot/eV, FreeE/eV, 
-     .           dDmax, Ef      /eV, dHmax/eV
-          end if                ! fixspin
+          if ( TSrun ) then
+            if ( fixspin ) then
+              if ( (iscf == 1) .or. muldeb ) then
+                write(6,'(/,a12,3a16,4a10)')
+     .              'iscf', 'Eharris(eV)', 'E_KS(eV)', 'FreeEng(eV)',
+     .              'dDmax', 'Ef_up', 'Ef_dn(eV)','dHmax(eV)'
+              end if
+              write(6,'(a8,i4,3f16.6,4f10.6)')
+     .            'ts-scf: ',iscf, NEGF_Eharrs/eV, NEGF_Etot/eV,
+     .            NEGF_FreeE/eV,
+     &            dDmax, Efs(1:2)/eV, dHmax/eV
+            else                ! fixspin
+              if ( (iscf == 1) .or. muldeb ) then
+                write(6,'(/,a12,3a16,3a10)')
+     .              'iscf', 'Eharris(eV)', 'E_KS(eV)','FreeEng(eV)',
+     .              'dDmax','Ef(eV)','dHmax(eV)'
+              end if
+              write(6,'(a8,i4,3f16.6,3f10.6)')
+     .            'ts-scf: ',iscf, NEGF_Eharrs/eV, NEGF_Etot/eV,
+     .            NEGF_FreeE/eV,
+     &            dDmax, Ef /eV, dHmax/eV
+            end if              ! fixspin
+          else ! not NEGF
+            if ( fixspin ) then
+              if ( (iscf == 1) .or. muldeb ) then
+                write(6,'(/,a12,3a16,4a10)')
+     .              'iscf', 'Eharris(eV)', 'E_KS(eV)', 'FreeEng(eV)', 
+     .              'dDmax', 'Ef_up', 'Ef_dn(eV)','dHmax(eV)'
+              end if
+              write(6,'(a8,i4,3f16.6,4f10.6)')
+     .            'scf: ',iscf, Eharrs/eV, Etot/eV,
+     &            FreeE/eV,dDmax, Efs(1:2)/eV, dHmax/eV
+            else                ! fixspin
+              if ( (iscf == 1) .or. muldeb ) then
+                write(6,'(/,a12,3a16,3a10)')
+     .              'iscf', 'Eharris(eV)', 'E_KS(eV)', 'FreeEng(eV)', 
+     .              'dDmax','Ef(eV)','dHmax(eV)'
+              end if
+              write(6,'(a8,i4,3f16.6,3f10.6)')
+     .            'scf: ',iscf, Eharrs/eV, Etot/eV,
+     &            FreeE/eV,dDmax, Ef      /eV, dHmax/eV
+            end if              ! fixspin
+          end if
           
        elseif ((isolve==SOLVE_ORDERN) .or. (isolve==SOLVE_MINIM)) then
           
@@ -503,12 +565,21 @@
      .    'siesta: ',      'Eldau   =', Eldau/eV,
      .    'siesta: ',      'Eso     =', Eso/eV,
      .    'siesta: ',   'Ext. field =', DUext/eV,
-     .    'siesta: ',      'Enegf   =', DE_NEGF/eV,
      .    'siesta: ',  'Exch.-corr. =', Exc/eV,
      .    'siesta: ', 'Ion-electron =', (Enascf+Enl+DUscf-Uscf-Uatm)/eV,
      .    'siesta: ',      'Ion-ion =', (Ena+Uatm-Enaatm-Eions)/eV,
      .    'siesta: ',      'Ekinion =', Ekinion/eV,
      .    'siesta: ',        'Total =', (Etot+Ekinion)/eV
+        if ( TSrun ) then
+        write(6,'(a,a15,f15.6)')
+     .    'transiesta: ',    'E-dN  =', NEGF_DE/eV,
+     .    'transiesta: ','Band Stru =', NEGF_Ebs/eV,
+     .    'transiesta: ',  'Kinetic =', NEGF_Ekin/eV,
+     .    'transiesta: ', 'Ion-elec =', (Enascf+NEGF_Enl+DUscf-
+     .      Uscf-Uatm)/eV,
+     .    'transiesta: ',      'Eso =', NEGF_Eso/eV,
+     .    'transiesta: ',    'Total =', (NEGF_Etot+Ekinion)/eV
+        end if
         if ( fixspin ) then
            write(6,'(a,a15,f15.6)')
      .          'siesta: ', 'Fermi_up =', Efs(1)/eV,
@@ -537,9 +608,6 @@
           call cmlAddProperty(xf=mainXML, value=DUext/eV, 
      .         units='siestaUnits:eV', 
      .         dictref='siesta:DUext', fmt='r7')
-          call cmlAddProperty(xf=mainXML, value=DE_NEGF/eV, 
-     .         units='siestaUnits:eV', 
-     .         dictref='siesta:Enegf', fmt='r7')
           call cmlAddProperty(xf=mainXML, value=Exc/eV,   
      .         units='siestaUnits:eV', 
      .         dictref='siesta:Exc', fmt='r7')
@@ -557,6 +625,26 @@
           call cmlAddProperty(xf=mainXML, value=(Etot+Ekinion)/eV,
      .         units='siestaUnits:eV', 
      .         dictref='siesta:Etot', fmt='r7')
+
+          if ( TSrun ) then
+          ! NEGF energies
+          call cmlAddProperty(xf=mainXML, value=NEGF_DE/eV, 
+     .         units='siestaUnits:eV', 
+     .         dictref='siesta:EdN-GF', fmt='r7')
+          call cmlAddProperty(xf=mainXML, value=NEGF_Ebs/eV, 
+     .         units='siestaUnits:eV', 
+     .         dictref='siesta:Ebs-GF', fmt='r7')
+          call cmlAddProperty(xf=mainXML, value=NEGF_Ekin/eV, 
+     .         units='siestaUnits:eV', 
+     .         dictref='siesta:Ekin-GF', fmt='r7')
+          call cmlAddProperty(xf=mainXML, 
+     .         value=(Enascf+NEGF_Enl+DUscf-Uscf-Uatm)/eV, 
+     .         units='siestaUnits:eV', 
+     .         dictref='siesta:I-e-GF', fmt='r7')
+          call cmlAddProperty(xf=mainXML, value=(NEGF_Etot+Ekinion)/eV,
+     .         units='siestaUnits:eV', 
+     .         dictref='siesta:Etot-GF', fmt='r7')
+          end if
           call cmlEndPropertyList(mainXML)
         endif !cml_p
       endif !final
 
=== modified file 'Src/writewave.F'
--- Src/writewave.F	2018-10-17 13:04:40 +0000
+++ Src/writewave.F	2019-08-18 23:02:58 +0000
@@ -40,15 +40,23 @@
       USE alloc, only: re_alloc
       USE sys, only: die
       USE atomlist, only: no_u
+      USE m_spin, only: spin
 
       implicit none
 
+      integer :: max_n_states
+      
       ! Find number of k-points for wavefunction printout
 
       nullify(wfk)
 
       nwk = 0
-      call initwave( no_u, nwk, wfk )
+      if ( spin%Grid == 4 ) then
+        max_n_states = 2 * no_u
+      else
+        max_n_states = no_u
+      end if
+      call initwave( max_n_states, nwk, wfk )
 
       if (nwk .eq. 0) then
          gamma_wavefunctions = .true.
@@ -96,7 +104,7 @@
          call die("WFS.BandMin < 1")
       endif
       if (wfs_band_max > norb) then
-         call die("WFS.BandMax > number of orbitals")
+         call die("WFS.BandMax > maximum number of states")
       endif
       if (wfs_band_max < wfs_band_min) then
          call message("WARNING","WFS.BandMax < WFS.BandMin." //
@@ -126,7 +134,7 @@
 C Based on initband routine by J.Soler
 C Written by P. Ordejon, June 2003
 C **************************** INPUT **********************************
-C integer norb           : Number of orbitals
+C integer norb           : Number of orbitals (actually max number of bands)
 C *************************** OUTPUT **********************************
 C integer nk             : Number k points to compute wavefunctions
 C real*8  kpoint(3,maxk) : k point vectors
@@ -383,7 +391,7 @@
 
       end subroutine initwave
 
-      subroutine wwave( no, nspin, maxspn, maxo, maxuo, maxnh, 
+      subroutine wwave( no, spin, maxo, maxuo, maxnh, 
      .                  maxk,
      .                  numh, listhptr, listh, H, S, ef, xij, indxuo,
      .                  gamma, nk, kpoint, nuotot, occtol)
@@ -391,10 +399,10 @@
 C Finds wavefunctions at selected k-points.
 C Written by P. Ordejon, June 2003
 C from routine 'bands' written by J.M.Soler
+C Changed to use tSpin, N. Papior, August 2019
 C **************************** INPUT **********************************
 C integer no                  : Number of basis orbitals
-C integer nspin  = h_spin_dim : Number of spin components of H, D
-C integer maxspn = spinor_dim : Second dimension of ek
+C tSpin spin                  : Contains spin information
 C integer maxo                : First dimension of ek
 C integer maxuo               : Second dimension of H and S
 C integer maxnh               : Maximum number of orbitals interacting  
@@ -406,7 +414,7 @@
 C                               hamiltonian matrix
 C integer listh(maxlh)        : Nonzero hamiltonian-matrix element  
 C                               column indexes for each matrix row
-C real*8  H(maxnh,nspin)      : Hamiltonian in sparse form
+C real*8  H(maxnh,spin%H)     : Hamiltonian in sparse form
 C real*8  S(maxnh)            : Overlap in sparse form
 C real*8  ef                  : Fermi energy
 C real*8  xij(3,maxnh)        : Vectors between orbital centers (sparse)
@@ -438,7 +446,7 @@
       use atmfuncs,     only : symfio, cnfigfio, labelfis, nofis
       use atomlist,     only : iaorb, iphorb
       use siesta_geom,  only : isa
-      use m_spin,       only : NoMagn, SPpol, NonCol, SpOrb
+      use t_spin, only: tSpin
       use units, only : eV
 
 #ifdef MPI
@@ -449,12 +457,12 @@
 
       implicit          none
 
+      type(tSpin), intent(in) :: spin
       logical, intent(in) :: Gamma
       integer           maxk, maxnh, maxo, maxuo, nk, no, 
-     .                  h_spin_dim, spinor_dim, nspin, maxspn,
      .                  nuotot, indxuo(no), listh(maxnh), numh(*), 
      .                  listhptr(*)
-      real(dp)          ef, H(:,:), kpoint(3,maxk), 
+      real(dp)          ef, H(maxnh,spin%H), kpoint(3,maxk), 
      .                  S(maxnh), xij(3,maxnh), occtol
 
       external          io_assign, io_close, memory
@@ -480,9 +488,7 @@
       data Dnew, Enew, e1, e2, qk, qtot, temp, wk /8*0.d0/
 
       logical :: SaveParallelOverK
-
-      h_spin_dim=size(H,dim=2)
-
+      
 
 C Get local number of orbitals
 #ifdef MPI
@@ -505,26 +511,17 @@
       endif
 
 C Check spin
-      if (h_spin_dim .gt. 2) then
-        if (Node.eq.0) then
-          write(6,'(/,a,/,a)')
-     .       'writewave: WARNING: wavefunctions printed is only '
-          write(6,'(/,a,/,a)')
-     .       '           implemented for nspin = 1 or 2'
-        endif
-        goto 999
-      endif
 
 C Allocate local arrays - only aux is relevant here
-      if ( h_spin_dim >= 4 ) then
+      if ( spin%Grid == 4 ) then
          nhs = 2 * (2*nuotot) * (2*nuo)
       else
          nhs = 2 * nuotot * nuo
       endif
       call allocDenseMatrix(nhs, nhs, nhs) 
 
-      allocate(ek(nuotot,maxspn,nk))
-      call memory('A','D',maxspn*nk*nuotot,'writewave')
+      allocate(ek(nuotot,spin%spinor,nk))
+      call memory('A','D',nuotot*spin%spinor*nk,'writewave')
       naux = 2*nuotot*5
       allocate(aux(naux))
       call memory('A','D',naux,'writewave')
@@ -543,12 +540,12 @@
           write(6,'(a)') 'writewave: Wave Functions Coefficients'
           write(6,*)
           write(6,'(a26,2x,i6)') 'Number of k-points = ', nk
-          write(6,'(a26,2x,i6)') 'Number of Spins = ', maxspn
+          write(6,'(a26,2x,i6)') 'Number of Spins = ', spin%Grid
           write(6,'(a26,2x,i6)') 'Number of basis orbs = ',nuotot
           write(6,*)
         endif
         write(iu) nk, gamma
-        write(iu) maxspn
+        write(iu) spin%Grid   ! This will be 1, 2, or 4
         write(iu) nuotot
         write(iu) (iaorb(j),labelfis(isa(iaorb(j))),
      .            iphorb(j), cnfigfio(isa(iaorb(j)),iphorb(j)),
@@ -566,9 +563,9 @@
 
 C Call appropriate diagonalization routine
 
-      if (NoMagn .or. SPpol) then
+      if ( spin%Grid <= 2 ) then
        if (gamma) then
-         call diagg( h_spin_dim, nuo, maxuo, maxnh, maxnh, 
+         call diagg( spin%H, nuo, maxuo, maxnh, maxnh, 
      .               maxo, numh, listhptr, listh, numh, listhptr, 
      .               listh, H, S, getD, getPSI,
      .               fixspin, qtot, qs, temp,
@@ -588,7 +585,7 @@
              call diag_init()
           end if
 
-         call diagk( h_spin_dim, nuo, no, maxspn, maxnh, maxnh,
+         call diagk( spin%H, nuo, no, spin%spinor, maxnh, maxnh,
      .               maxo, numh, listhptr, listh, numh, listhptr, 
      .               listh, H, S, getD, getPSI,
      .               fixspin, qtot, qs, temp,
@@ -602,16 +599,16 @@
          
        endif
 
-      elseif (NonCol) then
+      elseif ( spin%NCol) then
         if (gamma) then
-          call diag2g( nuo, no, maxuo, maxnh, maxnh, maxo, numh,
+          call diag2g( nuo, no, maxnh, maxnh, maxo, numh,
      .                 listhptr, listh, numh, listhptr, listh,
      .                 H, S, getD, getPSI, qtot, temp, e1, e2, ek, qk,
      .                 Dnew, Enew, ef, Entropy,
      .                 Haux, Saux, psi, aux,
      .                 nuotot, occtol, 1, nuotot )
         else
-          call diag2k( nuo, no, maxuo, maxnh, maxnh, maxo, numh,
+          call diag2k( nuo, no, maxnh, maxnh, maxo, numh,
      .                 listhptr, listh, numh, listhptr, listh,
      .                 H, S, getD, getPSI, qtot, temp, e1, e2, xij,
      .                 indxuo, nk, kpoint, wk, ek, qk, Dnew,
@@ -619,18 +616,18 @@
      .                 Haux, Saux, psi, Haux, Saux, aux,
      .                 nuotot, occtol, 1, nuotot )
         endif
-      elseif (SpOrb) then
+      elseif ( spin%SO ) then
         if (gamma) then
           call diag3g( nuo, no, maxnh, maxnh, maxo, numh,
      .                 listhptr, listh, numh, listhptr, listh,
-     .                 H, S, getD, qtot, temp, e1, e2, ek, qk,
+     .                 H, S, getD, getPSI, qtot, temp, e1, e2, ek, qk,
      .                 Dnew, Enew, ef, Entropy,
      .                 Haux, Saux, psi, aux,
      .                 nuotot, occtol, 1, nuotot )
         else
-          call diag3k( nuo, no, maxuo, maxnh, maxnh, maxo, numh,
+          call diag3k( nuo, no, maxnh, maxnh, maxo, numh,
      .                 listhptr, listh, numh, listhptr, listh,
-     .                 H, S, getD, qtot, temp, e1, e2, xij,
+     .                 H, S, getD, getPsi, qtot, temp, e1, e2, xij,
      .                 indxuo, nk, kpoint, wk, ek, qk, Dnew,
      .                 Enew, ef, Entropy,
      .                 Haux, Saux, psi, Haux, Saux, aux,
@@ -653,15 +650,16 @@
       end subroutine wwave
 
 
-      subroutine writew(nuotot,nuo,ik,k,ispin,eo,psi,gamma)
+      subroutine writew(nuotot,nuo,ik,k,ispin,eo,psi,
+     $                  gamma,non_coll,blocksize)
 
       use precision
       use sys
       use parallel,     only : Node, Nodes
+      use parallel,     only : Module_Blocksize=>BlockSize
       use parallelsubs, only : GlobalToLocalOrb, WhichNodeOrb
       use units,        only : eV
       use kpoint_grid,  only : kweight
-
 #ifdef MPI
       use mpi_siesta
 #endif
@@ -673,16 +671,17 @@
 #endif
 
       integer, intent(in)  ::  nuotot, nuo, ispin, ik
-      real(dp), intent(in) ::  eo(*), psi(*), k(3)
+      logical, intent(in)  ::  non_coll, gamma
+      real(dp), intent(in) ::  eo(*), k(3)
+      real(dp), intent(in) ::  psi(:)
+      integer, intent(in)  ::  blocksize
 
-      logical gamma
 
 C  Internal variables .............................................
       integer  BNode, iie, iw, indwf, j, ind, iu
-
+      integer  :: blocksize_saved
       integer number_of_wfns
       integer, allocatable  :: ind_wfn(:)
-
       real(dp)  :: kpoint_weight
       real(SP), dimension(:,:), allocatable :: aux   !! NOTE SP
 
@@ -692,12 +691,17 @@
 
 C Allocate auxiliary arrays
 
-      if (gamma) then
-         allocate(aux(1,nuotot))
-         call memory('A','D',nuotot,'writewave')
+      if (non_coll) then
+         allocate(aux(4,nuotot))
+         call memory('A','D',4*nuotot,'writewave')
       else
-         allocate(aux(2,nuotot))
-         call memory('A','D',2*nuotot,'writewave')
+         if (gamma) then
+            allocate(aux(1,nuotot))
+            call memory('A','D',nuotot,'writewave')
+         else
+            allocate(aux(2,nuotot))
+            call memory('A','D',2*nuotot,'writewave')
+         endif
       endif
 
 C Find file name, and open for Node 0
@@ -733,7 +737,11 @@
         if (wwf) then
           write(6,*)
           write(6,'(a22,2x,i6,2x,3f10.6)') 'k-point = ',ik, k(1:3)
-          write(6,'(a22,2x,i6)') 'Spin component = ',ispin
+          if (non_coll) then
+             write(6,'(a22,2x,i6)') 'Spin component (non-collinear)= ',0
+          else
+             write(6,'(a22,2x,i6)') 'Spin component = ',ispin
+          endif
           write(6,'(a22,2x,i6)') 'Num. wavefunctions = ',nwflist(ik)
           write(6,'(a)') 'Use readwfsx utility to print '
      $                   // "wavefunction coefficients from WFSX file"
@@ -748,14 +756,26 @@
         write(iu) nwflist(ik)
       endif
 
-C Loop over wavefunctions that should be printed
-
+      ! Loop over wavefunctions that should be stored
+
+      ! The effective blocksize to use is passed as an argument.
+      ! Module_blocksize is the variable in the 'parallel' module that
+      ! holds the value that all the helper functions (WhichNodeOrb,
+      ! GetNodeOrb, etc) see.  Hence, we must temporarily set
+      ! Module_blocksize to the passed blocksize.
+
+      ! Examples: non-collinear calculations need a wf blocksize double
+      ! the 'orbital' one
+
+      blocksize_saved = Module_blocksize
+      Module_blocksize = blocksize
+      
       if (Node .eq. 0 .and. debug) then
          print *, " -*- Will print ", nwflist(ik), " wfns."
          print *, " -*- ", iwf(ik,1:nwflist(ik))
       endif
       do iw = 1,nwflist(ik)
-        indwf = iwf(ik,iw)
+         indwf = iwf(ik,iw)
 
         ! Determine which node handles this wavefunction
         ! Note that the distribution is block cyclic,
@@ -770,30 +790,44 @@
 
         if (Node.eq.BNode) then
 
-C Determine the index of the wavefunction in the local node
-
+          ! Determine the index of the wavefunction in the local node
           call GlobalToLocalOrb( indwf, BNode, Nodes, iie)
 
-C Save wavefunction in aux array
-
-C psi has different structure in diagk and diagg, so the indexing
-C must be handled differently
-
-          if (gamma) then
-            do j = 1,nuotot
-              ind = j + (iie-1)*nuotot 
-              aux(1,j) = real(psi(ind),kind=sp)
-            enddo
-          else
-            do j = 1,nuotot
-              ind = 1+(j-1)*2+(iie-1)*2*nuotot
-              aux(1,j) = real(psi(ind),kind=sp)
-              aux(2,j) = real(psi(ind+1),kind=sp)
-            enddo
-          endif
-
-        endif
-
+          ! Save wavefunction in aux array
+
+          ! Despite being passed as a one-dimensional array, psi has
+          ! different underlying structures for different cases, so the
+          ! indexing must be handled differently
+
+          if (.not. non_coll) then
+             if (gamma) then
+                ! Real functions
+                do j = 1,nuotot
+                   ind = j + (iie-1)*nuotot 
+                   aux(1,j) = real(psi(ind),kind=sp)
+                enddo
+             else
+                ! Complex functions: two reals per orbital coefficient
+                do j = 1,nuotot
+                   ind = 1+(j-1)*2+(iie-1)*2*nuotot
+                   aux(1,j) = real(psi(ind),kind=sp)
+                   aux(2,j) = real(psi(ind+1),kind=sp)
+                enddo
+             endif
+          else                  ! non-collinear case, including SOC
+             ! Each 'orbital' coefficient is actually four reals: complex up/down
+             ! (spinor)
+             do j = 1,nuotot
+                ind = 1 + (j-1)*4 + (iie-1)*4*nuotot 
+                aux(1,j) = real(psi(ind),kind=sp)
+                aux(2,j) = real(psi(ind+1),kind=sp)
+                aux(3,j) = real(psi(ind+2),kind=sp)
+                aux(4,j) = real(psi(ind+3),kind=sp)
+             enddo
+          endif  !  non-coll or not
+
+       endif          ! Node == BNode
+       
 #ifdef MPI
 C Pass the wf to the master node
         if (BNode.ne.0) then
@@ -815,19 +849,22 @@
 C eigenvector is now stored in aux in Node 0, and can be printed
 
         if (Node .eq. 0) then
-          write(iu) indwf
-          write(iu) eo(indwf)/eV
-          write(iu) (aux(1:,j), j=1,nuotot)
-       endif
+           write(iu) indwf
+           write(iu) eo(indwf)/eV
+           write(iu) (aux(1:,j), j=1,nuotot)
+        endif
 
       enddo
-
+      
 C Close output file
 
       if (Node .eq. 0) then
         call io_close(iu)
       endif
 
+      ! Restore blocksize value in module
+      Module_blocksize = blocksize_saved
+
 C Deallocate auxiliary arrays
 
       call memory('D','D',size(aux),'writewave')
 
=== added file 'Tests/Pseudos/Bi.psf'
--- Tests/Pseudos/Bi.psf	1970-01-01 00:00:00 +0000
+++ Tests/Pseudos/Bi.psf	2019-08-18 23:02:58 +0000
@@ -0,0 +1,3061 @@
+ Bi pb rel pcec
+ ATM3.3    12-FEB-13 Troullier-Martins                       
+ 6s 2.00r r= 1.98/6p 3.00r r= 1.98/5d10.00r r= 1.48/5f 0.00r r= 2.47/  
+   4  3 1216  0.298644840562E-04  0.125000000000E-01   15.0000000000    
+ Radial grid follows
+  0.375648965487E-06  0.756023013283E-06  0.114118157761E-05  0.153118484027E-05
+  0.192609374007E-05  0.232596998233E-05  0.273087604852E-05  0.314087520605E-05
+  0.355603151811E-05  0.397640985372E-05  0.440207589786E-05  0.483309616171E-05
+  0.526953799306E-05  0.571146958683E-05  0.615895999574E-05  0.661207914108E-05
+  0.707089782362E-05  0.753548773473E-05  0.800592146753E-05  0.848227252823E-05
+  0.896461534767E-05  0.945302529289E-05  0.994757867894E-05  0.104483527808E-04
+  0.109554258454E-04  0.114688771040E-04  0.119887867844E-04  0.125152361234E-04
+  0.130483073800E-04  0.135880838476E-04  0.141346498673E-04  0.146880908412E-04
+  0.152484932455E-04  0.158159446444E-04  0.163905337031E-04  0.169723502025E-04
+  0.175614850526E-04  0.181580303068E-04  0.187620791765E-04  0.193737260458E-04
+  0.199930664855E-04  0.206201972689E-04  0.212552163865E-04  0.218982230613E-04
+  0.225493177644E-04  0.232086022306E-04  0.238761794746E-04  0.245521538066E-04
+  0.252366308489E-04  0.259297175526E-04  0.266315222138E-04  0.273421544909E-04
+  0.280617254217E-04  0.287903474405E-04  0.295281343961E-04  0.302752015692E-04
+  0.310316656905E-04  0.317976449591E-04  0.325732590608E-04  0.333586291869E-04
+  0.341538780531E-04  0.349591299186E-04  0.357745106057E-04  0.366001475192E-04
+  0.374361696666E-04  0.382827076782E-04  0.391398938270E-04  0.400078620503E-04
+  0.408867479698E-04  0.417766889133E-04  0.426778239358E-04  0.435902938416E-04
+  0.445142412058E-04  0.454498103971E-04  0.463971476002E-04  0.473564008384E-04
+  0.483277199970E-04  0.493112568465E-04  0.503071650667E-04  0.513156002701E-04
+  0.523367200269E-04  0.533706838890E-04  0.544176534155E-04  0.554777921974E-04
+  0.565512658836E-04  0.576382422066E-04  0.587388910086E-04  0.598533842682E-04
+  0.609818961272E-04  0.621246029180E-04  0.632816831908E-04  0.644533177417E-04
+  0.656396896410E-04  0.668409842618E-04  0.680573893087E-04  0.692890948476E-04
+  0.705362933350E-04  0.717991796480E-04  0.730779511154E-04  0.743728075476E-04
+  0.756839512688E-04  0.770115871477E-04  0.783559226302E-04  0.797171677714E-04
+  0.810955352687E-04  0.824912404947E-04  0.839045015313E-04  0.853355392033E-04
+  0.867845771134E-04  0.882518416766E-04  0.897375621560E-04  0.912419706984E-04
+  0.927653023708E-04  0.943077951968E-04  0.958696901941E-04  0.974512314119E-04
+  0.990526659693E-04  0.100674244094E-03  0.102316219160E-03  0.103978847730E-03
+  0.105662389593E-03  0.107367107805E-03  0.109093268733E-03  0.110841142093E-03
+  0.112611000993E-03  0.114403121978E-03  0.116217785069E-03  0.118055273812E-03
+  0.119915875318E-03  0.121799880310E-03  0.123707583168E-03  0.125639281974E-03
+  0.127595278559E-03  0.129575878553E-03  0.131581391427E-03  0.133612130549E-03
+  0.135668413223E-03  0.137750560750E-03  0.139858898469E-03  0.141993755811E-03
+  0.144155466353E-03  0.146344367867E-03  0.148560802372E-03  0.150805116190E-03
+  0.153077660002E-03  0.155378788896E-03  0.157708862428E-03  0.160068244677E-03
+  0.162457304301E-03  0.164876414596E-03  0.167325953553E-03  0.169806303917E-03
+  0.172317853247E-03  0.174860993980E-03  0.177436123484E-03  0.180043644130E-03
+  0.182683963349E-03  0.185357493695E-03  0.188064652912E-03  0.190805864001E-03
+  0.193581555280E-03  0.196392160458E-03  0.199238118697E-03  0.202119874683E-03
+  0.205037878698E-03  0.207992586685E-03  0.210984460323E-03  0.214013967098E-03
+  0.217081580378E-03  0.220187779482E-03  0.223333049762E-03  0.226517882671E-03
+  0.229742775847E-03  0.233008233185E-03  0.236314764920E-03  0.239662887705E-03
+  0.243053124689E-03  0.246486005606E-03  0.249962066848E-03  0.253481851558E-03
+  0.257045909710E-03  0.260654798195E-03  0.264309080908E-03  0.268009328839E-03
+  0.271756120160E-03  0.275550040314E-03  0.279391682109E-03  0.283281645808E-03
+  0.287220539228E-03  0.291208977828E-03  0.295247584809E-03  0.299336991212E-03
+  0.303477836016E-03  0.307670766236E-03  0.311916437025E-03  0.316215511778E-03
+  0.320568662235E-03  0.324976568584E-03  0.329439919569E-03  0.333959412598E-03
+  0.338535753852E-03  0.343169658392E-03  0.347861850275E-03  0.352613062667E-03
+  0.357424037954E-03  0.362295527861E-03  0.367228293567E-03  0.372223105827E-03
+  0.377280745092E-03  0.382402001627E-03  0.387587675638E-03  0.392838577400E-03
+  0.398155527374E-03  0.403539356347E-03  0.408990905551E-03  0.414511026802E-03
+  0.420100582631E-03  0.425760446418E-03  0.431491502526E-03  0.437294646446E-03
+  0.443170784931E-03  0.449120836139E-03  0.455145729778E-03  0.461246407249E-03
+  0.467423821797E-03  0.473678938654E-03  0.480012735195E-03  0.486426201089E-03
+  0.492920338453E-03  0.499496162009E-03  0.506154699243E-03  0.512896990565E-03
+  0.519724089472E-03  0.526637062711E-03  0.533636990449E-03  0.540724966439E-03
+  0.547902098192E-03  0.555169507149E-03  0.562528328857E-03  0.569979713147E-03
+  0.577524824313E-03  0.585164841295E-03  0.592900957860E-03  0.600734382792E-03
+  0.608666340081E-03  0.616698069109E-03  0.624830824852E-03  0.633065878069E-03
+  0.641404515504E-03  0.649848040086E-03  0.658397771132E-03  0.667055044556E-03
+  0.675821213075E-03  0.684697646419E-03  0.693685731550E-03  0.702786872874E-03
+  0.712002492463E-03  0.721334030277E-03  0.730782944387E-03  0.740350711205E-03
+  0.750038825715E-03  0.759848801703E-03  0.769782171999E-03  0.779840488712E-03
+  0.790025323474E-03  0.800338267687E-03  0.810780932768E-03  0.821354950407E-03
+  0.832061972814E-03  0.842903672983E-03  0.853881744952E-03  0.864997904068E-03
+  0.876253887253E-03  0.887651453276E-03  0.899192383032E-03  0.910878479813E-03
+  0.922711569596E-03  0.934693501326E-03  0.946826147203E-03  0.959111402979E-03
+  0.971551188249E-03  0.984147446755E-03  0.996902146688E-03  0.100981728100E-02
+  0.102289486770E-02  0.103613695019E-02  0.104954559757E-02  0.106312290497E-02
+  0.107687099388E-02  0.109079201246E-02  0.110488813589E-02  0.111916156673E-02
+  0.113361453523E-02  0.114824929969E-02  0.116306814683E-02  0.117807339212E-02
+  0.119326738016E-02  0.120865248504E-02  0.122423111072E-02  0.124000569139E-02
+  0.125597869185E-02  0.127215260793E-02  0.128852996683E-02  0.130511332754E-02
+  0.132190528125E-02  0.133890845174E-02  0.135612549578E-02  0.137355910358E-02
+  0.139121199916E-02  0.140908694084E-02  0.142718672161E-02  0.144551416959E-02
+  0.146407214849E-02  0.148286355803E-02  0.150189133440E-02  0.152115845074E-02
+  0.154066791756E-02  0.156042278327E-02  0.158042613459E-02  0.160068109711E-02
+  0.162119083569E-02  0.164195855502E-02  0.166298750010E-02  0.168428095675E-02
+  0.170584225211E-02  0.172767475518E-02  0.174978187733E-02  0.177216707284E-02
+  0.179483383946E-02  0.181778571889E-02  0.184102629744E-02  0.186455920647E-02
+  0.188838812306E-02  0.191251677052E-02  0.193694891900E-02  0.196168838608E-02
+  0.198673903735E-02  0.201210478702E-02  0.203778959855E-02  0.206379748523E-02
+  0.209013251085E-02  0.211679879032E-02  0.214380049029E-02  0.217114182983E-02
+  0.219882708109E-02  0.222686056994E-02  0.225524667668E-02  0.228398983668E-02
+  0.231309454112E-02  0.234256533768E-02  0.237240683123E-02  0.240262368455E-02
+  0.243322061911E-02  0.246420241572E-02  0.249557391535E-02  0.252734001988E-02
+  0.255950569281E-02  0.259207596010E-02  0.262505591092E-02  0.265845069845E-02
+  0.269226554070E-02  0.272650572131E-02  0.276117659036E-02  0.279628356527E-02
+  0.283183213155E-02  0.286782784376E-02  0.290427632628E-02  0.294118327428E-02
+  0.297855445453E-02  0.301639570636E-02  0.305471294255E-02  0.309351215023E-02
+  0.313279939187E-02  0.317258080617E-02  0.321286260907E-02  0.325365109467E-02
+  0.329495263626E-02  0.333677368729E-02  0.337912078238E-02  0.342200053836E-02
+  0.346541965526E-02  0.350938491743E-02  0.355390319452E-02  0.359898144260E-02
+  0.364462670523E-02  0.369084611459E-02  0.373764689256E-02  0.378503635184E-02
+  0.383302189713E-02  0.388161102629E-02  0.393081133144E-02  0.398063050026E-02
+  0.403107631707E-02  0.408215666415E-02  0.413387952290E-02  0.418625297511E-02
+  0.423928520426E-02  0.429298449674E-02  0.434735924316E-02  0.440241793970E-02
+  0.445816918938E-02  0.451462170345E-02  0.457178430274E-02  0.462966591901E-02
+  0.468827559639E-02  0.474762249275E-02  0.480771588117E-02  0.486856515137E-02
+  0.493017981117E-02  0.499256948797E-02  0.505574393031E-02  0.511971300930E-02
+  0.518448672026E-02  0.525007518420E-02  0.531648864945E-02  0.538373749326E-02
+  0.545183222339E-02  0.552078347979E-02  0.559060203622E-02  0.566129880198E-02
+  0.573288482358E-02  0.580537128649E-02  0.587876951686E-02  0.595309098331E-02
+  0.602834729873E-02  0.610455022206E-02  0.618171166017E-02  0.625984366969E-02
+  0.633895845891E-02  0.641906838967E-02  0.650018597931E-02  0.658232390262E-02
+  0.666549499382E-02  0.674971224856E-02  0.683498882595E-02  0.692133805065E-02
+  0.700877341488E-02  0.709730858060E-02  0.718695738162E-02  0.727773382573E-02
+  0.736965209695E-02  0.746272655769E-02  0.755697175102E-02  0.765240240295E-02
+  0.774903342471E-02  0.784687991510E-02  0.794595716282E-02  0.804628064890E-02
+  0.814786604909E-02  0.825072923632E-02  0.835488628316E-02  0.846035346436E-02
+  0.856714725940E-02  0.867528435500E-02  0.878478164783E-02  0.889565624705E-02
+  0.900792547704E-02  0.912160688010E-02  0.923671821918E-02  0.935327748066E-02
+  0.947130287716E-02  0.959081285039E-02  0.971182607403E-02  0.983436145664E-02
+  0.995843814462E-02  0.100840755252E-01  0.102112932295E-01  0.103401111355E-01
+  0.104705493713E-01  0.106026283182E-01  0.107363686136E-01  0.108717911549E-01
+  0.110089171021E-01  0.111477678813E-01  0.112883651884E-01  0.114307309919E-01
+  0.115748875367E-01  0.117208573476E-01  0.118686632327E-01  0.120183282870E-01
+  0.121698758960E-01  0.123233297391E-01  0.124787137940E-01  0.126360523398E-01
+  0.127953699607E-01  0.129566915507E-01  0.131200423165E-01  0.132854477819E-01
+  0.134529337920E-01  0.136225265167E-01  0.137942524554E-01  0.139681384404E-01
+  0.141442116418E-01  0.143224995715E-01  0.145030300873E-01  0.146858313974E-01
+  0.148709320649E-01  0.150583610122E-01  0.152481475255E-01  0.154403212592E-01
+  0.156349122409E-01  0.158319508758E-01  0.160314679516E-01  0.162334946434E-01
+  0.164380625180E-01  0.166452035398E-01  0.168549500749E-01  0.170673348966E-01
+  0.172823911905E-01  0.175001525595E-01  0.177206530294E-01  0.179439270538E-01
+  0.181700095197E-01  0.183989357529E-01  0.186307415236E-01  0.188654630520E-01
+  0.191031370137E-01  0.193438005459E-01  0.195874912526E-01  0.198342472111E-01
+  0.200841069775E-01  0.203371095928E-01  0.205932945893E-01  0.208527019963E-01
+  0.211153723468E-01  0.213813466836E-01  0.216506665657E-01  0.219233740749E-01
+  0.221995118222E-01  0.224791229549E-01  0.227622511626E-01  0.230489406848E-01
+  0.233392363172E-01  0.236331834192E-01  0.239308279205E-01  0.242322163288E-01
+  0.245373957366E-01  0.248464138288E-01  0.251593188901E-01  0.254761598125E-01
+  0.257969861031E-01  0.261218478916E-01  0.264507959385E-01  0.267838816424E-01
+  0.271211570486E-01  0.274626748573E-01  0.278084884311E-01  0.281586518042E-01
+  0.285132196903E-01  0.288722474915E-01  0.292357913064E-01  0.296039079395E-01
+  0.299766549099E-01  0.303540904600E-01  0.307362735649E-01  0.311232639414E-01
+  0.315151220577E-01  0.319119091422E-01  0.323136871939E-01  0.327205189914E-01
+  0.331324681028E-01  0.335495988963E-01  0.339719765491E-01  0.343996670589E-01
+  0.348327372530E-01  0.352712547995E-01  0.357152882177E-01  0.361649068888E-01
+  0.366201810665E-01  0.370811818885E-01  0.375479813869E-01  0.380206525002E-01
+  0.384992690841E-01  0.389839059236E-01  0.394746387441E-01  0.399715442236E-01
+  0.404747000046E-01  0.409841847062E-01  0.415000779364E-01  0.420224603046E-01
+  0.425514134342E-01  0.430870199750E-01  0.436293636168E-01  0.441785291017E-01
+  0.447346022381E-01  0.452976699135E-01  0.458678201084E-01  0.464451419099E-01
+  0.470297255257E-01  0.476216622981E-01  0.482210447186E-01  0.488279664418E-01
+  0.494425223005E-01  0.500648083202E-01  0.506949217345E-01  0.513329609999E-01
+  0.519790258112E-01  0.526332171175E-01  0.532956371374E-01  0.539663893754E-01
+  0.546455786380E-01  0.553333110498E-01  0.560296940703E-01  0.567348365110E-01
+  0.574488485517E-01  0.581718417582E-01  0.589039290998E-01  0.596452249665E-01
+  0.603958451873E-01  0.611559070482E-01  0.619255293104E-01  0.627048322290E-01
+  0.634939375715E-01  0.642929686373E-01  0.651020502767E-01  0.659213089102E-01
+  0.667508725488E-01  0.675908708135E-01  0.684414349555E-01  0.693026978775E-01
+  0.701747941533E-01  0.710578600499E-01  0.719520335481E-01  0.728574543643E-01
+  0.737742639724E-01  0.747026056256E-01  0.756426243794E-01  0.765944671136E-01
+  0.775582825554E-01  0.785342213031E-01  0.795224358490E-01  0.805230806036E-01
+  0.815363119199E-01  0.825622881171E-01  0.836011695063E-01  0.846531184146E-01
+  0.857182992113E-01  0.867968783331E-01  0.878890243100E-01  0.889949077922E-01
+  0.901147015762E-01  0.912485806321E-01  0.923967221306E-01  0.935593054714E-01
+  0.947365123105E-01  0.959285265887E-01  0.971355345607E-01  0.983577248240E-01
+  0.995952883483E-01  0.100848418505      0.102117311100      0.103402164398    
+  0.104703179161      0.106020558675      0.107354508783      0.108705237919    
+  0.110072957135      0.111457880141      0.112860223334      0.114280205834    
+  0.115718049514      0.117173979041      0.118648221907      0.120141008466    
+  0.121652571968      0.123183148598      0.124732977512      0.126302300874    
+  0.127891363894      0.129500414866      0.131129705208      0.132779489500    
+  0.134450025523      0.136141574302      0.137854400146      0.139588770687    
+  0.141344956924      0.143123233264      0.144923877567      0.146747171187    
+  0.148593399018      0.150462849535      0.152355814846      0.154272590729    
+  0.156213476684      0.158178775980      0.160168795697      0.162183846781    
+  0.164224244087      0.166290306432      0.168382356643      0.170500721605    
+  0.172645732318      0.174817723945      0.177017035863      0.179244011719    
+  0.181498999484      0.183782351502      0.186094424554      0.188435579904    
+  0.190806183363      0.193206605343      0.195637220915      0.198098409867    
+  0.200590556764      0.203114051011      0.205669286908      0.208256663716    
+  0.210876585717      0.213529462281      0.216215707923      0.218935742377    
+  0.221689990652      0.224478883105      0.227302855507      0.230162349109    
+  0.233057810713      0.235989692740      0.238958453303      0.241964556277    
+  0.245008471372      0.248090674205      0.251211646377      0.254371875547    
+  0.257571855505      0.260812086257      0.264093074094      0.267415331678    
+  0.270779378118      0.274185739052      0.277634946733      0.281127540106    
+  0.284664064895      0.288245073689      0.291871126029      0.295542788493    
+  0.299260634785      0.303025245827      0.306837209846      0.310697122470    
+  0.314605586818      0.318563213595      0.322570621189      0.326628435765    
+  0.330737291365      0.334897830006      0.339110701781      0.343376564959    
+  0.347696086090      0.352069940109      0.356498810439      0.360983389099    
+  0.365524376815      0.370122483124      0.374778426491      0.379492934417    
+  0.384266743551      0.389100599812      0.393995258501      0.398951484416    
+  0.403970051979      0.409051745350      0.414197358556      0.419407695608    
+  0.424683570631      0.430025807994      0.435435242430      0.440912719175    
+  0.446459094095      0.452075233824      0.457762015895      0.463520328878    
+  0.469351072522      0.475255157892      0.481233507514      0.487287055517    
+  0.493416747780      0.499623542080      0.505908408242      0.512272328288    
+  0.518716296594      0.525241320043      0.531848418183      0.538538623387    
+  0.545312981013      0.552172549568      0.559118400874      0.566151620234    
+  0.573273306602      0.580484572758      0.587786545476      0.595180365703    
+  0.602667188740      0.610248184418      0.617924537282      0.625697446779    
+  0.633568127441      0.641537809079      0.649607736971      0.657779172060    
+  0.666053391149      0.674431687102      0.682915369045      0.691505762570    
+  0.700204209943      0.709012070315      0.717930719932      0.726961552352    
+  0.736105978659      0.745365427689      0.754741346250      0.764235199349    
+  0.773848470418      0.783582661552      0.793439293738      0.803419907093    
+  0.813526061110      0.823759334896      0.834121327420      0.844613657765    
+  0.855237965379      0.865995910331      0.876889173573      0.887919457198    
+  0.899088484711      0.910398001296      0.921849774087      0.933445592447    
+  0.945187268246      0.957076636146      0.969115553883      0.981305902564    
+  0.993649586955       1.00614853578       1.01880470203       1.03162006325    
+   1.04459662188       1.05773640551       1.07104146728       1.08451388612    
+   1.09815576714       1.11196924189       1.12595646876       1.14011963329    
+   1.15446094849       1.16898265524       1.18368702257       1.19857634807    
+   1.21365295823       1.22891920880       1.24437748517       1.26003020271    
+   1.27587980720       1.29192877518       1.30817961432       1.32463486385    
+   1.34129709495       1.35816891111       1.37525294859       1.39255187681    
+   1.41006839876       1.42780525143       1.44576520624       1.46395106948    
+   1.48236568271       1.50101192327       1.51989270465       1.53901097703    
+   1.55836972768       1.57797198143       1.59782080118       1.61791928835    
+   1.63827058336       1.65887786615       1.67974435665       1.70087331529    
+   1.72226804351       1.74393188429       1.76586822263       1.78808048615    
+   1.81057214554       1.83334671519       1.85640775365       1.87975886427    
+   1.90340369570       1.92734594250       1.95158934569       1.97613769335    
+   2.00099482121       2.02616461325       2.05165100230       2.07745797066    
+   2.10358955072       2.13004982559       2.15684292975       2.18397304967    
+   2.21144442449       2.23926134667       2.26742816266       2.29594927357    
+   2.32482913590       2.35407226217       2.38368322170       2.41366664124    
+   2.44402720577       2.47476965919       2.50589880507       2.53741950740    
+   2.56933669136       2.60165534408       2.63438051540       2.66751731870    
+   2.70107093167       2.73504659715       2.76944962388       2.80428538742    
+   2.83955933092       2.87527696601       2.91144387364       2.94806570496    
+   2.98514818222       3.02269709962       3.06071832426       3.09921779703    
+   3.13820153355       3.17767562512       3.21764623963       3.25811962258    
+   3.29910209801       3.34060006953       3.38262002127       3.42516851894    
+   3.46825221082       3.51187782883       3.55605218957       3.60078219536    
+   3.64607483536       3.69193718664       3.73837641528       3.78539977751    
+   3.83301462082       3.88122838514       3.93004860395       3.97948290551    
+   4.02953901404       4.08022475091       4.13154803587       4.18351688827    
+   4.23613942837       4.28942387854       4.34337856458       4.39801191703    
+   4.45333247245       4.50934887480       4.56606987675       4.62350434107    
+   4.68166124202       4.74054966673       4.80017881664       4.86055800892    
+   4.92169667795       4.98360437676       5.04629077856       5.10976567822    
+   5.17403899384       5.23912076824       5.30502117059       5.37175049796    
+   5.43931917693       5.50773776526       5.57701695349       5.64716756663    
+   5.71820056586       5.79012705022       5.86295825839       5.93670557037    
+   6.01138050935       6.08699474343       6.16356008749       6.24108850501    
+   6.31959210998       6.39908316875       6.47957410194       6.56107748643    
+   6.64360605730       6.72717270979       6.81179050138       6.89747265375    
+   6.98423255493       7.07208376132       7.16103999985       7.25111517012    
+   7.34232334655       7.43467878061       7.52819590302       7.62288932603    
+   7.71877384566       7.81586444408       7.91417629189       8.01372475051    
+   8.11452537459       8.21659391444       8.31994631847       8.42459873571    
+   8.53056751830       8.63786922409       8.74652061919       8.85653868060    
+   8.96794059886       9.08074378075       9.19496585200       9.31062466004    
+   9.42773827678       9.54632500149       9.66640336356       9.78799212549    
+   9.91111028577       10.0357770819       10.1620119932       10.2898347443    
+   10.4192653076       10.5503239070       10.6830310207       10.8174073843    
+   10.9534739945       11.0912521120       11.2307632649       11.3720292520    
+   11.5150721466       11.6599142992       11.8065783418       11.9550871910    
+   12.1054640515       12.2577324201       12.4119160890       12.5680391497    
+   12.7261259968       12.8862013316       13.0482901662       13.2124178274    
+   13.3786099605       13.5468925332       13.7172918401       13.8898345064    
+   14.0645474923       14.2414580970       14.4205939632       14.6019830812    
+   14.7856537934       14.9716347988       15.1599551573       15.3506442942    
+   15.5437320053       15.7392484607       15.9372242104       16.1376901885    
+   16.3406777181       16.5462185166       16.7543447000       16.9650887886    
+   17.1784837114       17.3945628120       17.6133598530       17.8349090221    
+   18.0592449366       18.2864026495       18.5164176548       18.7493258926    
+   18.9851637554       19.2239680933       19.4657762201       19.7106259186    
+   19.9585554472       20.2096035454       20.4638094399       20.7212128509    
+   20.9818539982       21.2457736076       21.5130129171       21.7836136832    
+   22.0576181879       22.3350692450       22.6160102069       22.9004849709    
+   23.1885379870       23.4802142641       23.7755593770       24.0746194741    
+   24.3774412842       24.6840721237       24.9945599044       25.3089531406    
+   25.6273009569       25.9496530957       26.2760599253       26.6065724474    
+   26.9412423053       27.2801217917       27.6232638573       27.9707221188    
+   28.3225508672       28.6788050764       29.0395404119       29.4048132394    
+   29.7746806335       30.1492003866       30.5284310183       30.9124317841    
+   31.3012626850       31.6949844765       32.0936586784       32.4973475845    
+   32.9061142720       33.3200226114       33.7391372768       34.1635237557    
+   34.5932483594       35.0283782331       35.4689813669       35.9151266059    
+   36.3668836611       36.8243231206       37.2875164601       37.7565360547    
+   38.2314551894       38.7123480715       39.1992898414       39.6923565847    
+   40.1916253442       40.6971741316       41.2090819399       41.7274287558    
+   42.2522955719       42.7837643999       43.3219182828       43.8668413082    
+   44.4186186215       44.9773364390       45.5430820614       46.1159438878    
+   46.6960114289       47.2833753214       47.8781273423       48.4803604225    
+   49.0901686624       49.7076473457       50.3328929547       50.9660031853    
+   51.6070769622       52.2562144546       52.9135170915       53.5790875777    
+   54.2530299100       54.9354493933       55.6264526570       56.3261476718    
+   57.0346437664       57.7520516448       58.4784834034       59.2140525488    
+   59.9588740149       60.7130641818       61.4767408931       62.2500234750    
+   63.0330327543       63.8258910779       64.6287223315       65.4416519592    
+   66.2648069827       67.0983160219       67.9423093140       68.7969187350    
+   69.6622778191       70.5385217805       71.4257875341       72.3242137170    
+   73.2339407101       74.1551106601       75.0878675017       76.0323569800    
+   76.9887266734       77.9571260167       78.9377063242       79.9306208136    
+   80.9360246297       81.9540748691       82.9849306040       84.0287529079    
+   85.0857048800       86.1559516713       87.2396605100       88.3370007278    
+   89.4481437863       90.5732633040       91.7125350830       92.8661371368    
+   94.0342497182       95.2170553471       96.4147388393       97.6274873352    
+   98.8554903293       100.098939700       101.358029738       102.632957179    
+   103.923921233       105.231123615       106.554768580       107.895062949    
+   109.252216145       110.626440227       112.017949920       113.426962651    
+   114.853698579       116.298380637       117.761234558       119.242488916    
+ Down Pseudopotential follows (l on next line)
+  0
+ -0.344168687199E-05 -0.692679840936E-05 -0.104554786075E-04 -0.140289478131E-04
+ -0.176469065595E-04 -0.213107567387E-04 -0.250204576271E-04 -0.287769247868E-04
+ -0.325806108655E-04 -0.364321472444E-04 -0.403321296066E-04 -0.442811671561E-04
+ -0.482798785096E-04 -0.523288870839E-04 -0.564288249121E-04 -0.605803351020E-04
+ -0.647840642146E-04 -0.690406688999E-04 -0.733508169255E-04 -0.777151789328E-04
+ -0.821344370388E-04 -0.866092832973E-04 -0.911404171782E-04 -0.957285444134E-04
+ -0.100374383087E-03 -0.105078660462E-03 -0.109842108281E-03 -0.114665475116E-03
+ -0.119549512171E-03 -0.124494981798E-03 -0.129502657329E-03 -0.134573322717E-03
+ -0.139707770074E-03 -0.144906798902E-03 -0.150171224552E-03 -0.155501868603E-03
+ -0.160899563188E-03 -0.166365152228E-03 -0.171899491848E-03 -0.177503443427E-03
+ -0.183177883715E-03 -0.188923699707E-03 -0.194741789671E-03 -0.200633063791E-03
+ -0.206598437413E-03 -0.212638847878E-03 -0.218755239624E-03 -0.224948563469E-03
+ -0.231219789284E-03 -0.237569898767E-03 -0.243999884013E-03 -0.250510745727E-03
+ -0.257103505071E-03 -0.263779192527E-03 -0.270538847013E-03 -0.277383530413E-03
+ -0.284314307686E-03 -0.291332263400E-03 -0.298438495416E-03 -0.305634110901E-03
+ -0.312920236998E-03 -0.320298011876E-03 -0.327768587213E-03 -0.335333130229E-03
+ -0.342992825129E-03 -0.350748865287E-03 -0.358602464327E-03 -0.366554852417E-03
+ -0.374607266828E-03 -0.382760967092E-03 -0.391017229999E-03 -0.399377344966E-03
+ -0.407842615531E-03 -0.416414364742E-03 -0.425093936433E-03 -0.433882682943E-03
+ -0.442781975768E-03 -0.451793210712E-03 -0.460917792987E-03 -0.470157145969E-03
+ -0.479512717321E-03 -0.488985968172E-03 -0.498578376470E-03 -0.508291441805E-03
+ -0.518126684904E-03 -0.528085638490E-03 -0.538169859579E-03 -0.548380926392E-03
+ -0.558720431066E-03 -0.569189991536E-03 -0.579791242488E-03 -0.590525841147E-03
+ -0.601395464919E-03 -0.612401810050E-03 -0.623546599492E-03 -0.634831572710E-03
+ -0.646258492993E-03 -0.657829147133E-03 -0.669545340929E-03 -0.681408907375E-03
+ -0.693421699779E-03 -0.705585592158E-03 -0.717902488767E-03 -0.730374313785E-03
+ -0.743003014199E-03 -0.755790564062E-03 -0.768738961224E-03 -0.781850230270E-03
+ -0.795126417336E-03 -0.808569598877E-03 -0.822181876116E-03 -0.835965373103E-03
+ -0.849922245115E-03 -0.864054673918E-03 -0.878364867097E-03 -0.892855059288E-03
+ -0.907527515729E-03 -0.922384529582E-03 -0.937428421625E-03 -0.952661542551E-03
+ -0.968086271856E-03 -0.983705021111E-03 -0.999520230194E-03 -0.101553436936E-02
+ -0.103174994242E-02 -0.104816948220E-02 -0.106479555412E-02 -0.108163075600E-02
+ -0.109867771954E-02 -0.111593910674E-02 -0.113341761563E-02 -0.115111597786E-02
+ -0.116903695686E-02 -0.118718335562E-02 -0.120555800661E-02 -0.122416378234E-02
+ -0.124300359171E-02 -0.126208037470E-02 -0.128139711482E-02 -0.130095683031E-02
+ -0.132076257612E-02 -0.134081744734E-02 -0.136112457800E-02 -0.138168714216E-02
+ -0.140250835038E-02 -0.142359145705E-02 -0.144493975754E-02 -0.146655658590E-02
+ -0.148844532051E-02 -0.151060938240E-02 -0.153305223304E-02 -0.155577738053E-02
+ -0.157878837581E-02 -0.160208881254E-02 -0.162568233360E-02 -0.164957262462E-02
+ -0.167376341905E-02 -0.169825849540E-02 -0.172306168210E-02 -0.174817685571E-02
+ -0.177360793793E-02 -0.179935890471E-02 -0.182543377914E-02 -0.185183663442E-02
+ -0.187857159765E-02 -0.190564284529E-02 -0.193305460649E-02 -0.196081116681E-02
+ -0.198891686110E-02 -0.201737608151E-02 -0.204619327567E-02 -0.207537294460E-02
+ -0.210491964952E-02 -0.213483800646E-02 -0.216513268980E-02 -0.219580843389E-02
+ -0.222687003166E-02 -0.225832233589E-02 -0.229017026197E-02 -0.232241878590E-02
+ -0.235507294657E-02 -0.238813784596E-02 -0.242161865126E-02 -0.245552059364E-02
+ -0.248984896921E-02 -0.252460914425E-02 -0.255980654798E-02 -0.259544668067E-02
+ -0.263153511248E-02 -0.266807747986E-02 -0.270507949465E-02 -0.274254693828E-02
+ -0.278048566374E-02 -0.281890160054E-02 -0.285780075085E-02 -0.289718919271E-02
+ -0.293707308036E-02 -0.297745864603E-02 -0.301835220049E-02 -0.305976013253E-02
+ -0.310168891261E-02 -0.314414509310E-02 -0.318713530681E-02 -0.323066627127E-02
+ -0.327474478879E-02 -0.331937774578E-02 -0.336457211763E-02 -0.341033496529E-02
+ -0.345667343898E-02 -0.350359478007E-02 -0.355110631966E-02 -0.359921548145E-02
+ -0.364792978309E-02 -0.369725683598E-02 -0.374720434733E-02 -0.379778012281E-02
+ -0.384899206375E-02 -0.390084817209E-02 -0.395335655179E-02 -0.400652540639E-02
+ -0.406036304381E-02 -0.411487787704E-02 -0.417007842325E-02 -0.422597330795E-02
+ -0.428257126561E-02 -0.433988113901E-02 -0.439791188309E-02 -0.445667256572E-02
+ -0.451617236864E-02 -0.457642058816E-02 -0.463742663840E-02 -0.469920005260E-02
+ -0.476175048225E-02 -0.482508770102E-02 -0.488922160617E-02 -0.495416221868E-02
+ -0.501991968523E-02 -0.508650428109E-02 -0.515392641063E-02 -0.522219660830E-02
+ -0.529132554178E-02 -0.536132401262E-02 -0.543220295856E-02 -0.550397345475E-02
+ -0.557664671513E-02 -0.565023409580E-02 -0.572474709487E-02 -0.580019735488E-02
+ -0.587659666606E-02 -0.595395696545E-02 -0.603229034113E-02 -0.611160903342E-02
+ -0.619192543528E-02 -0.627325209739E-02 -0.635560172752E-02 -0.643898719207E-02
+ -0.652342152155E-02 -0.660891790876E-02 -0.669548971258E-02 -0.678315046118E-02
+ -0.687191385112E-02 -0.696179375249E-02 -0.705280420957E-02 -0.714495944286E-02
+ -0.723827385261E-02 -0.733276201933E-02 -0.742843870724E-02 -0.752531886677E-02
+ -0.762341763553E-02 -0.772275034225E-02 -0.782333250835E-02 -0.792517985007E-02
+ -0.802830828179E-02 -0.813273391813E-02 -0.823847307625E-02 -0.834554227819E-02
+ -0.845395825439E-02 -0.856373794583E-02 -0.867489850587E-02 -0.878745730443E-02
+ -0.890143192960E-02 -0.901684019035E-02 -0.913370012038E-02 -0.925202997978E-02
+ -0.937184825856E-02 -0.949317367915E-02 -0.961602519960E-02 -0.974042201633E-02
+ -0.986638356739E-02 -0.999392953552E-02 -0.101230798505E-01 -0.102538546932E-01
+ -0.103862744986E-01 -0.105203599580E-01 -0.106561320239E-01 -0.107936119118E-01
+ -0.109328211039E-01 -0.110737813534E-01 -0.112165146865E-01 -0.113610434064E-01
+ -0.115073900977E-01 -0.116555776284E-01 -0.118056291541E-01 -0.119575681221E-01
+ -0.121114182747E-01 -0.122672036526E-01 -0.124249485988E-01 -0.125846777631E-01
+ -0.127464161050E-01 -0.129101888979E-01 -0.130760217336E-01 -0.132439405254E-01
+ -0.134139715126E-01 -0.135861412653E-01 -0.137604766867E-01 -0.139370050196E-01
+ -0.141157538490E-01 -0.142967511066E-01 -0.144800250762E-01 -0.146656043970E-01
+ -0.148535180687E-01 -0.150437954557E-01 -0.152364662917E-01 -0.154315606851E-01
+ -0.156291091222E-01 -0.158291424736E-01 -0.160316919980E-01 -0.162367893472E-01
+ -0.164444665716E-01 -0.166547561246E-01 -0.168676908680E-01 -0.170833040770E-01
+ -0.173016294453E-01 -0.175227010909E-01 -0.177465535609E-01 -0.179732218369E-01
+ -0.182027413410E-01 -0.184351479405E-01 -0.186704779543E-01 -0.189087681585E-01
+ -0.191500557914E-01 -0.193943785603E-01 -0.196417746466E-01 -0.198922827123E-01
+ -0.201459419062E-01 -0.204027918690E-01 -0.206628727408E-01 -0.209262251666E-01
+ -0.211928903026E-01 -0.214629098235E-01 -0.217363259277E-01 -0.220131813450E-01
+ -0.222935193430E-01 -0.225773837335E-01 -0.228648188798E-01 -0.231558697034E-01
+ -0.234505816912E-01 -0.237490009025E-01 -0.240511739760E-01 -0.243571481378E-01
+ -0.246669712081E-01 -0.249806916087E-01 -0.252983583713E-01 -0.256200211442E-01
+ -0.259457302009E-01 -0.262755364476E-01 -0.266094914309E-01 -0.269476473466E-01
+ -0.272900570471E-01 -0.276367740504E-01 -0.279878525477E-01 -0.283433474127E-01
+ -0.287033142096E-01 -0.290678092021E-01 -0.294368893620E-01 -0.298106123784E-01
+ -0.301890366666E-01 -0.305722213773E-01 -0.309602264055E-01 -0.313531124008E-01
+ -0.317509407757E-01 -0.321537737164E-01 -0.325616741917E-01 -0.329747059631E-01
+ -0.333929335954E-01 -0.338164224657E-01 -0.342452387746E-01 -0.346794495561E-01
+ -0.351191226886E-01 -0.355643269047E-01 -0.360151318030E-01 -0.364716078582E-01
+ -0.369338264326E-01 -0.374018597873E-01 -0.378757810933E-01 -0.383556644432E-01
+ -0.388415848627E-01 -0.393336183227E-01 -0.398318417505E-01 -0.403363330428E-01
+ -0.408471710774E-01 -0.413644357256E-01 -0.418882078650E-01 -0.424185693919E-01
+ -0.429556032346E-01 -0.434993933658E-01 -0.440500248167E-01 -0.446075836893E-01
+ -0.451721571710E-01 -0.457438335476E-01 -0.463227022174E-01 -0.469088537054E-01
+ -0.475023796773E-01 -0.481033729543E-01 -0.487119275273E-01 -0.493281385719E-01
+ -0.499521024637E-01 -0.505839167927E-01 -0.512236803796E-01 -0.518714932908E-01
+ -0.525274568542E-01 -0.531916736753E-01 -0.538642476538E-01 -0.545452839991E-01
+ -0.552348892476E-01 -0.559331712794E-01 -0.566402393351E-01 -0.573562040333E-01
+ -0.580811773879E-01 -0.588152728261E-01 -0.595586052059E-01 -0.603112908345E-01
+ -0.610734474870E-01 -0.618451944242E-01 -0.626266524125E-01 -0.634179437422E-01
+ -0.642191922474E-01 -0.650305233253E-01 -0.658520639562E-01 -0.666839427236E-01
+ -0.675262898348E-01 -0.683792371411E-01 -0.692429181594E-01 -0.701174680925E-01
+ -0.710030238516E-01 -0.718997240773E-01 -0.728077091620E-01 -0.737271212719E-01
+ -0.746581043702E-01 -0.756008042395E-01 -0.765553685052E-01 -0.775219466590E-01
+ -0.785006900830E-01 -0.794917520732E-01 -0.804952878649E-01 -0.815114546564E-01
+ -0.825404116352E-01 -0.835823200026E-01 -0.846373430000E-01 -0.857056459349E-01
+ -0.867873962071E-01 -0.878827633359E-01 -0.889919189872E-01 -0.901150370009E-01
+ -0.912522934190E-01 -0.924038665135E-01 -0.935699368157E-01 -0.947506871447E-01
+ -0.959463026370E-01 -0.971569707764E-01 -0.983828814243E-01 -0.996242268501E-01
+ -0.100881201762     -0.102154003341     -0.103442831266     -0.104747887757    
+ -0.106069377596     -0.107407508169     -0.108762489496     -0.110134534266    
+ -0.111523857870     -0.112930678438     -0.114355216875     -0.115797696895    
+ -0.117258345058     -0.118737390808     -0.120235066511     -0.121751607491    
+ -0.123287252070     -0.124842241607     -0.126416820539     -0.128011236417    
+ -0.129625739953     -0.131260585056     -0.132916028877     -0.134592331850    
+ -0.136289757737     -0.138008573670     -0.139749050195     -0.141511461321    
+ -0.143296084559     -0.145103200976     -0.146933095237     -0.148786055652    
+ -0.150662374229     -0.152562346719     -0.154486272668     -0.156434455467    
+ -0.158407202404     -0.160404824712     -0.162427637628     -0.164475960444    
+ -0.166550116560     -0.168650433540     -0.170777243170     -0.172930881512    
+ -0.175111688963     -0.177320010316     -0.179556194816     -0.181820596220    
+ -0.184113572863     -0.186435487718     -0.188786708455     -0.191167607514    
+ -0.193578562163     -0.196019954566     -0.198492171854     -0.200995606188    
+ -0.203530654832     -0.206097720225     -0.208697210048     -0.211329537301    
+ -0.213995120374     -0.216694383128     -0.219427754963     -0.222195670903    
+ -0.224998571674     -0.227836903780     -0.230711119590     -0.233621677419    
+ -0.236569041612     -0.239553682630     -0.242576077140     -0.245636708102    
+ -0.248736064857     -0.251874643224     -0.255052945593     -0.258271481015    
+ -0.261530765306     -0.264831321141     -0.268173678157     -0.271558373054    
+ -0.274985949700     -0.278456959238     -0.281971960190     -0.285531518572    
+ -0.289136208003     -0.292786609821     -0.296483313199     -0.300226915260    
+ -0.304018021203     -0.307857244423     -0.311745206638     -0.315682538015    
+ -0.319669877300     -0.323707871956     -0.327797178291     -0.331938461602    
+ -0.336132396313     -0.340379666122     -0.344680964143     -0.349036993060    
+ -0.353448465277     -0.357916103076     -0.362440638776     -0.367022814894    
+ -0.371663384312     -0.376363110447     -0.381122767425     -0.385943140255    
+ -0.390825025013     -0.395769229022     -0.400776571049     -0.405847881487    
+ -0.410984002564     -0.416185788534     -0.421454105891     -0.426789833574    
+ -0.432193863189     -0.437667099224     -0.443210459276     -0.448824874287    
+ -0.454511288773     -0.460270661071     -0.466103963587     -0.472012183046    
+ -0.477996320756     -0.484057392872     -0.490196430670     -0.496414480825    
+ -0.502712605700     -0.509091883635     -0.515553409252     -0.522098293762    
+ -0.528727665281     -0.535442669156     -0.542244468293     -0.549134243505    
+ -0.556113193856     -0.563182537024     -0.570343509669     -0.577597367811    
+ -0.584945387217     -0.592388863802     -0.599929114041     -0.607567475384    
+ -0.615305306690     -0.623143988675     -0.631084924364     -0.639129539560    
+ -0.647279283329     -0.655535628489     -0.663900072128     -0.672374136119    
+ -0.680959367663     -0.689657339842     -0.698469652187     -0.707397931265    
+ -0.716443831281     -0.725609034700     -0.734895252882     -0.744304226741    
+ -0.753837727420     -0.763497556990     -0.773285549162     -0.783203570028    
+ -0.793253518819     -0.803437328691     -0.813756967525     -0.824214438764    
+ -0.834811782265     -0.845551075180     -0.856434432865     -0.867464009815    
+ -0.878642000631     -0.889970641011     -0.901452208776     -0.913089024927    
+ -0.924883454731     -0.936837908845     -0.948954844477     -0.961236766571    
+ -0.973686229046     -0.986305836060     -0.999098243319      -1.01206615943    
+  -1.02521234728      -1.03853962550      -1.05205086991      -1.06574901507    
+  -1.07963705584      -1.09371804903      -1.10799511505      -1.12247143963    
+  -1.13715027564      -1.15203494491      -1.16712884011      -1.18243542675    
+  -1.19795824513      -1.21370091251      -1.22966712518      -1.24586066070    
+  -1.26228538022      -1.27894523077      -1.29584424774      -1.31298655736    
+  -1.33037637928      -1.34801802927      -1.36591592189      -1.38407457340    
+  -1.40249860462      -1.42119274396      -1.44016183048      -1.45941081716    
+  -1.47894477410      -1.49876889194      -1.51888848536      -1.53930899664    
+  -1.56003599940      -1.58107520235      -1.60243245323      -1.62411374287    
+  -1.64612520928      -1.66847314195      -1.69116398623      -1.71420434781    
+  -1.73760099741      -1.76136087545      -1.78549109705      -1.80999895693    
+  -1.83489193468      -1.86017769997      -1.88586411799      -1.91195925505    
+  -1.93847138425      -1.96540899136      -1.99278078075      -2.02059568159    
+  -2.04886285410      -2.07759169597      -2.10679184890      -2.13647320537    
+  -2.16664591544      -2.19732039378      -2.22850732681      -2.26021767994    
+  -2.29246270505      -2.32525394800      -2.35860325636      -2.39252278717    
+  -2.42702501497      -2.46212273977      -2.49782909535      -2.53415755743    
+  -2.57112195219      -2.60873646467      -2.64701564744      -2.68597442919    
+  -2.72562812354      -2.76599243779      -2.80708348181      -2.84891777686    
+  -2.89151226458      -2.93488431585      -2.97905173969      -3.02403279220    
+  -3.06984618532      -3.11651109565      -3.16404717314      -3.21247454964    
+  -3.26181384737      -3.31208618720      -3.36331319673      -3.41551701821    
+  -3.46872031616      -3.52294628471      -3.57821865466      -3.63456170020    
+  -3.69200024513      -3.75055966881      -3.81026591149      -3.87114547925    
+  -3.93322544825      -3.99653346845      -4.06109776666      -4.12694714885    
+  -4.19411100170      -4.26261929334      -4.33250257322      -4.40379197100    
+  -4.47651919457      -4.55071652687      -4.62641682179      -4.70365349879    
+  -4.78246053642      -4.86287246459      -4.94492435553      -5.02865181354    
+  -5.11409096334      -5.20127843717      -5.29025136051      -5.38104733656    
+  -5.47370442940      -5.56826114602      -5.66475641720      -5.76322957738    
+  -5.86372034375      -5.96626879460      -6.07091534726      -6.17770073588    
+  -6.28666598936      -6.39785240976      -6.51130155164      -6.62705520293    
+  -6.74515536764      -6.86564425127      -6.98856424948      -7.11395794080    
+  -7.24186808425      -7.37233762281      -7.50540969370      -7.64112764658    
+  -7.77953507092      -7.92067583371      -8.06459412901      -8.21133454068    
+  -8.36094211997      -8.51346247950      -8.66894190539      -8.82742748915    
+  -8.98896728108      -9.15361046658      -9.32140756668      -9.49241066360    
+  -9.66667365155      -9.84425251142      -10.0252056246      -10.2095939263    
+  -10.3974823175      -10.5889348994      -10.7840293936      -10.9828626984    
+  -11.1853196453      -11.3921745678      -11.6014146806      -11.8102642499    
+  -12.0221168165      -12.2393026908      -12.4612848983      -12.6884521500    
+  -12.9209454725      -13.1589193608      -13.4025296562      -13.6519202652    
+  -13.9072279100      -14.1685803710      -14.4360957615      -14.7098813807    
+  -14.9900323702      -15.2766301735      -15.5697408098      -15.8694129709    
+  -16.1756759491      -16.4885373999      -16.8079809489      -17.1339636438    
+  -17.4664132738      -17.8052255636      -18.1502612474      -18.5013430814    
+  -18.8582527990      -19.2207280440      -19.5884593430      -19.9610871550    
+  -20.3381990609      -20.7193271547      -21.1039457167      -21.4914692423    
+  -21.8812509020      -22.2725815555      -22.6646893867      -23.0567402679    
+  -23.4478389742      -23.8370313261      -24.2233073996      -24.6056058837    
+  -24.9828196743      -25.3538028593      -25.7173790806      -26.0723516897    
+  -26.4175138431      -26.7516675473      -27.0736188969      -27.3822418944    
+  -27.6764275575      -27.9551168402      -28.2174096239      -28.4624161308    
+  -28.6893783236      -28.8977228152      -29.0870050447      -29.2569811613    
+  -29.4076063318      -29.5390590615      -29.6517549196      -29.7463586359    
+  -29.8237911770      -29.8852306873      -29.9321054028      -29.9660762971    
+  -29.9890067262      -30.0029158517      -30.0099116235      -30.0121007544    
+  -30.0114611539      -30.0097026191      -30.0080225717      -30.0069049966    
+  -30.0060710840      -30.0053029068      -30.0046205298      -30.0040312326    
+  -30.0035039851      -30.0030426788      -30.0026365663      -30.0022805302    
+  -30.0019688109      -30.0016964272      -30.0014588623      -30.0012520615    
+  -30.0010723889      -30.0007919083      -30.0005824716      -30.0004266961    
+  -30.0003112940      -30.0002261473      -30.0001635825      -30.0001178034    
+  -30.0000844500      -30.0000602557      -30.0000427842      -30.0000302250    
+  -30.0000212399      -30.0000148431      -30.0000103117      -30.0000071190    
+  -30.0000048815      -30.0000033227      -30.0000022433      -30.0000015006    
+  -30.0000009936      -30.0000006497      -30.0000004188      -30.0000002651    
+  -30.0000001639      -30.0000000983      -30.0000000563      -30.0000000300    
+  -30.0000000140      -30.0000000045      -29.9999999993      -29.9999999966    
+  -29.9999999955      -29.9999999953      -29.9999999956      -29.9999999961    
+  -29.9999999966      -29.9999999972      -29.9999999977      -29.9999999982    
+  -29.9999999985      -29.9999999989      -29.9999999991      -29.9999999993    
+  -29.9999999995      -29.9999999996      -29.9999999997      -29.9999999998    
+  -29.9999999998      -29.9999999999      -29.9999999999      -29.9999999999    
+  -29.9999999999      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+ Down Pseudopotential follows (l on next line)
+  1
+ -0.786726987868E-05 -0.158336314041E-04 -0.238999287762E-04 -0.320680913533E-04
+ -0.403385375993E-04 -0.487133963666E-04 -0.571933630364E-04 -0.657800985343E-04
+ -0.744748102476E-04 -0.832788937899E-04 -0.921937186901E-04 -0.101220677731E-03
+ -0.110361182966E-03 -0.119616661227E-03 -0.128988558068E-03 -0.138478340352E-03
+ -0.148087488755E-03 -0.157817504536E-03 -0.167669910693E-03 -0.177646243857E-03
+ -0.187748063028E-03 -0.197976948170E-03 -0.208334497833E-03 -0.218822328139E-03
+ -0.229442079013E-03 -0.240195411154E-03 -0.251084001479E-03 -0.262109555631E-03
+ -0.273273793914E-03 -0.284578459976E-03 -0.296025320787E-03 -0.307616166434E-03
+ -0.319352807822E-03 -0.331237076059E-03 -0.343270831077E-03 -0.355455952178E-03
+ -0.367794342520E-03 -0.380287930522E-03 -0.392938670449E-03 -0.405748535632E-03
+ -0.418719528758E-03 -0.431853676924E-03 -0.445153032842E-03 -0.458619675656E-03
+ -0.472255704380E-03 -0.486063254911E-03 -0.500044485317E-03 -0.514201575315E-03
+ -0.528536739129E-03 -0.543052218464E-03 -0.557750281272E-03 -0.572633220160E-03
+ -0.587703364445E-03 -0.602963069219E-03 -0.618414714668E-03 -0.634060720818E-03
+ -0.649903527853E-03 -0.665945612864E-03 -0.682189483749E-03 -0.698637675451E-03
+ -0.715292760847E-03 -0.732157342024E-03 -0.749234052993E-03 -0.766525561953E-03
+ -0.784034572967E-03 -0.801763818385E-03 -0.819716070163E-03 -0.837894136405E-03
+ -0.856300852166E-03 -0.874939094857E-03 -0.893811779500E-03 -0.912921854350E-03
+ -0.932272302646E-03 -0.951866148270E-03 -0.971706457279E-03 -0.991796325901E-03
+ -0.101213889145E-02 -0.103273733778E-02 -0.105359488061E-02 -0.107471477662E-02
+ -0.109610032984E-02 -0.111775488111E-02 -0.113968181171E-02 -0.116188454855E-02
+ -0.118436656387E-02 -0.120713136650E-02 -0.123018251438E-02 -0.125352361184E-02
+ -0.127715830262E-02 -0.130109028205E-02 -0.132532328834E-02 -0.134986110872E-02
+ -0.137470757737E-02 -0.139986657444E-02 -0.142534203426E-02 -0.145113793551E-02
+ -0.147725830883E-02 -0.150370723689E-02 -0.153048885025E-02 -0.155760733591E-02
+ -0.158506693080E-02 -0.161287192251E-02 -0.164102665927E-02 -0.166953553994E-02
+ -0.169840301733E-02 -0.172763360284E-02 -0.175723186358E-02 -0.178720242570E-02
+ -0.181754996965E-02 -0.184827923930E-02 -0.187939503688E-02 -0.191090222138E-02
+ -0.194280571745E-02 -0.197511051106E-02 -0.200782164925E-02 -0.204094424185E-02
+ -0.207448346545E-02 -0.210844456117E-02 -0.214283283485E-02 -0.217765365978E-02
+ -0.221291247608E-02 -0.224861479443E-02 -0.228476619280E-02 -0.232137231903E-02
+ -0.235843889447E-02 -0.239597170995E-02 -0.243397662988E-02 -0.247245959258E-02
+ -0.251142661225E-02 -0.255088377594E-02 -0.259083724983E-02 -0.263129327730E-02
+ -0.267225817775E-02 -0.271373835479E-02 -0.275574028687E-02 -0.279827053830E-02
+ -0.284133575623E-02 -0.288494266590E-02 -0.292909808371E-02 -0.297380890900E-02
+ -0.301908212662E-02 -0.306492481102E-02 -0.311134412561E-02 -0.315834732454E-02
+ -0.320594174977E-02 -0.325413483908E-02 -0.330293412379E-02 -0.335234722726E-02
+ -0.340238187107E-02 -0.345304587413E-02 -0.350434715105E-02 -0.355629371915E-02
+ -0.360889369526E-02 -0.366215529637E-02 -0.371608684688E-02 -0.377069677277E-02
+ -0.382599360753E-02 -0.388198599001E-02 -0.393868267019E-02 -0.399609250803E-02
+ -0.405422447136E-02 -0.411308764570E-02 -0.417269122798E-02 -0.423304453034E-02
+ -0.429415698470E-02 -0.435603813908E-02 -0.441869766175E-02 -0.448214534580E-02
+ -0.454639110288E-02 -0.461144497211E-02 -0.467731711911E-02 -0.474401783481E-02
+ -0.481155754316E-02 -0.487994679670E-02 -0.494919628094E-02 -0.501931681700E-02
+ -0.509031936114E-02 -0.516221500701E-02 -0.523501498935E-02 -0.530873068297E-02
+ -0.538337360614E-02 -0.545895542163E-02 -0.553548794000E-02 -0.561298311935E-02
+ -0.569145306729E-02 -0.577091004734E-02 -0.585136647267E-02 -0.593283491538E-02
+ -0.601532810637E-02 -0.609885893296E-02 -0.618344044900E-02 -0.626908587034E-02
+ -0.635580857788E-02 -0.644362212370E-02 -0.653254022846E-02 -0.662257678578E-02
+ -0.671374586374E-02 -0.680606170801E-02 -0.689953874356E-02 -0.699419157546E-02
+ -0.709003499379E-02 -0.718708397520E-02 -0.728535368272E-02 -0.738485947144E-02
+ -0.748561688982E-02 -0.758764168048E-02 -0.769094978641E-02 -0.779555734893E-02
+ -0.790148071287E-02 -0.800873642987E-02 -0.811734125839E-02 -0.822731216809E-02
+ -0.833866634263E-02 -0.845142118104E-02 -0.856559430122E-02 -0.868120354425E-02
+ -0.879826697305E-02 -0.891680287901E-02 -0.903682978492E-02 -0.915836644425E-02
+ -0.928143184752E-02 -0.940604522469E-02 -0.953222604599E-02 -0.965999402772E-02
+ -0.978936913468E-02 -0.992037158122E-02 -0.100530218369E-01 -0.101873406291E-01
+ -0.103233489455E-01 -0.104610680372E-01 -0.106005194232E-01 -0.107417248941E-01
+ -0.108847065126E-01 -0.110294866201E-01 -0.111760878394E-01 -0.113245330772E-01
+ -0.114748455279E-01 -0.116270486786E-01 -0.117811663119E-01 -0.119372225086E-01
+ -0.120952416529E-01 -0.122552484359E-01 -0.124172678591E-01 -0.125813252387E-01
+ -0.127474462085E-01 -0.129156567261E-01 -0.130859830747E-01 -0.132584518677E-01
+ -0.134330900549E-01 -0.136099249232E-01 -0.137889841038E-01 -0.139702955757E-01
+ -0.141538876685E-01 -0.143397890697E-01 -0.145280288272E-01 -0.147186363530E-01
+ -0.149116414313E-01 -0.151070742191E-01 -0.153049652533E-01 -0.155053454558E-01
+ -0.157082461358E-01 -0.159136989976E-01 -0.161217361440E-01 -0.163323900812E-01
+ -0.165456937250E-01 -0.167616804045E-01 -0.169803838685E-01 -0.172018382903E-01
+ -0.174260782727E-01 -0.176531388543E-01 -0.178830555140E-01 -0.181158641771E-01
+ -0.183516012208E-01 -0.185903034801E-01 -0.188320082532E-01 -0.190767533070E-01
+ -0.193245768841E-01 -0.195755177082E-01 -0.198296149894E-01 -0.200869084317E-01
+ -0.203474382383E-01 -0.206112451178E-01 -0.208783702913E-01 -0.211488554983E-01
+ -0.214227430034E-01 -0.217000756026E-01 -0.219808966303E-01 -0.222652499661E-01
+ -0.225531800416E-01 -0.228447318474E-01 -0.231399509396E-01 -0.234388834475E-01
+ -0.237415760811E-01 -0.240480761373E-01 -0.243584315086E-01 -0.246726906896E-01
+ -0.249909027845E-01 -0.253131175162E-01 -0.256393852321E-01 -0.259697569133E-01
+ -0.263042841826E-01 -0.266430193115E-01 -0.269860152291E-01 -0.273333255307E-01
+ -0.276850044858E-01 -0.280411070461E-01 -0.284016888548E-01 -0.287668062552E-01
+ -0.291365162992E-01 -0.295108767561E-01 -0.298899461225E-01 -0.302737836304E-01
+ -0.306624492569E-01 -0.310560037340E-01 -0.314545085570E-01 -0.318580259953E-01
+ -0.322666191016E-01 -0.326803517212E-01 -0.330992885033E-01 -0.335234949098E-01
+ -0.339530372265E-01 -0.343879825726E-01 -0.348283989119E-01 -0.352743550633E-01
+ -0.357259207109E-01 -0.361831664160E-01 -0.366461636272E-01 -0.371149846918E-01
+ -0.375897028676E-01 -0.380703923337E-01 -0.385571282023E-01 -0.390499865307E-01
+ -0.395490443328E-01 -0.400543795915E-01 -0.405660712706E-01 -0.410841993272E-01
+ -0.416088447247E-01 -0.421400894443E-01 -0.426780164991E-01 -0.432227099465E-01
+ -0.437742549009E-01 -0.443327375480E-01 -0.448982451573E-01 -0.454708660964E-01
+ -0.460506898448E-01 -0.466378070072E-01 -0.472323093285E-01 -0.478342897078E-01
+ -0.484438422127E-01 -0.490610620945E-01 -0.496860458026E-01 -0.503188909999E-01
+ -0.509596965780E-01 -0.516085626726E-01 -0.522655906793E-01 -0.529308832691E-01
+ -0.536045444051E-01 -0.542866793580E-01 -0.549773947230E-01 -0.556767984367E-01
+ -0.563849997934E-01 -0.571021094624E-01 -0.578282395057E-01 -0.585635033950E-01
+ -0.593080160296E-01 -0.600618937546E-01 -0.608252543789E-01 -0.615982171935E-01
+ -0.623809029905E-01 -0.631734340817E-01 -0.639759343180E-01 -0.647885291083E-01
+ -0.656113454397E-01 -0.664445118972E-01 -0.672881586834E-01 -0.681424176394E-01
+ -0.690074222652E-01 -0.698833077405E-01 -0.707702109462E-01 -0.716682704853E-01
+ -0.725776267051E-01 -0.734984217188E-01 -0.744307994279E-01 -0.753749055446E-01
+ -0.763308876150E-01 -0.772988950416E-01 -0.782790791069E-01 -0.792715929975E-01
+ -0.802765918275E-01 -0.812942326630E-01 -0.823246745469E-01 -0.833680785235E-01
+ -0.844246076635E-01 -0.854944270905E-01 -0.865777040056E-01 -0.876746077145E-01
+ -0.887853096537E-01 -0.899099834173E-01 -0.910488047840E-01 -0.922019517454E-01
+ -0.933696045327E-01 -0.945519456461E-01 -0.957491598827E-01 -0.969614343654E-01
+ -0.981889585728E-01 -0.994319243683E-01 -0.100690526030     -0.101964960283    
+ -0.103255426327     -0.104562125870     -0.105885263159     -0.107225045013    
+ -0.108581680854     -0.109955382740     -0.111346365400     -0.112754846265    
+ -0.114181045504     -0.115625186058     -0.117087493677     -0.118568196949    
+ -0.120067527344     -0.121585719246     -0.123123009988     -0.124679639895    
+ -0.126255852316     -0.127851893665     -0.129468013459     -0.131104464359    
+ -0.132761502205     -0.134439386062     -0.136138378257     -0.137858744421    
+ -0.139600753531     -0.141364677952     -0.143150793478     -0.144959379382    
+ -0.146790718451     -0.148645097035     -0.150522805094     -0.152424136239    
+ -0.154349387781     -0.156298860778     -0.158272860081     -0.160271694382    
+ -0.162295676263     -0.164345122247     -0.166420352845     -0.168521692608    
+ -0.170649470176     -0.172804018335     -0.174985674062     -0.177194778585    
+ -0.179431677434     -0.181696720493     -0.183990262059     -0.186312660897    
+ -0.188664280296     -0.191045488124     -0.193456656892     -0.195898163807    
+ -0.198370390835     -0.200873724759     -0.203408557242     -0.205975284889    
+ -0.208574309309     -0.211206037177     -0.213870880301     -0.216569255687    
+ -0.219301585601     -0.222068297643     -0.224869824808     -0.227706605557    
+ -0.230579083890     -0.233487709410     -0.236432937398     -0.239415228888    
+ -0.242435050734     -0.245492875687     -0.248589182473     -0.251724455864    
+ -0.254899186761     -0.258113872263     -0.261369015759     -0.264665126995    
+ -0.268002722164     -0.271382323987     -0.274804461791     -0.278269671602    
+ -0.281778496222     -0.285331485322     -0.288929195529     -0.292572190509    
+ -0.296261041067     -0.299996325230     -0.303778628344     -0.307608543167    
+ -0.311486669963     -0.315413616600     -0.319389998647     -0.323416439471    
+ -0.327493570341     -0.331622030528     -0.335802467406     -0.340035536559    
+ -0.344321901886     -0.348662235708     -0.353057218876     -0.357507540882    
+ -0.362013899971     -0.366577003253     -0.371197566820     -0.375876315858    
+ -0.380613984768     -0.385411317285     -0.390269066600     -0.395187995479    
+ -0.400168876392     -0.405212491635     -0.410319633463     -0.415491104213    
+ -0.420727716442     -0.426030293056     -0.431399667445     -0.436836683624    
+ -0.442342196367     -0.447917071353     -0.453562185302     -0.459278426128    
+ -0.465066693080     -0.470927896893     -0.476862959938     -0.482872816377    
+ -0.488958412319     -0.495120705975     -0.501360667820     -0.507679280753    
+ -0.514077540265     -0.520556454604     -0.527117044943     -0.533760345557    
+ -0.540487403989     -0.547299281235     -0.554197051920     -0.561181804481    
+ -0.568254641350     -0.575416679144     -0.582669048855     -0.590012896042    
+ -0.597449381028     -0.604979679101     -0.612604980713     -0.620326491686    
+ -0.628145433422     -0.636063043114     -0.644080573960     -0.652199295382    
+ -0.660420493246     -0.668745470088     -0.677175545343     -0.685712055576    
+ -0.694356354720     -0.703109814309     -0.711973823731     -0.720949790466    
+ -0.730039140342     -0.739243317789     -0.748563786097     -0.758002027682    
+ -0.767559544350     -0.777237857572     -0.787038508760     -0.796963059547    
+ -0.807013092074     -0.817190209278     -0.827496035191     -0.837932215238    
+ -0.848500416544     -0.859202328242     -0.870039661792     -0.881014151299    
+ -0.892127553843     -0.903381649810     -0.914778243232     -0.926319162128    
+ -0.938006258858     -0.949841410476     -0.961826519097     -0.973963512262    
+ -0.986254343317     -0.998700991797      -1.01130546381      -1.02406979244    
+  -1.03699603815      -1.05008628918      -1.06334266201      -1.07676730172    
+  -1.09036238248      -1.10413010797      -1.11807271183      -1.13219245815    
+  -1.14649164188      -1.16097258937      -1.17563765882      -1.19048924079    
+  -1.20552975870      -1.22076166936      -1.23618746347      -1.25180966620    
+  -1.26763083770      -1.28365357365      -1.29988050589      -1.31631430294    
+  -1.33295767061      -1.34981335263      -1.36688413124      -1.38417282784    
+  -1.40168230361      -1.41941546018      -1.43737524033      -1.45556462861    
+  -1.47398665211      -1.49264438111      -1.51154092987      -1.53067945733    
+  -1.55006316788      -1.56969531216      -1.58957918782      -1.60971814036    
+  -1.63011556394      -1.65077490224      -1.67169964932      -1.69289335048    
+  -1.71435960322      -1.73610205810      -1.75812441974      -1.78043044773    
+  -1.80302395767      -1.82590882212      -1.84908897170      -1.87256839606    
+  -1.89635114505      -1.92044132971      -1.94484312351      -1.96956076342    
+  -1.99459855110      -2.01996085413      -2.04565210721      -2.07167681344    
+  -2.09803954555      -2.12474494729      -2.15179773470      -2.17920269753    
+  -2.20696470062      -2.23508868531      -2.26357967093      -2.29244275629    
+  -2.32168312121      -2.35130602804      -2.38131682331      -2.41172093930    
+  -2.44252389574      -2.47373130148      -2.50534885624      -2.53738235233    
+  -2.56983767651      -2.60272081176      -2.63603783923      -2.66979494005    
+  -2.70399839735      -2.73865459822      -2.77377003571      -2.80935131090    
+  -2.84540513495      -2.88193833129      -2.91895783772      -2.95647070865    
+  -2.99448411726      -3.03300535784      -3.07204184804      -3.11160113119    
+  -3.15169087868      -3.19231889232      -3.23349310675      -3.27522159191    
+  -3.31751255544      -3.36037434521      -3.40381545179      -3.44784451097    
+  -3.49247030628      -3.53770177150      -3.58354799326      -3.63001821347    
+  -3.67712183197      -3.72486840895      -3.77326766751      -3.82232949613    
+  -3.87206395109      -3.92248125895      -3.97359181887      -4.02540620495    
+  -4.07793516848      -4.13118964014      -4.18518073209      -4.23991973998    
+  -4.29541814487      -4.35168761496      -4.40874000730      -4.46658736924    
+  -4.52524193977      -4.58471615069      -4.64502262748      -4.70617419008    
+  -4.76818385331      -4.83106482712      -4.89483051643      -4.95949452074    
+  -5.02507063336      -5.09157284027      -5.15901531855      -5.22741243438    
+  -5.29677874055      -5.36712897347      -5.43847804961      -5.51084106131    
+  -5.58423327202      -5.65867011078      -5.73416716597      -5.81074017827    
+  -5.88840503279      -5.96717775028      -6.04707447730      -6.12811147550    
+  -6.21030510965      -6.29367183458      -6.37822818085      -6.46399073910    
+  -6.55097614295      -6.63920105049      -6.72868212411      -6.81943600870    
+  -6.91147930804      -7.00482855941      -7.09950020610      -7.19551056795    
+  -7.29287580964      -7.39161190669      -7.49173460907      -7.59325940222    
+  -7.69620146543      -7.80057562742      -7.90639631901      -8.01367752275    
+  -8.12243271931      -8.23267483065      -8.34441615960      -8.45766832601    
+  -8.57244219906      -8.68874782577      -8.80659435555      -8.92598996058    
+  -9.04694175207      -9.16945569209      -9.29353650104      -9.41918756057    
+  -9.54641081190      -9.67520664950      -9.80557381009      -9.93750925686    
+  -10.0710080591      -10.2060632670      -10.3426657822      -10.4808042232    
+  -10.6204647875      -10.7616311084      -10.9042841091      -11.0484018527    
+  -11.1939593889      -11.3409285989      -11.4892780376      -11.6389727745    
+  -11.7899742343      -11.9422400377      -12.0957238430      -12.2503751910    
+  -12.4061393529      -12.5629571835      -12.7207649812      -12.8794943563    
+  -13.0390721098      -13.1994201243      -13.3604552701      -13.5220893281    
+  -13.6842289332      -13.8467755397      -14.0096254135      -14.1726696535    
+  -14.3357942460      -14.4988801559      -14.6618034591      -14.8244355200    
+  -14.9866432189      -15.1482892329      -15.3092323756      -15.4693279995    
+  -15.6284284640      -15.7863836724      -15.9430416970      -16.0982492953    
+  -16.2518537434      -16.4036985526      -16.5536384383      -16.7015454972    
+  -16.8470786609      -16.9907860453      -17.1304291968      -17.2630082265    
+  -17.3916950955      -17.5186022815      -17.6429800079      -17.7650106218    
+  -17.8846367581      -18.0018241640      -18.1165513928      -18.2287984911    
+  -18.3385538778      -18.4458148854      -18.5505895102      -18.6528979269    
+  -18.7527740015      -18.8502668082      -18.9454421711      -19.0383842437    
+  -19.1291971409      -19.2180066292      -19.3049618876      -19.3902373357    
+  -19.4740345486      -19.5565842523      -19.6381483910      -19.7190222998    
+  -19.7995369524      -19.8800612771      -19.9610045438      -20.0428187832    
+  -20.1260012146      -20.2110966222      -20.2986996275      -20.3894567566    
+  -20.4840681812      -20.5832890169      -20.6879299683      -20.7988571108    
+  -20.9169905638      -21.0433017254      -21.1788087493      -21.3245698477    
+  -21.4816739744      -21.6512284780      -21.8343431398      -22.0321104415    
+  -22.2455796747      -22.4757334352      -22.7234333871      -22.9894274945    
+  -23.2742354596      -23.5781112300      -23.9010755557      -24.2426861525    
+  -24.6020748277      -24.9779155742      -25.3682866811      -25.7706674995    
+  -26.1818737878      -26.5980375239      -27.0146020196      -27.4263499290    
+  -27.8274705686      -28.2116764077      -28.5723789514      -28.9029350281    
+  -29.1969752129      -29.4488270662      -29.6540467726      -29.8100771572    
+  -29.9170421718      -29.9787342448      -30.0037403026      -30.0069047125    
+  -30.0060710840      -30.0053029068      -30.0046205298      -30.0040312326    
+  -30.0035039851      -30.0030426788      -30.0026365663      -30.0022805302    
+  -30.0019688109      -30.0016964272      -30.0014588623      -30.0012520615    
+  -30.0010723889      -30.0007919083      -30.0005824716      -30.0004266961    
+  -30.0003112940      -30.0002261473      -30.0001635825      -30.0001178034    
+  -30.0000844500      -30.0000602557      -30.0000427842      -30.0000302250    
+  -30.0000212399      -30.0000148431      -30.0000103117      -30.0000071190    
+  -30.0000048815      -30.0000033227      -30.0000022433      -30.0000015006    
+  -30.0000009936      -30.0000006497      -30.0000004188      -30.0000002651    
+  -30.0000001639      -30.0000000983      -30.0000000563      -30.0000000300    
+  -30.0000000140      -30.0000000045      -29.9999999993      -29.9999999966    
+  -29.9999999955      -29.9999999953      -29.9999999956      -29.9999999961    
+  -29.9999999966      -29.9999999972      -29.9999999977      -29.9999999982    
+  -29.9999999985      -29.9999999989      -29.9999999991      -29.9999999993    
+  -29.9999999995      -29.9999999996      -29.9999999997      -29.9999999998    
+  -29.9999999998      -29.9999999999      -29.9999999999      -29.9999999999    
+  -29.9999999999      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+ Down Pseudopotential follows (l on next line)
+  2
+ -0.140097856392E-04 -0.281959262620E-04 -0.425602379214E-04 -0.571056340534E-04
+ -0.718335295773E-04 -0.867470623356E-04 -0.101847949390E-03 -0.117138886199E-03
+ -0.132622127695E-03 -0.148300130212E-03 -0.164175337344E-03 -0.180250229448E-03
+ -0.196527319830E-03 -0.213009150428E-03 -0.229698295930E-03 -0.246597366531E-03
+ -0.263709000627E-03 -0.281035871752E-03 -0.298580689931E-03 -0.316346193748E-03
+ -0.334335159278E-03 -0.352550398867E-03 -0.370994758950E-03 -0.389671119228E-03
+ -0.408582399102E-03 -0.427731554839E-03 -0.447121575220E-03 -0.466755494254E-03
+ -0.486636377319E-03 -0.506767330058E-03 -0.527151498565E-03 -0.547792069399E-03
+ -0.568692267504E-03 -0.589855355812E-03 -0.611284644090E-03 -0.632983479711E-03
+ -0.654955252370E-03 -0.677203395722E-03 -0.699731388200E-03 -0.722542746476E-03
+ -0.745641035992E-03 -0.769029866255E-03 -0.792712892292E-03 -0.816693815716E-03
+ -0.840976378419E-03 -0.865564379841E-03 -0.890461662517E-03 -0.915672111820E-03
+ -0.941199669082E-03 -0.967048324845E-03 -0.993222117891E-03 -0.101972513393E-02
+ -0.104656151795E-02 -0.107373546353E-02 -0.110125121249E-02 -0.112911306989E-02
+ -0.115732538467E-02 -0.118589256668E-02 -0.121481908089E-02 -0.124410944393E-02
+ -0.127376823529E-02 -0.130380008892E-02 -0.133420969624E-02 -0.136500180874E-02
+ -0.139618123998E-02 -0.142775285835E-02 -0.145972159869E-02 -0.149209245922E-02
+ -0.152487049264E-02 -0.155806082192E-02 -0.159166863586E-02 -0.162569918512E-02
+ -0.166015778429E-02 -0.169504981794E-02 -0.173038074248E-02 -0.176615607459E-02
+ -0.180238140248E-02 -0.183906239170E-02 -0.187620477091E-02 -0.191381434132E-02
+ -0.195189698351E-02 -0.199045864727E-02 -0.202950535567E-02 -0.206904321060E-02
+ -0.210907839295E-02 -0.214961715427E-02 -0.219066582972E-02 -0.223223083578E-02
+ -0.227431866371E-02 -0.231693589218E-02 -0.236008917901E-02 -0.240378526776E-02
+ -0.244803098613E-02 -0.249283324544E-02 -0.253819904934E-02 -0.258413548438E-02
+ -0.263064972822E-02 -0.267774905012E-02 -0.272544080730E-02 -0.277373245401E-02
+ -0.282263153552E-02 -0.287214568940E-02 -0.292228265597E-02 -0.297305026887E-02
+ -0.302445645887E-02 -0.307650925910E-02 -0.312921680267E-02 -0.318258732663E-02
+ -0.323662916769E-02 -0.329135077203E-02 -0.334676069071E-02 -0.340286757874E-02
+ -0.345968020452E-02 -0.351720744612E-02 -0.357545829164E-02 -0.363444184154E-02
+ -0.369416731323E-02 -0.375464403951E-02 -0.381588146931E-02 -0.387788917118E-02
+ -0.394067683322E-02 -0.400425426757E-02 -0.406863140774E-02 -0.413381831190E-02
+ -0.419982516719E-02 -0.426666228642E-02 -0.433434011288E-02 -0.440286922132E-02
+ -0.447226032072E-02 -0.454252425195E-02 -0.461367199482E-02 -0.468571466686E-02
+ -0.475866352296E-02 -0.483252996429E-02 -0.490732552972E-02 -0.498306190762E-02
+ -0.505975093368E-02 -0.513740458692E-02 -0.521603500361E-02 -0.529565446988E-02
+ -0.537627542513E-02 -0.545791046697E-02 -0.554057235143E-02 -0.562427399565E-02
+ -0.570902847577E-02 -0.579484903592E-02 -0.588174908680E-02 -0.596974220508E-02
+ -0.605884214054E-02 -0.614906281612E-02 -0.624041832726E-02 -0.633292294983E-02
+ -0.642659113792E-02 -0.652143752553E-02 -0.661747693476E-02 -0.671472437103E-02
+ -0.681319503003E-02 -0.691290429661E-02 -0.701386775159E-02 -0.711610117172E-02
+ -0.721962052859E-02 -0.732444199960E-02 -0.743058196276E-02 -0.753805700162E-02
+ -0.764688391095E-02 -0.775707969426E-02 -0.786866156908E-02 -0.798164697271E-02
+ -0.809605355718E-02 -0.821189919934E-02 -0.832920200113E-02 -0.844798028960E-02
+ -0.856825262596E-02 -0.869003780231E-02 -0.881335484739E-02 -0.893822303048E-02
+ -0.906466186229E-02 -0.919269109848E-02 -0.932233074477E-02 -0.945360105732E-02
+ -0.958652254740E-02 -0.972111598392E-02 -0.985740239814E-02 -0.999540308482E-02
+ -0.101351396057E-01 -0.102766337973E-01 -0.104199077662E-01 -0.105649839000E-01
+ -0.107118848682E-01 -0.108606336222E-01 -0.110112534062E-01 -0.111637677546E-01
+ -0.113182004968E-01 -0.114745757647E-01 -0.116329179918E-01 -0.117932519194E-01
+ -0.119556025997E-01 -0.121199954007E-01 -0.122864560095E-01 -0.124550104349E-01
+ -0.126256850144E-01 -0.127985064171E-01 -0.129735016456E-01 -0.131506980436E-01
+ -0.133301232988E-01 -0.135118054459E-01 -0.136957728744E-01 -0.138820543289E-01
+ -0.140706789159E-01 -0.142616761093E-01 -0.144550757524E-01 -0.146509080640E-01
+ -0.148492036440E-01 -0.150499934761E-01 -0.152533089339E-01 -0.154591817871E-01
+ -0.156676442026E-01 -0.158787287529E-01 -0.160924684218E-01 -0.163088966056E-01
+ -0.165280471217E-01 -0.167499542137E-01 -0.169746525541E-01 -0.172021772528E-01
+ -0.174325638617E-01 -0.176658483785E-01 -0.179020672545E-01 -0.181412573998E-01
+ -0.183834561887E-01 -0.186287014645E-01 -0.188770315476E-01 -0.191284852409E-01
+ -0.193831018338E-01 -0.196409211108E-01 -0.199019833572E-01 -0.201663293647E-01
+ -0.204340004373E-01 -0.207050383997E-01 -0.209794856026E-01 -0.212573849284E-01
+ -0.215387797999E-01 -0.218237141855E-01 -0.221122326073E-01 -0.224043801469E-01
+ -0.227002024526E-01 -0.229997457481E-01 -0.233030568375E-01 -0.236101831135E-01
+ -0.239211725663E-01 -0.242360737880E-01 -0.245549359829E-01 -0.248778089746E-01
+ -0.252047432118E-01 -0.255357897797E-01 -0.258710004054E-01 -0.262104274653E-01
+ -0.265541239969E-01 -0.269021437033E-01 -0.272545409631E-01 -0.276113708404E-01
+ -0.279726890898E-01 -0.283385521687E-01 -0.287090172444E-01 -0.290841422027E-01
+ -0.294639856584E-01 -0.298486069628E-01 -0.302380662140E-01 -0.306324242665E-01
+ -0.310317427396E-01 -0.314360840280E-01 -0.318455113115E-01 -0.322600885640E-01
+ -0.326798805645E-01 -0.331049529070E-01 -0.335353720102E-01 -0.339712051283E-01
+ -0.344125203616E-01 -0.348593866674E-01 -0.353118738694E-01 -0.357700526705E-01
+ -0.362339946627E-01 -0.367037723380E-01 -0.371794591011E-01 -0.376611292796E-01
+ -0.381488581360E-01 -0.386427218796E-01 -0.391427976782E-01 -0.396491636705E-01
+ -0.401618989779E-01 -0.406810837173E-01 -0.412067990128E-01 -0.417391270095E-01
+ -0.422781508857E-01 -0.428239548655E-01 -0.433766242333E-01 -0.439362453457E-01
+ -0.445029056450E-01 -0.450766936750E-01 -0.456576990917E-01 -0.462460126794E-01
+ -0.468417263650E-01 -0.474449332309E-01 -0.480557275304E-01 -0.486742047030E-01
+ -0.493004613884E-01 -0.499345954416E-01 -0.505767059489E-01 -0.512268932430E-01
+ -0.518852589185E-01 -0.525519058478E-01 -0.532269381979E-01 -0.539104614455E-01
+ -0.546025823942E-01 -0.553034091916E-01 -0.560130513448E-01 -0.567316197393E-01
+ -0.574592266549E-01 -0.581959857835E-01 -0.589420122479E-01 -0.596974226186E-01
+ -0.604623349323E-01 -0.612368687107E-01 -0.620211449790E-01 -0.628152862848E-01
+ -0.636194167169E-01 -0.644336619256E-01 -0.652581491413E-01 -0.660930071950E-01
+ -0.669383665383E-01 -0.677943592639E-01 -0.686611191259E-01 -0.695387815611E-01
+ -0.704274837097E-01 -0.713273644375E-01 -0.722385643568E-01 -0.731612258487E-01
+ -0.740954930856E-01 -0.750415120530E-01 -0.759994305735E-01 -0.769693983288E-01
+ -0.779515668834E-01 -0.789460897088E-01 -0.799531222067E-01 -0.809728217337E-01
+ -0.820053476265E-01 -0.830508612252E-01 -0.841095259001E-01 -0.851815070768E-01
+ -0.862669722613E-01 -0.873660910672E-01 -0.884790352418E-01 -0.896059786926E-01
+ -0.907470975151E-01 -0.919025700201E-01 -0.930725767613E-01 -0.942573005638E-01
+ -0.954569265528E-01 -0.966716421821E-01 -0.979016372638E-01 -0.991471039979E-01
+ -0.100408237002     -0.101685233343     -0.102978292565     -0.104287616725    
+ -0.105613410419     -0.106955880819     -0.108315237703     -0.109691693487    
+ -0.111085463260     -0.112496764818     -0.113925818696     -0.115372848202    
+ -0.116838079455     -0.118321741420     -0.119824065939     -0.121345287775    
+ -0.122885644640     -0.124445377240     -0.126024729308     -0.127623947645    
+ -0.129243282154     -0.130882985884     -0.132543315068     -0.134224529162    
+ -0.135926890887     -0.137650666269     -0.139396124679     -0.141163538881    
+ -0.142953185069     -0.144765342910     -0.146600295594     -0.148458329871    
+ -0.150339736099     -0.152244808290     -0.154173844155     -0.156127145153    
+ -0.158105016532     -0.160107767385     -0.162135710691     -0.164189163368    
+ -0.166268446324     -0.168373884501     -0.170505806933     -0.172664546793    
+ -0.174850441447     -0.177063832504     -0.179305065876     -0.181574491823    
+ -0.183872465016     -0.186199344588     -0.188555494192     -0.190941282055    
+ -0.193357081041     -0.195803268705     -0.198280227352     -0.200788344101    
+ -0.203328010940     -0.205899624794     -0.208503587579     -0.211140306272    
+ -0.213810192972     -0.216513664963     -0.219251144784     -0.222023060289    
+ -0.224829844719     -0.227671936767     -0.230549780649     -0.233463826171    
+ -0.236414528802     -0.239402349743     -0.242427756002     -0.245491220464    
+ -0.248593221969     -0.251734245383     -0.254914781675     -0.258135327998    
+ -0.261396387762     -0.264698470713     -0.268042093018     -0.271427777339    
+ -0.274856052922     -0.278327455674     -0.281842528251     -0.285401820141    
+ -0.289005887751     -0.292655294495     -0.296350610881     -0.300092414601    
+ -0.303881290623     -0.307717831280     -0.311602636367     -0.315536313230    
+ -0.319519476867     -0.323552750020     -0.327636763277     -0.331772155165    
+ -0.335959572257     -0.340199669270     -0.344493109169     -0.348840563269    
+ -0.353242711344     -0.357700241733     -0.362213851445     -0.366784246271    
+ -0.371412140899     -0.376098259018     -0.380843333439     -0.385648106208    
+ -0.390513328720     -0.395439761842     -0.400428176031     -0.405479351454    
+ -0.410594078113     -0.415773155967     -0.421017395060     -0.426327615650    
+ -0.431704648334     -0.437149334183     -0.442662524874     -0.448245082823    
+ -0.453897881319     -0.459621804670     -0.465417748333     -0.471286619061    
+ -0.477229335046     -0.483246826061     -0.489340033611     -0.495509911080    
+ -0.501757423879     -0.508083549605     -0.514489278189     -0.520975612060    
+ -0.527543566296     -0.534194168789     -0.540928460410     -0.547747495168    
+ -0.554652340384     -0.561644076854     -0.568723799026     -0.575892615170    
+ -0.583151647555     -0.590502032628     -0.597944921194     -0.605481478601    
+ -0.613112884922     -0.620840335145     -0.628665039364     -0.636588222969    
+ -0.644611126843     -0.652735007563     -0.660961137595     -0.669290805499    
+ -0.677725316138     -0.686265990881     -0.694914167820     -0.703671201981    
+ -0.712538465541     -0.721517348046     -0.730609256640     -0.739815616284    
+ -0.749137869988     -0.758577479043     -0.768135923253     -0.777814701177    
+ -0.787615330366     -0.797539347612     -0.807588309192     -0.817763791119    
+ -0.828067389400     -0.838500720290     -0.849065420556     -0.859763147739    
+ -0.870595580426     -0.881564418518     -0.892671383510     -0.903918218768    
+ -0.915306689813     -0.926838584608     -0.938515713849     -0.950339911262    
+ -0.962313033899     -0.974436962444     -0.986713601519     -0.999144879999    
+  -1.01173275132      -1.02447919382      -1.03738621102      -1.05045583202    
+  -1.06369011177      -1.07709113143      -1.09066099875      -1.10440184836    
+  -1.11831584215      -1.13240516963      -1.14667204832      -1.16111872405    
+  -1.17574747140      -1.19056059404      -1.20556042514      -1.22074932774    
+  -1.23612969515      -1.25170395138      -1.26747455149      -1.28344398205    
+  -1.29961476157      -1.31598944086      -1.33257060353      -1.34936086640    
+  -1.36636287992      -1.38357932869      -1.40101293183      -1.41866644353    
+  -1.43654265344      -1.45464438722      -1.47297450699      -1.49153591181    
+  -1.51033153822      -1.52936436073      -1.54863739230      -1.56815368494    
+  -1.58791633018      -1.60792845961      -1.62819324549      -1.64871390123    
+  -1.66949368200      -1.69053588532      -1.71184385157      -1.73342096469    
+  -1.75527065267      -1.77739638825      -1.79980168949      -1.82249012045    
+  -1.84546529176      -1.86873086133      -1.89229053500      -1.91614806721    
+  -1.94030726167      -1.96477197208      -1.98954610282      -2.01463360968    
+  -2.04003850057      -2.06576483630      -2.09181673130      -2.11819835439    
+  -2.14491392959      -2.17196773688      -2.19936411304      -2.22710745243    
+  -2.25520220787      -2.28365289145      -2.31246407544      -2.34164039311    
+  -2.37118653967      -2.40110727316      -2.43140741540      -2.46209185289    
+  -2.49316553782      -2.52463348898      -2.55650079282      -2.58877260443    
+  -2.62145414856      -2.65455072067      -2.68806768803      -2.72201049075    
+  -2.75638464292      -2.79119573374      -2.82644942863      -2.86215147043    
+  -2.89830768056      -2.93492396027      -2.97200629181      -3.00956073973    
+  -3.04759345215      -3.08611066202      -3.12511868851      -3.16462393830    
+  -3.20463290697      -3.24515218042      -3.28618843625      -3.32774844527    
+  -3.36983907289      -3.41246728070      -3.45564012799      -3.49936477325    
+  -3.54364847583      -3.58849859752      -3.63392260419      -3.67992806748    
+  -3.72652266650      -3.77371418957      -3.82151053597      -3.86991971777    
+  -3.91894986162      -3.96860921064      -4.01890612632      -4.06984909042    
+  -4.12144670695      -4.17370770414      -4.22664093650      -4.28025538686    
+  -4.33456016846      -4.38956452707      -4.44527784318      -4.50170963416    
+  -4.55886955649      -4.61676740805      -4.67541313036      -4.73481681096    
+  -4.79498868571      -4.85593914122      -4.91767871723      -4.98021810908    
+  -5.04356817017      -5.10773991447      -5.17274451901      -5.23859332648    
+  -5.30529784778      -5.37286976458      -5.44132093197      -5.51066338106    
+  -5.58090932163      -5.65207114476      -5.72416142551      -5.79719292554    
+  -5.87117859577      -5.94613157906      -6.02206521282      -6.09899303162    
+  -6.17692876983      -6.25588636415      -6.33587995617      -6.41692389487    
+  -6.49903273905      -6.58222125974      -6.66650444248      -6.75189748964    
+  -6.83841582248      -6.92607508328      -7.01489113724      -7.10488007434    
+  -7.19605821096      -7.28844209145      -7.38204848945      -7.47689440906    
+  -7.57299708580      -7.67037398730      -7.76904281379      -7.86902149827    
+  -7.97032820643      -8.07298133619      -8.17699951691      -8.28240160820    
+  -8.38920669835      -8.49743410226      -8.60710335889      -8.71823422818    
+  -8.83084668746      -8.94496092711      -9.06059734569      -9.17777654431    
+  -9.29651932020      -9.41684665950      -9.53877972918      -9.66233986795    
+  -9.78754857627      -9.91442750515      -10.0429984439      -10.1732833067    
+  -10.3053041175      -10.4390829942      -10.5746421304      -10.7120037766    
+  -10.8511902190      -10.9922237566      -11.1351266764      -11.2799212272    
+  -11.4266295902      -11.5752738480      -11.7258759511      -11.8784576819    
+  -12.0330406154      -12.1896460784      -12.3482951041      -12.5090083844    
+  -12.6718062191      -12.8367084608      -13.0037344570      -13.1729029870    
+  -13.3442321965      -13.5177395259      -13.6934416362      -13.8713543283    
+  -14.0514924583      -14.2338698480      -14.4184991889      -14.6053919419    
+  -14.7945582299      -14.9860067254      -15.1797445311      -15.3757770542    
+  -15.5741078742      -15.7747386035      -15.9776687403      -16.1828955157    
+  -16.3904137312      -16.6002155899      -16.8122905198      -17.0266249881    
+  -17.2432023084      -17.4620024391      -17.6830017746      -17.9061729270    
+  -18.1314845009      -18.3589008597      -18.5883818846      -18.8198827259    
+  -19.0533535476      -19.2887392652      -19.5259792779      -19.7650071954    
+  -20.0057505605      -20.2481305680      -20.4920617822      -20.7374518527    
+  -20.9842012313      -21.2322028915      -21.4813420515      -21.7314959047    
+  -21.9825333587      -22.2343147854      -22.4866917863      -22.7395069756    
+  -22.9925937839      -23.2457762882      -23.4988690703      -23.7516771105    
+  -24.0039957191      -24.2556105132      -24.5062974431      -24.7558228753    
+  -25.0039437369      -25.2504077302      -25.4949536218      -25.7373116138    
+  -25.9772038034      -26.2143447360      -26.4484420730      -26.6791971819    
+  -26.9063070769      -27.1294602789      -27.3483519672      -27.5626903829    
+  -27.7719665532      -27.9765569609      -28.1740481625      -28.3612623456    
+  -28.5411910965      -28.7157646026      -28.8840494793      -29.0460438002    
+  -29.2015059739      -29.3502183357      -29.4919776604      -29.6265847183    
+  -29.7538520630      -29.8736055161      -29.9856868833      -30.0899564464    
+  -30.1862954484      -30.2746085609      -30.3548263321      -30.4269076066    
+  -30.4908419022      -30.5466517209      -30.5943947724      -30.6341660697    
+  -30.6660998777      -30.6903714661      -30.7071986147      -30.7168428591    
+  -30.7196104031      -30.7158526445      -30.7059662756      -30.6903928831    
+  -30.6696179872      -30.6441694381      -30.6146150967      -30.5815596972    
+  -30.5456407748      -30.5075235671      -30.4678947167      -30.4274546204    
+  -30.3869082529      -30.3469542200      -30.3082718212      -30.2715058102    
+  -30.2372485058      -30.2060189331      -30.1782384624      -30.1542028008    
+  -30.1340478716      -30.1177179503      -30.1049026076      -30.0950341320    
+  -30.0871613879      -30.0801780141      -30.0738500694      -30.0680896888    
+  -30.0628188469      -30.0580018355      -30.0535686536      -30.0494667609    
+  -30.0456405375      -30.0420387803      -30.0386144876      -30.0353269058    
+  -30.0321436171      -30.0290429129      -30.0260161581      -30.0230697709    
+  -30.0202262970      -30.0175239775      -30.0150137190      -30.0127546360    
+  -30.0107981094      -30.0091915038      -30.0079147003      -30.0069051317    
+  -30.0060710840      -30.0053029068      -30.0046205298      -30.0040312326    
+  -30.0035039851      -30.0030426788      -30.0026365663      -30.0022805302    
+  -30.0019688109      -30.0016964272      -30.0014588623      -30.0012520615    
+  -30.0010723889      -30.0007919083      -30.0005824716      -30.0004266961    
+  -30.0003112940      -30.0002261473      -30.0001635825      -30.0001178034    
+  -30.0000844500      -30.0000602557      -30.0000427842      -30.0000302250    
+  -30.0000212399      -30.0000148431      -30.0000103117      -30.0000071190    
+  -30.0000048815      -30.0000033227      -30.0000022433      -30.0000015006    
+  -30.0000009936      -30.0000006497      -30.0000004188      -30.0000002651    
+  -30.0000001639      -30.0000000983      -30.0000000563      -30.0000000300    
+  -30.0000000140      -30.0000000045      -29.9999999993      -29.9999999966    
+  -29.9999999955      -29.9999999953      -29.9999999956      -29.9999999961    
+  -29.9999999966      -29.9999999972      -29.9999999977      -29.9999999982    
+  -29.9999999985      -29.9999999989      -29.9999999991      -29.9999999993    
+  -29.9999999995      -29.9999999996      -29.9999999997      -29.9999999998    
+  -29.9999999998      -29.9999999999      -29.9999999999      -29.9999999999    
+  -29.9999999999      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+  -30.0000000000      -30.0000000000      -30.0000000000      -30.0000000000    
+ Down Pseudopotential follows (l on next line)
+  3
+ -0.107149210866E-04 -0.215647528627E-04 -0.325507900762E-04 -0.436754183009E-04
+ -0.549395179543E-04 -0.663456856534E-04 -0.778950904275E-04 -0.895898728082E-04
+ -0.101431725821E-03 -0.113422536828E-03 -0.125564173289E-03 -0.137858532184E-03
+ -0.150307536104E-03 -0.162913128839E-03 -0.175677279408E-03 -0.188601984719E-03
+ -0.201689262162E-03 -0.214941156460E-03 -0.228359740913E-03 -0.241947109373E-03
+ -0.255705385072E-03 -0.269636719304E-03 -0.283743289134E-03 -0.298027296475E-03
+ -0.312490974413E-03 -0.327136584268E-03 -0.341966411135E-03 -0.356982776480E-03
+ -0.372188024182E-03 -0.387584529304E-03 -0.403174698174E-03 -0.418960968280E-03
+ -0.434945806071E-03 -0.451131706442E-03 -0.467521201466E-03 -0.484116851038E-03
+ -0.500921247470E-03 -0.517937017003E-03 -0.535166820502E-03 -0.552613346785E-03
+ -0.570279323029E-03 -0.588167509931E-03 -0.606280703030E-03 -0.624621733644E-03
+ -0.643193462417E-03 -0.661998796463E-03 -0.681040674760E-03 -0.700322067764E-03
+ -0.719845990381E-03 -0.739615495070E-03 -0.759633670736E-03 -0.779903641263E-03
+ -0.800428577704E-03 -0.821211687472E-03 -0.842256213797E-03 -0.863565450605E-03
+ -0.885142722970E-03 -0.906991404004E-03 -0.929114908900E-03 -0.951516691304E-03
+ -0.974200254355E-03 -0.997169142100E-03 -0.102042694236E-02 -0.104397728915E-02
+ -0.106782386447E-02 -0.109197039095E-02 -0.111642064325E-02 -0.114117844479E-02
+ -0.116624765874E-02 -0.119163220352E-02 -0.121733604829E-02 -0.124336320869E-02
+ -0.126971774876E-02 -0.129640378678E-02 -0.132342549699E-02 -0.135078709771E-02
+ -0.137849286250E-02 -0.140654712570E-02 -0.143495426805E-02 -0.146371872584E-02
+ -0.149284499760E-02 -0.152233763364E-02 -0.155220124000E-02 -0.158244048368E-02
+ -0.161306009267E-02 -0.164406484728E-02 -0.167545959298E-02 -0.170724923781E-02
+ -0.173943874559E-02 -0.177203314838E-02 -0.180503753791E-02 -0.183845707193E-02
+ -0.187229697243E-02 -0.190656252480E-02 -0.194125908630E-02 -0.197639207639E-02
+ -0.201196698467E-02 -0.204798937111E-02 -0.208446486213E-02 -0.212139915942E-02
+ -0.215879803364E-02 -0.219666732544E-02 -0.223501295559E-02 -0.227384091531E-02
+ -0.231315726979E-02 -0.235296816308E-02 -0.239327981549E-02 -0.243409852716E-02
+ -0.247543067358E-02 -0.251728271499E-02 -0.255966119158E-02 -0.260257272215E-02
+ -0.264602401331E-02 -0.269002185538E-02 -0.273457312248E-02 -0.277968477448E-02
+ -0.282536386127E-02 -0.287161752087E-02 -0.291845297985E-02 -0.296587755640E-02
+ -0.301389865999E-02 -0.306252379544E-02 -0.311176055996E-02 -0.316161664597E-02
+ -0.321209984516E-02 -0.326321804474E-02 -0.331497923188E-02 -0.336739149433E-02
+ -0.342046302276E-02 -0.347420210810E-02 -0.352861714809E-02 -0.358371664578E-02
+ -0.363950920862E-02 -0.369600355709E-02 -0.375320851562E-02 -0.381113302404E-02
+ -0.386978613488E-02 -0.392917700901E-02 -0.398931492910E-02 -0.405020929181E-02
+ -0.411186961069E-02 -0.417430552071E-02 -0.423752677801E-02 -0.430154326207E-02
+ -0.436636497321E-02 -0.443200204100E-02 -0.449846472245E-02 -0.456576340083E-02
+ -0.463390859238E-02 -0.470291094583E-02 -0.477278124120E-02 -0.484353039724E-02
+ -0.491516946873E-02 -0.498770964757E-02 -0.506116227046E-02 -0.513553881359E-02
+ -0.521085089902E-02 -0.528711029305E-02 -0.536432891239E-02 -0.544251882361E-02
+ -0.552169224146E-02 -0.560186153925E-02 -0.568303924301E-02 -0.576523803590E-02
+ -0.584847076323E-02 -0.593275042936E-02 -0.601809020237E-02 -0.610450341919E-02
+ -0.619200357988E-02 -0.628060435712E-02 -0.637031959577E-02 -0.646116331228E-02
+ -0.655314970302E-02 -0.664629314035E-02 -0.674060817769E-02 -0.683610955269E-02
+ -0.693281218743E-02 -0.703073119123E-02 -0.712988186505E-02 -0.723027970106E-02
+ -0.733194038664E-02 -0.743487980616E-02 -0.753911404486E-02 -0.764465938928E-02
+ -0.775153232993E-02 -0.785974956837E-02 -0.796932801160E-02 -0.808028478209E-02
+ -0.819263721838E-02 -0.830640287333E-02 -0.842159952506E-02 -0.853824517309E-02
+ -0.865635804216E-02 -0.877595658914E-02 -0.889705950116E-02 -0.901968570078E-02
+ -0.914385434827E-02 -0.926958484556E-02 -0.939689683873E-02 -0.952581021961E-02
+ -0.965634513158E-02 -0.978852197191E-02 -0.992236139241E-02 -0.100578843060E-01
+ -0.101951118890E-01 -0.103340655824E-01 -0.104747670995E-01 -0.106172384244E-01
+ -0.107615018182E-01 -0.109075798233E-01 -0.110554952642E-01 -0.112052712528E-01
+ -0.113569311926E-01 -0.115104987804E-01 -0.116659980111E-01 -0.118234531832E-01
+ -0.119828888980E-01 -0.121443300677E-01 -0.123078019192E-01 -0.124733299942E-01
+ -0.126409401571E-01 -0.128106585979E-01 -0.129825118347E-01 -0.131565267203E-01
+ -0.133327304455E-01 -0.135111505418E-01 -0.136918148878E-01 -0.138747517132E-01
+ -0.140599896025E-01 -0.142475574989E-01 -0.144374847103E-01 -0.146298009143E-01
+ -0.148245361598E-01 -0.150217208748E-01 -0.152213858704E-01 -0.154235623447E-01
+ -0.156282818876E-01 -0.158355764875E-01 -0.160454785352E-01 -0.162580208276E-01
+ -0.164732365755E-01 -0.166911594066E-01 -0.169118233722E-01 -0.171352629517E-01
+ -0.173615130576E-01 -0.175906090427E-01 -0.178225867036E-01 -0.180574822871E-01
+ -0.182953324970E-01 -0.185361744975E-01 -0.187800459209E-01 -0.190269848732E-01
+ -0.192770299384E-01 -0.195302201876E-01 -0.197865951827E-01 -0.200461949818E-01
+ -0.203090601492E-01 -0.205752317581E-01 -0.208447513981E-01 -0.211176611833E-01
+ -0.213940037560E-01 -0.216738222957E-01 -0.219571605251E-01 -0.222440627163E-01
+ -0.225345736990E-01 -0.228287388663E-01 -0.231266041823E-01 -0.234282161898E-01
+ -0.237336220161E-01 -0.240428693821E-01 -0.243560066089E-01 -0.246730826249E-01
+ -0.249941469743E-01 -0.253192498247E-01 -0.256484419745E-01 -0.259817748607E-01
+ -0.263193005680E-01 -0.266610718362E-01 -0.270071420679E-01 -0.273575653379E-01
+ -0.277123964013E-01 -0.280716907013E-01 -0.284355043793E-01 -0.288038942824E-01
+ -0.291769179731E-01 -0.295546337376E-01 -0.299371005954E-01 -0.303243783085E-01
+ -0.307165273905E-01 -0.311136091165E-01 -0.315156855319E-01 -0.319228194627E-01
+ -0.323350745256E-01 -0.327525151367E-01 -0.331752065234E-01 -0.336032147329E-01
+ -0.340366066429E-01 -0.344754499734E-01 -0.349198132954E-01 -0.353697660424E-01
+ -0.358253785222E-01 -0.362867219261E-01 -0.367538683409E-01 -0.372268907607E-01
+ -0.377058630979E-01 -0.381908601939E-01 -0.386819578319E-01 -0.391792327486E-01
+ -0.396827626459E-01 -0.401926262026E-01 -0.407089030880E-01 -0.412316739731E-01
+ -0.417610205435E-01 -0.422970255129E-01 -0.428397726347E-01 -0.433893467167E-01
+ -0.439458336331E-01 -0.445093203379E-01 -0.450798948798E-01 -0.456576464143E-01
+ -0.462426652188E-01 -0.468350427063E-01 -0.474348714396E-01 -0.480422451459E-01
+ -0.486572587314E-01 -0.492800082964E-01 -0.499105911497E-01 -0.505491058244E-01
+ -0.511956520931E-01 -0.518503309834E-01 -0.525132447937E-01 -0.531844971096E-01
+ -0.538641928192E-01 -0.545524381306E-01 -0.552493405877E-01 -0.559550090872E-01
+ -0.566695538958E-01 -0.573930866672E-01 -0.581257204596E-01 -0.588675697539E-01
+ -0.596187504704E-01 -0.603793799884E-01 -0.611495771633E-01 -0.619294623457E-01
+ -0.627191574007E-01 -0.635187857257E-01 -0.643284722710E-01 -0.651483435587E-01
+ -0.659785277021E-01 -0.668191544269E-01 -0.676703550901E-01 -0.685322627015E-01
+ -0.694050119442E-01 -0.702887391955E-01 -0.711835825486E-01 -0.720896818337E-01
+ -0.730071786402E-01 -0.739362163388E-01 -0.748769401038E-01 -0.758294969360E-01
+ -0.767940356855E-01 -0.777707070747E-01 -0.787596637228E-01 -0.797610601685E-01
+ -0.807750528950E-01 -0.818018003543E-01 -0.828414629915E-01 -0.838942032706E-01
+ -0.849601856992E-01 -0.860395768552E-01 -0.871325454115E-01 -0.882392621636E-01
+ -0.893599000557E-01 -0.904946342079E-01 -0.916436419435E-01 -0.928071028167E-01
+ -0.939851986412E-01 -0.951781135176E-01 -0.963860338634E-01 -0.976091484411E-01
+ -0.988476483886E-01 -0.100101727248     -0.101371580998     -0.102657408082    
+ -0.103959409440     -0.105277788541     -0.106612751414     -0.107964506680    
+ -0.109333265586     -0.110719242036     -0.112122652626     -0.113543716677    
+ -0.114982656271     -0.116439696283     -0.117915064419     -0.119408991249    
+ -0.120921710245     -0.122453457818     -0.124004473352     -0.125574999245    
+ -0.127165280945     -0.128775566989     -0.130406109040     -0.132057161930    
+ -0.133728983698     -0.135421835629     -0.137135982298     -0.138871691609    
+ -0.140629234837     -0.142408886671     -0.144210925260     -0.146035632250    
+ -0.147883292834     -0.149754195795     -0.151648633548     -0.153566902193    
+ -0.155509301553     -0.157476135227     -0.159467710634     -0.161484339065    
+ -0.163526335728     -0.165594019799     -0.167687714471     -0.169807747007    
+ -0.171954448791     -0.174128155375     -0.176329206540     -0.178557946340    
+ -0.180814723165     -0.183099889789     -0.185413803428     -0.187756825796    
+ -0.190129323160     -0.192531666402     -0.194964231070     -0.197427397445    
+ -0.199921550594     -0.202447080433     -0.205004381792     -0.207593854468    
+ -0.210215903297     -0.212870938212     -0.215559374310     -0.218281631915    
+ -0.221038136647     -0.223829319485     -0.226655616838     -0.229517470614    
+ -0.232415328285     -0.235349642962     -0.238320873464     -0.241329484392    
+ -0.244375946198     -0.247460735264     -0.250584333974     -0.253747230791    
+ -0.256949920333     -0.260192903451     -0.263476687308     -0.266801785461    
+ -0.270168717937     -0.273578011321     -0.277030198834     -0.280525820418    
+ -0.284065422825     -0.287649559697     -0.291278791658     -0.294953686401    
+ -0.298674818778     -0.302442770888     -0.306258132175     -0.310121499513    
+ -0.314033477308     -0.317994677587     -0.322005720101     -0.326067232416    
+ -0.330179850018     -0.334344216412     -0.338560983222     -0.342830810295    
+ -0.347154365808     -0.351532326368     -0.355965377127     -0.360454211883    
+ -0.364999533196     -0.369602052495     -0.374262490193     -0.378981575801    
+ -0.383760048046     -0.388598654982     -0.393498154117     -0.398459312528    
+ -0.403482906984     -0.408569724070     -0.413720560314     -0.418936222310    
+ -0.424217526849     -0.429565301050     -0.434980382490     -0.440463619338    
+ -0.446015870493     -0.451638005715     -0.457330905772     -0.463095462575