TODO: Switching off workaround

tdegeus · Jul 9, 2022 · a77637c · a77637c
1 parent 6d5ffaf
commit a77637c
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 273 deletions.
diff --git a/docs/examples/statics/FixedDisplacements_LinearElastic/example.cpp b/docs/examples/statics/FixedDisplacements_LinearElastic/example.cpp
@@ -1,42 +1,3 @@
-// todo remove
-#include <xtensor/xtensor.hpp>
-
-namespace GMatTensor {
-namespace detail {
-
-template <size_t RANK, class T>
-struct allocate {
-};
-
-template <size_t RANK, class EC, size_t N, xt::layout_type L, class Tag>
-struct allocate<RANK, xt::xtensor<EC, N, L, Tag>> {
-    using type = typename xt::xtensor<EC, RANK, L, Tag>;
-};
-
-#ifdef XTENSOR_FIXED_HPP
-template <size_t RANK, class EC, class S, xt::layout_type L>
-struct allocate<RANK, xt::xtensor_fixed<EC, S, L>> {
-    using type = typename xt::xtensor<EC, RANK, L>;
-};
-#endif
-
-#ifdef XTENSOR_FIXED_HPP
-template <size_t RANK, class EC, class S, xt::layout_type L, bool SH, class Tag>
-struct allocate<RANK, xt::xfixed_container<EC, S, L, SH, Tag>> {
-    using type = typename xt::xtensor<EC, RANK, L, Tag>;
-};
-#endif
-
-#ifdef PY_TENSOR_HPP
-template <size_t RANK, class EC, size_t N, xt::layout_type L>
-struct allocate<RANK, xt::pytensor<EC, N, L>> {
-    using type = typename xt::pytensor<EC, RANK, L>;
-};
-#endif
-
-} // namespace detail
-} // namespace GMatTensor
-
 #include <GMatElastic/Cartesian3d.h>
 #include <GooseFEM/GooseFEM.h>
 #include <GooseFEM/MatrixPartitioned.h>

diff --git a/docs/examples/statics/FixedDisplacements_LinearElastic/manual_partition.cpp b/docs/examples/statics/FixedDisplacements_LinearElastic/manual_partition.cpp
@@ -1,42 +1,3 @@
-// todo remove
-#include <xtensor/xtensor.hpp>
-
-namespace GMatTensor {
-namespace detail {
-
-template <size_t RANK, class T>
-struct allocate {
-};
-
-template <size_t RANK, class EC, size_t N, xt::layout_type L, class Tag>
-struct allocate<RANK, xt::xtensor<EC, N, L, Tag>> {
-    using type = typename xt::xtensor<EC, RANK, L, Tag>;
-};
-
-#ifdef XTENSOR_FIXED_HPP
-template <size_t RANK, class EC, class S, xt::layout_type L>
-struct allocate<RANK, xt::xtensor_fixed<EC, S, L>> {
-    using type = typename xt::xtensor<EC, RANK, L>;
-};
-#endif
-
-#ifdef XTENSOR_FIXED_HPP
-template <size_t RANK, class EC, class S, xt::layout_type L, bool SH, class Tag>
-struct allocate<RANK, xt::xfixed_container<EC, S, L, SH, Tag>> {
-    using type = typename xt::xtensor<EC, RANK, L, Tag>;
-};
-#endif
-
-#ifdef PY_TENSOR_HPP
-template <size_t RANK, class EC, size_t N, xt::layout_type L>
-struct allocate<RANK, xt::pytensor<EC, N, L>> {
-    using type = typename xt::pytensor<EC, RANK, L>;
-};
-#endif
-
-} // namespace detail
-} // namespace GMatTensor
-
 #include <GMatElastic/Cartesian3d.h>
 #include <GooseFEM/GooseFEM.h>
 #include <GooseFEM/MatrixPartitioned.h>

