From 3807534ef81b8759338411219f57c27bd44d33ca Mon Sep 17 00:00:00 2001
From: Nils Wentzell <nwentzell@flatironinstitute.org>
Date: Tue, 2 Jul 2019 10:49:35 -0400
Subject: [PATCH] Fix in dos_tetra_weights_3d: return array<..> instead of
 array_view<..>

-In triqs version 2.2 array_views no longer own the memory they point to
 This means that array variables that are local to a function should always
 be returned as arrray and never as an array_view
---
 c++/plovasp/atm/dos_tetra3d.cpp       | 2 +-
 c++/plovasp/atm/dos_tetra3d.hpp       | 2 +-
 python/converters/plovasp/atm_desc.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/c++/plovasp/atm/dos_tetra3d.cpp b/c++/plovasp/atm/dos_tetra3d.cpp
index f3310f0a..7055ac56 100644
--- a/c++/plovasp/atm/dos_tetra3d.cpp
+++ b/c++/plovasp/atm/dos_tetra3d.cpp
@@ -71,7 +71,7 @@ static const double small = 2.5e-2, tol = 1e-8;
   Returns corner contributions to the DOS of a band
 */
 #ifdef __TETRA_ARRAY_VIEW
-array_view<double, 2> dos_tetra_weights_3d(array_view<double, 1> eigk, double en, array_view<long, 2> itt)
+array<double, 2> dos_tetra_weights_3d(array_view<double, 1> eigk, double en, array_view<long, 2> itt)
 #else
 array<double, 2> dos_tetra_weights_3d(array<double, 1> eigk, double en, array<long, 2> itt)
 #endif
diff --git a/c++/plovasp/atm/dos_tetra3d.hpp b/c++/plovasp/atm/dos_tetra3d.hpp
index 8b07d1dd..abdda06b 100644
--- a/c++/plovasp/atm/dos_tetra3d.hpp
+++ b/c++/plovasp/atm/dos_tetra3d.hpp
@@ -28,7 +28,7 @@ using triqs::arrays::array_view;
 /// DOS of a band by analytical tetrahedron method
 ///
 ///   Returns corner weights for all tetrahedra for a given band and real energy.
-array_view<double, 2> 
+array<double, 2>
 dos_tetra_weights_3d(array_view<double, 1> eigk, /// Band energies for each k-point
                      double en, /// Energy at which DOS weights are to be calculated
                      array_view<long, 2> itt /// Tetrahedra defined by k-point indices
diff --git a/python/converters/plovasp/atm_desc.py b/python/converters/plovasp/atm_desc.py
index ac3776f0..55ff109a 100644
--- a/python/converters/plovasp/atm_desc.py
+++ b/python/converters/plovasp/atm_desc.py
@@ -15,6 +15,6 @@ module.add_preamble("""
 #include <triqs/cpp2py_converters/arrays.hpp>
 """)
 
-module.add_function ("array_view<double,2> dos_tetra_weights_3d (array_view<double,1> eigk, double en, array_view<long,2> itt)", doc = """DOS of a band by analytical tetrahedron method\n\n   Returns corner weights for all tetrahedra for a given band and real energy.""")
+module.add_function ("array<double,2> dos_tetra_weights_3d (array_view<double,1> eigk, double en, array_view<long,2> itt)", doc = """DOS of a band by analytical tetrahedron method\n\n   Returns corner weights for all tetrahedra for a given band and real energy.""")
 
 module.generate_code()