From 3648fd74e82264adcef1dc0508389c54293d34aa Mon Sep 17 00:00:00 2001 From: Nils Wentzell 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 . * *******************************************************************************/ -#include +#include #include #include @@ -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 dos_tetra_weights_3d(array eigk, double en, array 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 +#include /// DOS of a band by analytical tetrahedron method /// /// Returns corner weights for all tetrahedra for a given band and real energy. -triqs::arrays::array -dos_tetra_weights_3d(triqs::arrays::array_view eigk, /// Band energies for each k-point +nda::array +dos_tetra_weights_3d(nda::array_view eigk, /// Band energies for each k-point double en, /// Energy at which DOS weights are to be calculated - triqs::arrays::array_view itt /// Tetrahedra defined by k-point indices + nda::array_view itt /// Tetrahedra defined by k-point indices ); //array //dos_tetra_weights_3d(array 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 -using namespace triqs::arrays; +using namespace nda; """) module.add_function ("array dos_tetra_weights_3d (array_view eigk, double en, array_view 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.""")