From 3648fd74e82264adcef1dc0508389c54293d34aa Mon Sep 17 00:00:00 2001
From: Nils Wentzell <nwentzell@flatironinstitute.org>
Date: Tue, 18 May 2021 14:29:45 -0400
Subject: [PATCH] Automated porting to triqs + meshes + nda

---
 c++/triqs_dft_tools/converters/vasp/dos_tetra3d.cpp   | 10 +++++-----
 c++/triqs_dft_tools/converters/vasp/dos_tetra3d.hpp   |  8 ++++----
 python/triqs_dft_tools/converters/plovasp/atm_desc.py |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/c++/triqs_dft_tools/converters/vasp/dos_tetra3d.cpp b/c++/triqs_dft_tools/converters/vasp/dos_tetra3d.cpp
index 7055ac56..34161960 100644
--- a/c++/triqs_dft_tools/converters/vasp/dos_tetra3d.cpp
+++ b/c++/triqs_dft_tools/converters/vasp/dos_tetra3d.cpp
@@ -18,7 +18,7 @@
 * TRIQS. If not, see <http://www.gnu.org/licenses/>.
 *
 *******************************************************************************/
-#include <triqs/arrays.hpp>
+#include <nda/nda.hpp>
 #include <iostream>
 #include <complex>
 
@@ -28,8 +28,8 @@
 //#define __TETRA_DEBUG
 #define __TETRA_ARRAY_VIEW
 
-using triqs::arrays::array;
-using triqs::arrays::array_view;
+using nda::array;
+using nda::array_view;
 
 /***************************************************
 
@@ -79,12 +79,12 @@ array<double, 2> dos_tetra_weights_3d(array<double, 1> eigk, double en, array<lo
   int ntet; /// Number of tetrahedra
 // Auxiliary variables and loop indices
 
-  if (first_dim(itt) != NUM_TET_CORNERS + 1)
+  if (itt.shape()[0] != NUM_TET_CORNERS + 1)
   {
       TRIQS_RUNTIME_ERROR << "  The first dimension of 'itt' must be equal to 5";
   }
 
-  ntet = second_dim(itt);
+  ntet = itt.shape()[1];
 
   array<double, 2> cti(NUM_TET_CORNERS, ntet); // Corner weights to be returned
 
diff --git a/c++/triqs_dft_tools/converters/vasp/dos_tetra3d.hpp b/c++/triqs_dft_tools/converters/vasp/dos_tetra3d.hpp
index 5420f9f2..ffc16964 100644
--- a/c++/triqs_dft_tools/converters/vasp/dos_tetra3d.hpp
+++ b/c++/triqs_dft_tools/converters/vasp/dos_tetra3d.hpp
@@ -20,16 +20,16 @@
 *******************************************************************************/
 #pragma once
 
-#include <triqs/arrays.hpp>
+#include <nda/nda.hpp>
 
 
 /// DOS of a band by analytical tetrahedron method
 ///
 ///   Returns corner weights for all tetrahedra for a given band and real energy.
-triqs::arrays::array<double, 2>
-dos_tetra_weights_3d(triqs::arrays::array_view<double, 1> eigk, /// Band energies for each k-point
+nda::array<double, 2>
+dos_tetra_weights_3d(nda::array_view<double, 1> eigk, /// Band energies for each k-point
                      double en, /// Energy at which DOS weights are to be calculated
-                     triqs::arrays::array_view<long, 2> itt /// Tetrahedra defined by k-point indices
+                     nda::array_view<long, 2> itt /// Tetrahedra defined by k-point indices
 );
 //array<double, 2> 
 //dos_tetra_weights_3d(array<double, 1> eigk, /// Band energies for each k-point
diff --git a/python/triqs_dft_tools/converters/plovasp/atm_desc.py b/python/triqs_dft_tools/converters/plovasp/atm_desc.py
index 383a98d9..0dc18d39 100644
--- a/python/triqs_dft_tools/converters/plovasp/atm_desc.py
+++ b/python/triqs_dft_tools/converters/plovasp/atm_desc.py
@@ -13,7 +13,7 @@ module.add_include("triqs_dft_tools/converters/vasp/dos_tetra3d.hpp")
 # Add here anything to add in the C++ code at the start, e.g. namespace using
 module.add_preamble("""
 #include <triqs/cpp2py_converters/arrays.hpp>
-using namespace triqs::arrays;
+using namespace nda;
 """)
 
 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.""")