mirror of
https://github.com/triqs/dft_tools
synced 2024-10-31 19:23:45 +01:00
39edb2f846
- Make more general constructors for the gf.
gf( mesh, target_shape_t)
- remove the old make_gf for the basic gf.
- 2 var non generic gf removed.
- clean evaluator
- add tensor_valued
- add a simple vertex test.
- clean specialisation
- Fix bug introduced in 1906dc3
- forgot to resize the gf in new version of operator =
- Fix make_singularity in gf.hpp
- clean resize in operator =
- update h5 read/write for block gf
- changed a bit the general trait to save *all* the gf.
- allows a more general specialization, then a correct for blocks
- NOT FINISHED : need to save the block indice for python.
How to reread ?
Currently it read the blocks names and reconstitute the mesh from it.
Is it sufficient ?
- clean block constructors
- block constructors simplest possible : an int for the number of blocks
- rest in free factories.
- fixed the generic constructor from GfType for the regular type :
only enable iif GfType is ImmutableGreenFunction
- multivar. fix linear index in C, and h5 format
- linear index now correctly flatten in C mode
(was in fortran mode), using a simple reverse of the tuple in the folding.
- fix the h5 read write of the multivar fonctions
in order to write an array on dimension # variables + dim_target
i.e. without flattening the indices of the meshes.
Easier for later data analysis, e.g. in Python.
- merge matrix/tensor_valued. improve factories
- matrix_valued now = tensor_valued<2>
(simplifies generic code for h5).
- factories_one_var -> factories : this is the generic case ...
only a few specialization, code is simpler.
- clef expression call with rvalue for *this
- generalize matrix_proxy to tensor and clean
- clean exception catch in tests
- exception catching catch in need in test
because the silly OS X does not print anything, just "exception occurred".
Very convenient for the developer...
- BUT, one MUST add return 1, or the make test will *pass* !!
- --> systematically replace the catch by a macro TRIQS_CATCH_AND_ABORT
which return a non zero error code.
- exception : curry_and_fourier which does not work at this stage
(mesh incompatible).
- gf: clean draft of gf 2 times
- comment the python interface for the moment.
- rm useless tests
133 lines
5.4 KiB
C++
133 lines
5.4 KiB
C++
/*******************************************************************************
|
|
*
|
|
* TRIQS: a Toolbox for Research in Interacting Quantum Systems
|
|
*
|
|
* Copyright (C) 2013 by O. Parcollet
|
|
*
|
|
* TRIQS is free software: you can redistribute it and/or modify it under the
|
|
* terms of the GNU General Public License as published by the Free Software
|
|
* Foundation, either version 3 of the License, or (at your option) any later
|
|
* version.
|
|
*
|
|
* TRIQS is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
|
* details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along with
|
|
* TRIQS. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
******************************************************************************/
|
|
#ifndef TRIQS_GFS_MATRIX_TENSOR_PROXY_H
|
|
#define TRIQS_GFS_MATRIX_TENSOR_PROXY_H
|
|
#include <triqs/arrays.hpp>
|
|
|
|
namespace triqs {
|
|
namespace arrays {
|
|
|
|
template <class T> struct _remove_rvalue_ref {
|
|
typedef T type;
|
|
};
|
|
template <class T> struct _remove_rvalue_ref<T &&> {
|
|
typedef T type;
|
|
};
|
|
|
|
// tensor const
|
|
template <typename A, bool IsMatrix>
|
|
struct const_matrix_tensor_proxy : std::conditional<IsMatrix, TRIQS_CONCEPT_TAG_NAME(ImmutableMatrix),
|
|
TRIQS_CONCEPT_TAG_NAME(ImmutableCuboidArray)>::type {
|
|
|
|
typedef typename std::remove_reference<A>::type A_t;
|
|
A a;
|
|
long n;
|
|
|
|
typedef typename A_t::value_type value_type;
|
|
typedef indexmaps::slicer<typename A_t::indexmap_type, long, ellipsis> slicer_t;
|
|
typedef typename slicer_t::r_type indexmap_type;
|
|
typedef typename indexmap_type::domain_type domain_type;
|
|
typedef typename std::conditional<IsMatrix, matrix_view<value_type>,
|
|
array_view<value_type, domain_type::rank>>::type view_type;
|
|
|
|
template <typename AA> const_matrix_tensor_proxy(AA &&a_, long n_) : a(std::forward<AA>(a_)), n(n_) {}
|
|
|
|
indexmap_type indexmap() const { return slicer_t::invoke(a.indexmap(), n, ellipsis()); }
|
|
domain_type domain() const { return indexmap().domain(); }
|
|
|
|
auto storage() const DECL_AND_RETURN(a.storage());
|
|
value_type const *restrict data_start() const { return &storage()[indexmap().start_shift()]; }
|
|
value_type *restrict data_start() { return &storage()[indexmap().start_shift()]; }
|
|
|
|
view_type operator()() const { return *this; }
|
|
template <typename... Args> value_type const &operator()(Args &&... args) const { return a(n, std::forward<Args>(args)...); }
|
|
|
|
TRIQS_DELETE_COMPOUND_OPERATORS(const_matrix_tensor_proxy);
|
|
friend std::ostream &operator<<(std::ostream &out, const_matrix_tensor_proxy const &x) { return out << view_type(x); }
|
|
};
|
|
|
|
template <typename A, bool IsMatrix>
|
|
auto get_shape(const_matrix_tensor_proxy<A, IsMatrix> const &x) DECL_AND_RETURN(get_shape(x.a).front_pop());
|
|
|
|
// factory
|
|
template <typename A>
|
|
const_matrix_tensor_proxy<typename _remove_rvalue_ref<A>::type, false> make_const_tensor_proxy(A &&a, long n) {
|
|
return {std::forward<A>(a), n};
|
|
}
|
|
template <typename A>
|
|
const_matrix_tensor_proxy<typename _remove_rvalue_ref<A>::type, true> make_const_matrix_proxy(A &&a, long n) {
|
|
return {std::forward<A>(a), n};
|
|
}
|
|
|
|
// tensor no const
|
|
template <typename A, bool IsMatrix>
|
|
struct matrix_tensor_proxy : std::conditional<IsMatrix, TRIQS_CONCEPT_TAG_NAME(MutableMatrix),
|
|
TRIQS_CONCEPT_TAG_NAME(MutableCuboidArray)>::type {
|
|
|
|
typedef typename std::remove_reference<A>::type A_t;
|
|
A a;
|
|
long n;
|
|
|
|
typedef typename A_t::value_type value_type;
|
|
typedef indexmaps::slicer<typename A_t::indexmap_type, long, ellipsis> slicer_t;
|
|
typedef typename slicer_t::r_type indexmap_type;
|
|
typedef typename indexmap_type::domain_type domain_type;
|
|
typedef typename std::conditional<IsMatrix, matrix_view<value_type>,
|
|
array_view<value_type, domain_type::rank>>::type view_type;
|
|
|
|
template <typename AA> matrix_tensor_proxy(AA &&a_, long n_) : a(std::forward<AA>(a_)), n(n_) {}
|
|
|
|
indexmap_type indexmap() const { return slicer_t::invoke(a.indexmap(), n, ellipsis()); }
|
|
domain_type domain() const { return indexmap().domain(); }
|
|
|
|
auto storage() const DECL_AND_RETURN(a.storage());
|
|
value_type const *restrict data_start() const { return &storage()[indexmap().start_shift()]; }
|
|
value_type *restrict data_start() { return &storage()[indexmap().start_shift()]; }
|
|
|
|
view_type operator()() const { return *this; }
|
|
template <typename... Args> value_type &operator()(Args &&... args) const { return a(n, std::forward<Args>(args)...); }
|
|
|
|
template <typename RHS> matrix_tensor_proxy &operator=(const RHS &X) {
|
|
triqs_arrays_assign_delegation(*this, X);
|
|
return *this;
|
|
}
|
|
|
|
TRIQS_DEFINE_COMPOUND_OPERATORS(matrix_tensor_proxy);
|
|
friend std::ostream &operator<<(std::ostream &out, matrix_tensor_proxy const &x) {
|
|
return out << view_type{x};
|
|
}
|
|
};
|
|
|
|
template <typename A, bool IsMatrix>
|
|
auto get_shape(matrix_tensor_proxy<A, IsMatrix> const &x) DECL_AND_RETURN(get_shape(x.a).front_pop());
|
|
|
|
// factory
|
|
template <typename A> matrix_tensor_proxy<typename _remove_rvalue_ref<A>::type, false> make_tensor_proxy(A &&a, long n) {
|
|
return {std::forward<A>(a), n};
|
|
}
|
|
template <typename A> matrix_tensor_proxy<typename _remove_rvalue_ref<A>::type, true> make_matrix_proxy(A &&a, long n) {
|
|
return {std::forward<A>(a), n};
|
|
}
|
|
}
|
|
}
|
|
#endif
|
|
|