diff --git a/docs/examples/statics/MixedPeriodic_LinearElastic/example.cpp b/docs/examples/statics/MixedPeriodic_LinearElastic/example.cpp
@@ -1,42 +1,3 @@
-// todo remove
-#include <xtensor/xtensor.hpp>
-
-namespace GMatTensor {
-namespace detail {
-
-template <size_t RANK, class T>
-struct allocate {
-};
-
-template <size_t RANK, class EC, size_t N, xt::layout_type L, class Tag>
-struct allocate<RANK, xt::xtensor<EC, N, L, Tag>> {
-    using type = typename xt::xtensor<EC, RANK, L, Tag>;
-};
-
-#ifdef XTENSOR_FIXED_HPP
-template <size_t RANK, class EC, class S, xt::layout_type L>
-struct allocate<RANK, xt::xtensor_fixed<EC, S, L>> {
-    using type = typename xt::xtensor<EC, RANK, L>;
-};
-#endif
-
-#ifdef XTENSOR_FIXED_HPP
-template <size_t RANK, class EC, class S, xt::layout_type L, bool SH, class Tag>
-struct allocate<RANK, xt::xfixed_container<EC, S, L, SH, Tag>> {
-    using type = typename xt::xtensor<EC, RANK, L, Tag>;
-};
-#endif
-
-#ifdef PY_TENSOR_HPP
-template <size_t RANK, class EC, size_t N, xt::layout_type L>
-struct allocate<RANK, xt::pytensor<EC, N, L>> {
-    using type = typename xt::pytensor<EC, RANK, L>;
-};
-#endif
-
-} // namespace detail
-} // namespace GMatTensor
-
 #include <GMatElastic/Cartesian3d.h>
 #include <GooseFEM/GooseFEM.h>
 #include <GooseFEM/MatrixPartitioned.h>

diff --git a/docs/examples/statics/Periodic_ElastoPlastic/main.cpp b/docs/examples/statics/Periodic_ElastoPlastic/main.cpp
@@ -1,42 +1,3 @@
-// todo remove
-#include <xtensor/xtensor.hpp>
-
-namespace GMatTensor {
-namespace detail {
-
-template <size_t RANK, class T>
-struct allocate {
-};
-
-template <size_t RANK, class EC, size_t N, xt::layout_type L, class Tag>
-struct allocate<RANK, xt::xtensor<EC, N, L, Tag>> {
-    using type = typename xt::xtensor<EC, RANK, L, Tag>;
-};
-
-#ifdef XTENSOR_FIXED_HPP
-template <size_t RANK, class EC, class S, xt::layout_type L>
-struct allocate<RANK, xt::xtensor_fixed<EC, S, L>> {
-    using type = typename xt::xtensor<EC, RANK, L>;
-};
-#endif
-
-#ifdef XTENSOR_FIXED_HPP
-template <size_t RANK, class EC, class S, xt::layout_type L, bool SH, class Tag>
-struct allocate<RANK, xt::xfixed_container<EC, S, L, SH, Tag>> {
-    using type = typename xt::xtensor<EC, RANK, L, Tag>;
-};
-#endif
-
-#ifdef PY_TENSOR_HPP
-template <size_t RANK, class EC, size_t N, xt::layout_type L>
-struct allocate<RANK, xt::pytensor<EC, N, L>> {
-    using type = typename xt::pytensor<EC, RANK, L>;
-};
-#endif
-
-} // namespace detail
-} // namespace GMatTensor
-
 #include <GMatElastoPlastic/Cartesian3d.h>
 #include <GooseFEM/GooseFEM.h>
 #include <GooseFEM/MatrixPartitionedTyings.h>

diff --git a/docs/examples/statics/Periodic_LinearElastic/main.cpp b/docs/examples/statics/Periodic_LinearElastic/main.cpp
@@ -1,42 +1,3 @@
-// todo remove
-#include <xtensor/xtensor.hpp>
-
-namespace GMatTensor {
-namespace detail {
-
-template <size_t RANK, class T>
-struct allocate {
-};
-
-template <size_t RANK, class EC, size_t N, xt::layout_type L, class Tag>
-struct allocate<RANK, xt::xtensor<EC, N, L, Tag>> {
-    using type = typename xt::xtensor<EC, RANK, L, Tag>;
-};
-
-#ifdef XTENSOR_FIXED_HPP
-template <size_t RANK, class EC, class S, xt::layout_type L>
-struct allocate<RANK, xt::xtensor_fixed<EC, S, L>> {
-    using type = typename xt::xtensor<EC, RANK, L>;
-};
-#endif
-
-#ifdef XTENSOR_FIXED_HPP
-template <size_t RANK, class EC, class S, xt::layout_type L, bool SH, class Tag>
-struct allocate<RANK, xt::xfixed_container<EC, S, L, SH, Tag>> {
-    using type = typename xt::xtensor<EC, RANK, L, Tag>;
-};
-#endif
-
-#ifdef PY_TENSOR_HPP
-template <size_t RANK, class EC, size_t N, xt::layout_type L>
-struct allocate<RANK, xt::pytensor<EC, N, L>> {
-    using type = typename xt::pytensor<EC, RANK, L>;
-};
-#endif
-
-} // namespace detail
-} // namespace GMatTensor
-
 #include <Eigen/Eigen>
 #include <GMatElastic/Cartesian3d.h>
 #include <GooseFEM/GooseFEM.h>

