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

Structure done.

parent a1bbe681

Unstructured_mesh/Unstructured_mesh.pro

+5 −5
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ HEADERS += \ 
    ../src/Debug/HTMLLogger.h \

    ../src/Debug/VariableExport.h \

    ../src/InlineArrayOperations.h \

    ../src/UnstructuredMesh/MeshDataContainer/MemberApproach.h \

    ../src/Traits/MemberApproach/MemberApproach.h \

    ../src/UnstructuredMesh/MeshDataContainer/MeshDataContainer.h \

    ../src/UnstructuredMesh/MeshDataContainer/MeshDataIO/VTKMeshDataReader.h \

    ../src/UnstructuredMesh/MeshDataContainer/MeshDataIO/VTKMeshDataWriter.h \

    ../src/UnstructuredMesh/MeshDataContainer/Singleton.h \

    ../src/UnstructuredMesh/MeshDataContainer/Traits.h \

    ../src/Singleton/Singleton.h \

    ../src/Traits/Traits.h \

    ../src/UnstructuredMesh/MeshElements/CellBoundaryConnection.h \

    ../src/UnstructuredMesh/MeshElements/CellConnection.h \

    ../src/UnstructuredMesh/MeshElements/ComputationalySignificantElement.h \
@@ -34,5 +34,5 @@ HEADERS += \ 
    ../src/UnstructuredMesh/MeshIO/MeshWriter/VTKMeshWriter.h \

    ../src/UnstructuredMesh/UnstructedMeshDefine.h \

    ../src/UnstructuredMesh/UnstructuredMesh.h \

    ../src/Vector.h \

    ../src/Vertex.h
 
    ../src/NumericStaticArray/Vector.h \

    ../src/NumericStaticArray/Vertex.h

Unstructured_mesh/Unstructured_mesh.pro.user

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

<!DOCTYPE QtCreatorProject>

<!-- Written by QtCreator 4.10.0, 2019-11-19T14:29:57. -->

<!-- Written by QtCreator 4.10.0, 2019-11-19T15:30:25. -->

<qtcreator>

 <data>

  <variable>EnvironmentId</variable>

Unstructured_mesh/main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include "../src/UnstructuredMesh/MeshIO/MeshReader/FPMAMeshReader.h"

#include "../src/UnstructuredMesh/MeshIO/MeshWriter/FPMAMeshWriter.h"



#include "../src/UnstructuredMesh/MeshDataContainer/MemberApproach.h"

#include "../src/Traits/MemberApproach/MemberApproach.h"

#include <fstream>

#include <list>

using namespace std;

src/Debug/VariableExport.h

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#include <iostream>

#include <fstream>

#include <string>

#include "../UnstructuredMesh/MeshDataContainer/Traits.h"

#include "../Traits/Traits.h"



namespace Detail {

src/InlineArrayOperations.h

deleted100644 → 0
+0 −95
Original line number Diff line number Diff line 
#ifndef INLINE_ARRAY_OPERATIONS_H

#define INLINE_ARRAY_OPERATIONS_H





template <unsigned int N, typename Real>

struct inlineScalarProduct {

    static inline Real computation(const Real *x, const Real *y){

        return inlineScalarProduct<N-1, Real>::computation(x, y) + x[N-1] * y[N-1];

    }

};





template <typename Real>

struct inlineScalarProduct<1, Real>

{

    static inline double computation(const Real *x, const Real *y){

        return x[0] * y[0];

    }

};









template <unsigned int N, typename Real>

struct inlineAddition{

    static inline void computation(Real *res, const Real *x, const Real *y){

        inlineAddition<N-1, Real>::computation(res, x, y);

        res[N-1] = x[N-1] + y[N-1];

    }

    static inline void computation(Real *x, const Real *y){

        inlineAddition<N-1, Real>::computation(x, y);

        x[N-1] += y[N-1];

    }

};



template <typename Real>

struct inlineAddition<1, Real>{

    static inline void computation(Real *res, const Real *x, const Real *y){

        res[0] = x[0] + y[0];

    }

    static inline void computation(Real *x, const Real *y){

        x[0] += y[0];

    }

};





template <unsigned int N, typename Real>

struct inlineSubtraction{

    static inline void computation(Real *res, const Real *x, const Real *y){

        inlineSubtraction<N-1, Real>::computation(res, x, y);

        res[N-1] = x[N-1] - y[N-1];

    }

    static inline void computation(Real *x, const Real *y){

        inlineSubtraction<N-1, Real>::computation(x, y);

        x[N-1] -= y[N-1];

    }

};



template <typename Real>

struct inlineSubtraction<1, Real>{

    static inline void computation(Real *res, const Real *x, const Real *y){

        res[0] = x[0] - y[0];

    }

    static inline void computation(Real *x, const Real *y){

        x[0] -= y[0];

    }

};







template <unsigned int N, typename Real>

struct inlineMultiplication{

    static inline void computation(Real *res, const Real *x, const Real& alpha){

        inlineMultiplication<N-1, Real>::computation(res, x, alpha);

        res[N-1] = x[N-1] * alpha;

    }

    static inline void computation(Real *x, const Real alpha){

        inlineMultiplication<N-1, Real>::computation(x, alpha);

        x[N-1] *= alpha;

    }

};



template <typename Real>

struct inlineMultiplication<1, Real>{

    static inline void computation(Real *res, const Real *x, const Real& alpha){

        res[0] = x[0] * alpha;

    }

    static inline void computation(Real *x, const Real alpha){

        x[0] *= alpha;

    }

};







#endif // INLINE_ARRAY_OPERATIONS_H