Commit 99300737 authored by Tomáš Jakubec's avatar Tomáš Jakubec
Browse files

VTKMeshDataWriter if constexpr removed

parent 3390223d

Unstructured_mesh/Unstructured_mesh.pro.user

+1 −1
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE QtCreatorProject>

<!DOCTYPE QtCreatorProject>

<!-- Written by QtCreator 4.10.0, 2019-11-20T22:43:48. -->

<!-- Written by QtCreator 4.10.0, 2019-11-22T10:47:28. -->

<qtcreator>

<qtcreator>

 <data>

 <data>

  <variable>EnvironmentId</variable>

  <variable>EnvironmentId</variable>

src/UnstructuredMesh/MeshDataContainer/MeshDataIO/VTKMeshDataWriter.h

+49 −9
Original line number Original line Diff line number Diff line
@@ -172,15 +172,36 @@ public: 
    }

    }





private:

private:





    template <unsigned int Index, bool OK = false>

    template <unsigned int Index, bool OK = false>

    struct MeshDataIterator{

    struct MeshDataIterator{



        template<typename T,typename IndexType, typename Real, unsigned int ...Dimensions>

        template<typename T,typename IndexType, typename Real, unsigned int ...Dimensions>

        static void writeToStream(std::ostream& ost, MeshDataContainer<T, Dimensions...>& data, VTKMeshWriter<MeshDimension,IndexType, Real>& writer) {

        static auto writeToStream(std::ostream& ost,

                                  MeshDataContainer<T, Dimensions...>& data,

                                  VTKMeshWriter<MeshDimension,IndexType, Real>& writer) -> typename

        std::enable_if<

            (!HasDefaultTraits<typename MeshDataContainer<T, Dimensions...>::template DataContainerType<Index>::type>::value) ||

            (!(MeshDataContainer<T, Dimensions...>::template DataContainerType<Index>::getMappedDimension() == MeshDimension))

        >::type

        {

            using type = typename MeshDataContainer<T, Dimensions...>::template DataContainerType<Index>::type;

            using type = typename MeshDataContainer<T, Dimensions...>::template DataContainerType<Index>::type;





            if constexpr (HasDefaultTraits<type>::value && MeshDataContainer<T, Dimensions...>::template DataContainerType<Index>::getMappedDimension() == MeshDimension){



                VTKMeshDataWriter<MeshDimension>::writeCellData<typename Traits<type>::ttype>::write(ost, data.template getDataByPos<Index>(), writer);

            MeshDataIterator<Index - 1, OK | HasDefaultTraits<type>::value>:: writeToStream(ost, data, writer);

        }

        }



        template<typename T,typename IndexType, typename Real, unsigned int ...Dimensions>

        static auto writeToStream(std::ostream& ost, MeshDataContainer<T, Dimensions...>& data, VTKMeshWriter<MeshDimension,IndexType, Real>& writer)

            ->typename std::enable_if<HasDefaultTraits<typename MeshDataContainer<T, Dimensions...>::template DataContainerType<Index>::type>::value &&

                              MeshDataContainer<T, Dimensions...>::template DataContainerType<Index>::getMappedDimension() == MeshDimension

                             >::type

        {

            using type = typename MeshDataContainer<T, Dimensions...>::template DataContainerType<Index>::type;



            VTKMeshDataWriter<MeshDimension>::writeCellData<typename Traits<type>::ttype>::write(ost, data.template getDataByPos<Index>(), writer);



            MeshDataIterator<Index - 1, OK | HasDefaultTraits<type>::value>:: writeToStream(ost, data, writer);

            MeshDataIterator<Index - 1, OK | HasDefaultTraits<type>::value>:: writeToStream(ost, data, writer);

        }

        }

    };

    };
@@ -188,12 +209,31 @@ private: 
    template <bool OK>

    template <bool OK>

    struct MeshDataIterator <0, OK> {

    struct MeshDataIterator <0, OK> {

        template<typename T,typename IndexType, typename Real, unsigned int ...Dimensions>

        template<typename T,typename IndexType, typename Real, unsigned int ...Dimensions>

        static void writeToStream(std::ostream& ost, MeshDataContainer<T, Dimensions...>& data, VTKMeshWriter<MeshDimension,IndexType, Real>& writer) {

        static auto writeToStream(std::ostream& ost [[maybe_unused]],

                                  MeshDataContainer<T, Dimensions...>& data [[maybe_unused]],

                                  VTKMeshWriter<MeshDimension,IndexType, Real>& writer [[maybe_unused]]) -> typename

            std::enable_if<

                (!HasDefaultTraits<typename MeshDataContainer<T, Dimensions...>::template DataContainerType<0>::type>::value) ||

                (!(MeshDataContainer<T, Dimensions...>::template DataContainerType<0>::getMappedDimension() == MeshDimension))

            >::type

        {

            static_assert (OK , "The mesh data container must have at least one DataContainer mapped to cells with traits for example using macro MAKE_ATTRIBUTE_TRAIT see header Traits.h");



        }



        template<typename T,typename IndexType, typename Real, unsigned int ...Dimensions>

        static auto writeToStream(std::ostream& ost,

                                  MeshDataContainer<T, Dimensions...>& data,

                                  VTKMeshWriter<MeshDimension,IndexType, Real>& writer) -> typename

            std::enable_if<

                HasDefaultTraits<typename MeshDataContainer<T, Dimensions...>::template DataContainerType<0>::type>::value &&

                MeshDataContainer<T, Dimensions...>::template DataContainerType<0>::getMappedDimension() == MeshDimension

            >::type

        {

            using type = typename MeshDataContainer<T, Dimensions...>::template DataContainerType<0>::type;

            using type = typename MeshDataContainer<T, Dimensions...>::template DataContainerType<0>::type;

            static_assert (OK | HasDefaultTraits<type>::value, "The mesh data container must have at least one DataContainer mapped to cells with traits for example using macro MAKE_ATTRIBUTE_TRAIT see header Traits.h");



            if constexpr (HasDefaultTraits<type>::value && MeshDataContainer<T, Dimensions...>::template DataContainerType<0>::getMappedDimension() == MeshDimension){

            VTKMeshDataWriter<MeshDimension>::writeCellData<typename Traits<type>::ttype>::write(ost, data.template getDataByPos<0>(), writer);

            VTKMeshDataWriter<MeshDimension>::writeCellData<typename Traits<type>::ttype>::write(ost, data.template getDataByPos<0>(), writer);

            }



        }

        }

    };

    };