GridTools · havogt · Mar 26, 2019 · Mar 22, 2019
diff --git a/include/gridtools/communication/halo_exchange.hpp b/include/gridtools/communication/halo_exchange.hpp
@@ -302,60 +302,6 @@ namespace gridtools {
         explicit halo_exchange_dynamic_ut(typename grid_type::period_type const &c, MPI_Comm const &comm)
             : hd(c.template permute<layout2proc_map_abs>(), comm) {}
 
-        /** constructor that takes the periodicity (mathich the \link
-            boollist_concept \endlink concept, and the MPI CART
-            communicator in DIMS (specified as template argument to the
-            pattern) dimensions of the processing grid. the periodicity is
-            specified in the order chosen by the programmer for the data,
-            as in the rest of the application. It is up tp the
-            construnctor implementation to translate it into the right
-            order depending on the gridtools::layout_map passed to the class.
-
-            Examples:
-            1) hd(period_type(true, true, false), MPI_COMM_WORLD, array<int, 3>{0,0,0});
-               Supposing this this is executed in 8 processors, the communicator used by the pattern is a 2x2x2;
-
-            2) hd(period_type(true, true, false), MPI_COMM_WORLD, array<int, 3>{4,0,0});
-               Supposing this this is executed in 8 processors, the communicator used by the pattern is a 4x2x1;
-
-            2) hd(period_type(true, true, false), MPI_COMM_WORLD, array<int, 3>{4,1,0});
-               Supposing this this is executed in 8 processors, the communicator used by the pattern is a 4x1x2;
-            End of examples.
-
-            \tparam ValueType Value type of the GridTools array of dimensions (deduced)
-            \tparam Size  Size of the GridTools array of dimensions (deduced)
-            \param[in] c Periodicity specification as in \link boollist_concept \endlink
-            \param[in] comm MPI CART communicator with dimension DIMS (specified as template argument to the pattern).
-            \param[in] dims Array of dimensions of the ocmputing grid. Array must provide operator[] up to 3 elements.
-           The behavior is like MPI_Dims_create.
-        */
-        template <typename ValueType, size_t Size>
-        GT_DEPRECATED(
-            "halo_exchange_dynamic_ut(period, MPI_Comm, dims) is deprecated, since it creates an additional "
-            "communicator that is not freed. Use the constructor without dims and pass to it a Cartesian communicator")
-        explicit halo_exchange_dynamic_ut(
-            typename grid_type::period_type const &c, MPI_Comm const &comm, array<ValueType, Size> &&dims)
-            : hd(c.template permute<layout2proc_map_abs>(), _impl::_make_comm(comm, dims)) {}
-
-        /**
-           Same signature of halo_exchange_dynamic_ut [this] constructor but takes the dims array as reference, in case
-           the output of the MPI_Cart_create is needed.
-
-            \tparam ValueType Value type of the GridTools array of dimensions (deduced)
-            \tparam Size  Size of the GridTools array of dimensions (deduced)
-            \param[in] c Periodicity specification as in \link boollist_concept \endlink
-            \param[in] comm MPI CART communicator with dimension DIMS (specified as template argument to the pattern).
-            \param[in] dims Array of dimensions of the ocmputing grid. Array must provide operator[] up to 3 elements.
-           The behavior is like MPI_Dims_create.
-         */
-        template <typename ValueType, size_t Size>
-        GT_DEPRECATED("halo_exchange_dynamic_ut(period, MPI_Comm, dims) is deprecated, since it creates an "
-                      "additional communicator that is not freed. Use the constructor without dims and pass to it "
-                      "a Cartesian communicator")
-        explicit halo_exchange_dynamic_ut(
-            typename grid_type::period_type const &c, MPI_Comm const &comm, array<ValueType, Size> &dims)
-            : hd(c.template permute<layout2proc_map_abs>(), _impl::_make_comm(comm, dims)) {}
-
         /** Function to rerturn the L3 level pattern used inside the pattern itself.
 
             \return The pattern al level 3 used to exchange data

diff --git a/include/gridtools/communication/high_level/descriptors.hpp b/include/gridtools/communication/high_level/descriptors.hpp
@@ -447,13 +447,6 @@ namespace gridtools {
             return S;
         }
 
-        /**
-           Function to setup internal data structures for data exchange and preparing eventual underlying layers
-
-           The use of this function is deprecated
-        */
-        void allocate_buffers() { setup(); }
-
         /**
            Function to setup internal data structures for data exchange and preparing eventual underlying layers
         */
@@ -572,15 +565,6 @@ namespace gridtools {
             : halo(), base_type::m_haloexch(g), send_buffer{nullptr}, recv_buffer{nullptr}, send_size{0}, recv_size{0} {
         }
 
-        /**
-           Function to setup internal data structures for data exchange and preparing eventual underlying layers
-
-           The use of this function is deprecated
-
-           \param max_fields_n Maximum number of data fields that will be passed to the communication functions
-        */
-        void allocate_buffers(int max_fields_n) { setup(max_fields_n); }
-
         /**
            Function to setup internal data structures for data exchange and preparing eventual underlying layers
 

diff --git a/include/gridtools/communication/high_level/descriptors_dt.hpp b/include/gridtools/communication/high_level/descriptors_dt.hpp
@@ -361,15 +361,6 @@ namespace gridtools {
          */
         explicit hndlr_dynamic_ut(grid_type const &g) : halo(), base_type(g) {}
 
-        /**
-           Function to setup internal data structures for data exchange and preparing eventual underlying layers
-
-           The use of this function is deprecated
-
-           \param max_fields_n Maximum number of data fields that will be passed to the communication functions
-        */
-        void allocate_buffers(int max_fields_n) { setup(max_fields_n); }
-
         /**
            Function to setup internal data structures for data exchange and preparing eventual underlying layers
 

diff --git a/include/gridtools/communication/high_level/descriptors_dt_whole.hpp b/include/gridtools/communication/high_level/descriptors_dt_whole.hpp
@@ -130,15 +130,6 @@ namespace gridtools {
                 counts[i] = 1;
         }
 
-        /**
-           Function to setup internal data structures for data exchange and preparing eventual underlying layers
-
-           The use of this function is deprecated
-
-           \param max_fields_n Maximum number of data fields that will be passed to the communication functions
-        */
-        void allocate_buffers(int max_fields_n) { setup(max_fields_n); }
-
         /**
            Function to setup internal data structures for data exchange and preparing eventual underlying layers
 

diff --git a/include/gridtools/communication/high_level/descriptors_manual_gpu.hpp b/include/gridtools/communication/high_level/descriptors_manual_gpu.hpp
@@ -166,15 +166,6 @@ namespace gridtools {
             GT_CUDA_CHECK(cudaFree(halo_d_r));
         }
 
-        /**
-           Function to setup internal data structures for data exchange and preparing eventual underlying layers
-
-           The use of this function is deprecated
-
-           \param max_fields_n Maximum number of data fields that will be passed to the communication functions
-        */
-        void allocate_buffers(int max_fields_n) { setup(max_fields_n); }
-
         /**
            Function to setup internal data structures for data exchange and preparing eventual underlying layers
 

diff --git a/include/gridtools/stencil_composition/grid_base.hpp b/include/gridtools/stencil_composition/grid_base.hpp
@@ -31,13 +31,6 @@ namespace gridtools {
         }
     } // namespace _impl
 
-    // TODO should be removed once we removed all ctor(array) calls
-    namespace enumtype_axis {
-        enum coordinate_argument { minus, plus, begin, end, length };
-    } // namespace enumtype_axis
-
-    using namespace enumtype_axis;
-
     template <typename Axis>
     struct grid_base {
         GT_STATIC_ASSERT((is_interval<Axis>::value), GT_INTERNAL_ERROR);
@@ -52,11 +45,6 @@ namespace gridtools {
         halo_descriptor m_direction_j;
 
       public:
-        GT_DEPRECATED("This constructor does not initialize the vertical axis, use the constructor with 3 "
-                      "arguments. (deprecated after 1.05.02)")
-        GT_FUNCTION explicit grid_base(halo_descriptor const &direction_i, halo_descriptor const &direction_j)
-            : m_direction_i(direction_i), m_direction_j(direction_j) {}
-
         /**
          * @brief standard ctor
          * @param direction_i halo_descriptor in i direction
@@ -69,11 +57,6 @@ namespace gridtools {
             const array<uint_t, size> &value_list)
             : m_direction_i(direction_i), m_direction_j(direction_j), value_list(value_list) {}
 
-        GT_DEPRECATED("Use constructor with halo_descriptors (deprecated after 1.05.02)")
-        GT_FUNCTION explicit grid_base(uint_t *i, uint_t *j /*, uint_t* k*/)
-            : m_direction_i(i[minus], i[plus], i[begin], i[end], i[length]),
-              m_direction_j(j[minus], j[plus], j[begin], j[end], j[length]) {}
-
         GT_FUNCTION
         uint_t i_low_bound() const { return m_direction_i.begin(); }
 

diff --git a/include/gridtools/stencil_composition/icosahedral_grids/grid.hpp b/include/gridtools/stencil_composition/icosahedral_grids/grid.hpp
@@ -24,19 +24,6 @@ namespace gridtools {
         GridTopology m_grid_topology;
 
       public:
-        GT_DEPRECATED("Use constructor with halo_descriptors (deprecated after 1.05.02)")
-        GT_FUNCTION
-        explicit grid(GridTopology const &grid_topology, const array<uint_t, 5> &i, const array<uint_t, 5> &j)
-            : grid_base<Axis>(halo_descriptor(i[minus], i[plus], i[begin], i[end], i[length]),
-                  halo_descriptor(j[minus], j[plus], j[begin], j[end], j[length])),
-              m_grid_topology(grid_topology) {}
-
-        GT_DEPRECATED("This constructor does not initialize the vertical axis, use the constructor with 4 "
-                      "arguments.  (deprecated after 1.05.02)")
-        GT_FUNCTION explicit grid(
-            GridTopology const &grid_topology, halo_descriptor const &direction_i, halo_descriptor const &direction_j)
-            : grid_base<Axis>(direction_i, direction_j), m_grid_topology(grid_topology) {}
-
         GT_FUNCTION
         explicit grid(GridTopology const &grid_topology,
             halo_descriptor const &direction_i,

diff --git a/include/gridtools/stencil_composition/structured_grids/grid.hpp b/include/gridtools/stencil_composition/structured_grids/grid.hpp
@@ -16,19 +16,11 @@ namespace gridtools {
     struct grid : grid_base<Axis> {
         using base_type = grid_base<Axis>;
 
-        GT_DEPRECATED("This constructor does not initialize the vertical axis, use the constructor with 3 "
-                      "arguments. (deprecated after 1.05.02)")
-        GT_FUNCTION explicit grid(halo_descriptor const &direction_i, halo_descriptor const &direction_j)
-            : base_type(direction_i, direction_j) {}
-
         GT_FUNCTION
         explicit grid(halo_descriptor const &direction_i,
             halo_descriptor const &direction_j,
             const decltype(base_type::value_list) &value_list)
             : base_type(direction_i, direction_j, value_list) {}
-
-        GT_DEPRECATED("Use constructor with halo_descriptors (deprecated after 1.05.02)")
-        GT_FUNCTION explicit grid(uint_t *i, uint_t *j) : base_type(i, j) {}
     };
 
     template <typename Grid>

diff --git a/include/gridtools/storage/common/storage_info.hpp b/include/gridtools/storage/common/storage_info.hpp
@@ -221,12 +221,6 @@ namespace gridtools {
          */
         GT_FUNCTION constexpr const array<uint_t, ndims> &total_lengths() const { return m_total_lengths; }
 
-        /**
-         * @brief deprecated, see total_lengths()
-         */
-        GT_DEPRECATED("dims() is deprecated, use total_lengths() (deprecated after 1.07.00)")
-        GT_FUNCTION constexpr const array<uint_t, ndims> &dims() const { return total_lengths(); }
-
         /*
          * @brief Returns the length of a dimension including the halo points (the outer region)
          *
@@ -239,15 +233,6 @@ namespace gridtools {
             return m_total_lengths[Dim];
         }
 
-        /**
-         * @brief deprecated: see total_length()
-         */
-        template <uint_t Dim>
-        GT_DEPRECATED("dim<Dim>() is deprecated, use total_length<Dim>() (deprecated after 1.07.00)")
-        GT_FUNCTION constexpr uint_t dim() const {
-            return total_length<Dim>();
-        }
-
         /**
          * @brief Returns the length of a dimension including the halo points (the outer region) and padding.
          *

diff --git a/include/gridtools/storage/data_store.hpp b/include/gridtools/storage/data_store.hpp
@@ -263,15 +263,6 @@ namespace gridtools {
             return m_shared_storage_info->template total_length<Dim>();
         }
 
-        /**
-         * @brief deprecated, see total_length()
-         */
-        template <int Dim>
-        GT_DEPRECATED("dim<Dim>() is deprecated, use total_lengths<Dim>() (deprecated after 1.07.00)")
-        int dim() const {
-            return total_length<Dim>();
-        }
-
         /**
          * @brief member function to retrieve the total size (dimensions, halos, padding).
          * @return total size
@@ -307,12 +298,6 @@ namespace gridtools {
             return m_shared_storage_info->total_lengths();
         }
 
-        /**
-         * @brief deprecated, see total_lengths()
-         */
-        GT_DEPRECATED("dims() is deprecated, use total_lengths() (deprecated after 1.07.00)")
-        auto dims() const -> decltype(total_lengths()) { return total_lengths(); }
-
         /**
          * @brief forward strides() from storage_info
          */