diff --git a/environment.yaml b/environment.yaml
@@ -8,6 +8,7 @@ dependencies:
 - eigen
 - gmatelastic
 - gmatelastoplasticqpot
+- qpot <0.12.0 # remove when "gmatelastoplasticqpot" is updated
 - mathjax
 - ninja
 - numpy

diff --git a/tests/gmat/hybrid-elastic.cpp b/tests/gmat/hybrid-elastic.cpp
@@ -1,42 +1,3 @@
-// todo remove
-#include <xtensor/xtensor.hpp>
-
-namespace GMatTensor {
-namespace detail {
-
-template <size_t RANK, class T>
-struct allocate {
-};
-
-template <size_t RANK, class EC, size_t N, xt::layout_type L, class Tag>
-struct allocate<RANK, xt::xtensor<EC, N, L, Tag>> {
-    using type = typename xt::xtensor<EC, RANK, L, Tag>;
-};
-
-#ifdef XTENSOR_FIXED_HPP
-template <size_t RANK, class EC, class S, xt::layout_type L>
-struct allocate<RANK, xt::xtensor_fixed<EC, S, L>> {
-    using type = typename xt::xtensor<EC, RANK, L>;
-};
-#endif
-
-#ifdef XTENSOR_FIXED_HPP
-template <size_t RANK, class EC, class S, xt::layout_type L, bool SH, class Tag>
-struct allocate<RANK, xt::xfixed_container<EC, S, L, SH, Tag>> {
-    using type = typename xt::xtensor<EC, RANK, L, Tag>;
-};
-#endif
-
-#ifdef PY_TENSOR_HPP
-template <size_t RANK, class EC, size_t N, xt::layout_type L>
-struct allocate<RANK, xt::pytensor<EC, N, L>> {
-    using type = typename xt::pytensor<EC, RANK, L>;
-};
-#endif
-
-} // namespace detail
-} // namespace GMatTensor
-
 #include <Eigen/Eigen>
 #include <GMatElastic/Cartesian3d.h>
 #include <GooseFEM/GooseFEM.h>

diff --git a/tests/gmat/hybrid-elastoplasticqpot.cpp b/tests/gmat/hybrid-elastoplasticqpot.cpp
@@ -1,42 +1,3 @@
-// todo remove
-#include <xtensor/xtensor.hpp>
-
-namespace GMatTensor {
-namespace detail {
-
-template <size_t RANK, class T>
-struct allocate {
-};
-
-template <size_t RANK, class EC, size_t N, xt::layout_type L, class Tag>
-struct allocate<RANK, xt::xtensor<EC, N, L, Tag>> {
-    using type = typename xt::xtensor<EC, RANK, L, Tag>;
-};
-
-#ifdef XTENSOR_FIXED_HPP
-template <size_t RANK, class EC, class S, xt::layout_type L>
-struct allocate<RANK, xt::xtensor_fixed<EC, S, L>> {
-    using type = typename xt::xtensor<EC, RANK, L>;
-};
-#endif
-
-#ifdef XTENSOR_FIXED_HPP
-template <size_t RANK, class EC, class S, xt::layout_type L, bool SH, class Tag>
-struct allocate<RANK, xt::xfixed_container<EC, S, L, SH, Tag>> {
-    using type = typename xt::xtensor<EC, RANK, L, Tag>;
-};
-#endif
-
-#ifdef PY_TENSOR_HPP
-template <size_t RANK, class EC, size_t N, xt::layout_type L>
-struct allocate<RANK, xt::pytensor<EC, N, L>> {
-    using type = typename xt::pytensor<EC, RANK, L>;
-};
-#endif
-
-} // namespace detail
-} // namespace GMatTensor
-
 #include <Eigen/Eigen>
 #include <GMatElastoPlasticQPot/Cartesian2d.h>
 #include <GooseFEM/GooseFEM.h>
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ dependencies: @@
     - eigen
     - gmatelastic
     - gmatelastoplasticqpot
+    - qpot <0.12.0 # remove when "gmatelastoplasticqpot" is updated
     - mathjax
     - ninja
     - numpy
@@ Expand Down @@