diff --git a/hyteg_integration_tests/src/CurlCurl.cpp b/hyteg_integration_tests/src/CurlCurl.cpp index e692845c15d109213ab6f03cb57fe802256d8800..deb836c5b39f898f555c270cd666ac06a70d0efc 100644 --- a/hyteg_integration_tests/src/CurlCurl.cpp +++ b/hyteg_integration_tests/src/CurlCurl.cpp @@ -34,7 +34,7 @@ int main( int argc, char* argv[] ) const uint_t level = 2; const StorageSetup storageSetup( - "cube_6el", MeshInfo::fromGmshFile( "../hyteg/data/meshes/3D/cube_6el.msh" ), GeometryMap::Type::IDENTITY ); + "cube_6el", MeshInfo::fromGmshFile( prependHyTeGMeshDir( "3D/cube_6el.msh" ) ), GeometryMap::Type::IDENTITY ); real_t thresholdOverMachineEpsApply = 225; real_t thresholdOverMachineEpsInvDiag = 9.0e6; diff --git a/hyteg_integration_tests/src/CurlCurlPlusMass.cpp b/hyteg_integration_tests/src/CurlCurlPlusMass.cpp index 8451a988e9a80886a8f100c9b5661a1c6faba438..f991650c9fcefc84845c43cbb0556d3a57c40ba8 100644 --- a/hyteg_integration_tests/src/CurlCurlPlusMass.cpp +++ b/hyteg_integration_tests/src/CurlCurlPlusMass.cpp @@ -61,7 +61,7 @@ int main( int argc, char* argv[] ) const uint_t level = 2; const StorageSetup storageSetup( - "cube_6el", MeshInfo::fromGmshFile( "../hyteg/data/meshes/3D/cube_6el.msh" ), GeometryMap::Type::IDENTITY ); + "cube_6el", MeshInfo::fromGmshFile( prependHyTeGMeshDir( "3D/cube_6el.msh" ) ), GeometryMap::Type::IDENTITY ); real_t thresholdOverMachineEpsApply = 225; real_t thresholdOverMachineEpsInvDiag = 9.0e6; diff --git a/hyteg_integration_tests/src/DiffusionP1.cpp b/hyteg_integration_tests/src/DiffusionP1.cpp index 6341dfeb6033cfb4b233ef7a34c136708ee19bfb..ba0c748d9b021c079dd744a502ad2f652c66d96c 100644 --- a/hyteg_integration_tests/src/DiffusionP1.cpp +++ b/hyteg_integration_tests/src/DiffusionP1.cpp @@ -40,12 +40,12 @@ int main( int argc, char* argv[] ) if ( d == 2 ) { storageSetup = StorageSetup( - "quad_4el", MeshInfo::fromGmshFile( "../hyteg/data/meshes/quad_4el.msh" ), GeometryMap::Type::IDENTITY ); + "quad_4el", MeshInfo::fromGmshFile( prependHyTeGMeshDir( "2D/quad_4el.msh" ) ), GeometryMap::Type::IDENTITY ); } else { storageSetup = StorageSetup( - "cube_6el", MeshInfo::fromGmshFile( "../hyteg/data/meshes/3D/cube_6el.msh" ), GeometryMap::Type::IDENTITY ); + "cube_6el", MeshInfo::fromGmshFile( prependHyTeGMeshDir( "3D/cube_6el.msh" ) ), GeometryMap::Type::IDENTITY ); } testOperators< P1Function< real_t >, P1ElementwiseLaplaceOperator, operatorgeneration::TestOpDiffusion >( diff --git a/hyteg_integration_tests/src/DiffusionP1Vector.cpp b/hyteg_integration_tests/src/DiffusionP1Vector.cpp index 2cbd2c9b4a2cdf919a5d71fb3d863bfc6ad73fa5..9af9d18722d197c894615a49773c744b157098e5 100644 --- a/hyteg_integration_tests/src/DiffusionP1Vector.cpp +++ b/hyteg_integration_tests/src/DiffusionP1Vector.cpp @@ -19,10 +19,10 @@ #include "core/DataTypes.h" #include "hyteg/elementwiseoperators/P1ElementwiseOperator.hpp" -#include "mixed_operator/VectorLaplaceOperator.hpp" #include "Diffusion/TestOpDiffusion.hpp" #include "OperatorGenerationTest.hpp" +#include "mixed_operator/VectorLaplaceOperator.hpp" using namespace hyteg; using walberla::real_t; @@ -40,12 +40,12 @@ int main( int argc, char* argv[] ) if ( d == 2 ) { storageSetup = StorageSetup( - "quad_4el", MeshInfo::fromGmshFile( "../hyteg/data/meshes/quad_4el.msh" ), GeometryMap::Type::IDENTITY ); + "quad_4el", MeshInfo::fromGmshFile( prependHyTeGMeshDir( "2D/quad_4el.msh" ) ), GeometryMap::Type::IDENTITY ); } else { storageSetup = StorageSetup( - "cube_6el", MeshInfo::fromGmshFile( "../hyteg/data/meshes/3D/cube_6el.msh" ), GeometryMap::Type::IDENTITY ); + "cube_6el", MeshInfo::fromGmshFile( prependHyTeGMeshDir( "3D/cube_6el.msh" ) ), GeometryMap::Type::IDENTITY ); } testOperators< P1VectorFunction< real_t >, P1ElementwiseVectorLaplaceOperator, operatorgeneration::TestOpDiffusion >( diff --git a/hyteg_integration_tests/src/DiffusionP2.cpp b/hyteg_integration_tests/src/DiffusionP2.cpp index c6614e4c87c4d99002205932a40c0ac0c2937343..5fc3aa20db5f9f53e8af12740c10b041107efc43 100644 --- a/hyteg_integration_tests/src/DiffusionP2.cpp +++ b/hyteg_integration_tests/src/DiffusionP2.cpp @@ -40,12 +40,12 @@ int main( int argc, char* argv[] ) if ( d == 2 ) { storageSetup = StorageSetup( - "quad_4el", MeshInfo::fromGmshFile( "../hyteg/data/meshes/quad_4el.msh" ), GeometryMap::Type::IDENTITY ); + "quad_4el", MeshInfo::fromGmshFile( prependHyTeGMeshDir( "2D/quad_4el.msh" ) ), GeometryMap::Type::IDENTITY ); } else { storageSetup = StorageSetup( - "cube_6el", MeshInfo::fromGmshFile( "../hyteg/data/meshes/3D/cube_6el.msh" ), GeometryMap::Type::IDENTITY ); + "cube_6el", MeshInfo::fromGmshFile( prependHyTeGMeshDir( "3D/cube_6el.msh" ) ), GeometryMap::Type::IDENTITY ); } testOperators< P2Function< real_t >, P2ElementwiseLaplaceOperator, operatorgeneration::TestOpDiffusion >( diff --git a/hyteg_integration_tests/src/Div.cpp b/hyteg_integration_tests/src/Div.cpp index bdaec8a9ee1bee38e184e68bc1d73ec23dfe1c4c..01b767d9bfb9950ec4bcf5757ace30b552c4a086 100644 --- a/hyteg_integration_tests/src/Div.cpp +++ b/hyteg_integration_tests/src/Div.cpp @@ -33,7 +33,7 @@ int main( int argc, char* argv[] ) const uint_t level = 3; StorageSetup storageSetup( - "cube_6el", MeshInfo::fromGmshFile( "../hyteg/data/meshes/3D/cube_6el.msh" ), GeometryMap::Type::IDENTITY ); + "cube_6el", MeshInfo::fromGmshFile( prependHyTeGMeshDir( "3D/cube_6el.msh" ) ), GeometryMap::Type::IDENTITY ); real_t thresholdOverMachineEpsApply = 225; diff --git a/hyteg_integration_tests/src/DivKGrad.cpp b/hyteg_integration_tests/src/DivKGrad.cpp index 4fc2cb6a63cd53807b1719e10b933a8f945754c5..2717a0c28588754b37827ea6b710171b26bfaf09 100644 --- a/hyteg_integration_tests/src/DivKGrad.cpp +++ b/hyteg_integration_tests/src/DivKGrad.cpp @@ -66,12 +66,12 @@ int main( int argc, char* argv[] ) if ( d == 2 ) { storageSetup = StorageSetup( - "quad_4el", MeshInfo::fromGmshFile( "../hyteg/data/meshes/quad_4el.msh" ), GeometryMap::Type::IDENTITY ); + "quad_4el", MeshInfo::fromGmshFile( prependHyTeGMeshDir( "2D/quad_4el.msh" ) ), GeometryMap::Type::IDENTITY ); } else { storageSetup = StorageSetup( - "cube_6el", MeshInfo::fromGmshFile( "../hyteg/data/meshes/3D/cube_6el.msh" ), GeometryMap::Type::IDENTITY ); + "cube_6el", MeshInfo::fromGmshFile( prependHyTeGMeshDir( "3D/cube_6el.msh" ) ), GeometryMap::Type::IDENTITY ); } compareApply< P2ElementwiseAffineDivKGradOperator, operatorgeneration::TestOpDivKGrad >( diff --git a/hyteg_integration_tests/src/DivT.cpp b/hyteg_integration_tests/src/DivT.cpp index da5fc13144c4b619d924d4066a3e77c6a590b72e..67c70b5112c644f17760c0bc184e034599a69fef 100644 --- a/hyteg_integration_tests/src/DivT.cpp +++ b/hyteg_integration_tests/src/DivT.cpp @@ -33,7 +33,7 @@ int main( int argc, char* argv[] ) const uint_t level = 3; StorageSetup storageSetup( - "cube_6el", MeshInfo::fromGmshFile( "../hyteg/data/meshes/3D/cube_6el.msh" ), GeometryMap::Type::IDENTITY ); + "cube_6el", MeshInfo::fromGmshFile( prependHyTeGMeshDir( "3D/cube_6el.msh" ) ), GeometryMap::Type::IDENTITY ); real_t thresholdOverMachineEpsApply = 225; diff --git a/hyteg_integration_tests/src/Epsilon.cpp b/hyteg_integration_tests/src/Epsilon.cpp index 0fcb6f2e5cdde18346361b572214fb45bae53e6f..d79d9e051b8aa4f0a27dd881b00057a0e384fe58 100644 --- a/hyteg_integration_tests/src/Epsilon.cpp +++ b/hyteg_integration_tests/src/Epsilon.cpp @@ -78,12 +78,12 @@ int main( int argc, char* argv[] ) if ( d == 2 ) { storageSetup = StorageSetup( - "quad_4el", MeshInfo::fromGmshFile( "../hyteg/data/meshes/quad_4el.msh" ), GeometryMap::Type::IDENTITY ); + "quad_4el", MeshInfo::fromGmshFile( prependHyTeGMeshDir( "2D/quad_4el.msh" ) ), GeometryMap::Type::IDENTITY ); } else { storageSetup = StorageSetup( - "cube_6el", MeshInfo::fromGmshFile( "../hyteg/data/meshes/3D/cube_6el.msh" ), GeometryMap::Type::IDENTITY ); + "cube_6el", MeshInfo::fromGmshFile( prependHyTeGMeshDir( "3D/cube_6el.msh" ) ), GeometryMap::Type::IDENTITY ); } compareApply< P2ElementwiseOperator< FORM >, operatorgeneration::TestOpEpsilon >( diff --git a/hyteg_integration_tests/src/EpsilonVector.cpp b/hyteg_integration_tests/src/EpsilonVector.cpp index 5ad41ed18fc4457b859be85c4a774d256ebf8cfa..3d7ba6acb1f3b8ba3aca2acb9374955a47e33a7d 100644 --- a/hyteg_integration_tests/src/EpsilonVector.cpp +++ b/hyteg_integration_tests/src/EpsilonVector.cpp @@ -21,12 +21,12 @@ #include "core/DataTypes.h" #include "hyteg/elementwiseoperators/P2ElementwiseOperator.hpp" -#include "constant_stencil_operator/P2ConstantEpsilonOperator.hpp" #include "hyteg/forms/form_hyteg_generated/p2/p2_epsilonvar_affine_q4.hpp" #include "hyteg/p2functionspace/P2Function.hpp" #include "Epsilon/TestOpEpsilon.hpp" #include "OperatorGenerationTest.hpp" +#include "constant_stencil_operator/P2ConstantEpsilonOperator.hpp" using namespace hyteg; using walberla::real_t; @@ -67,7 +67,7 @@ int main( int argc, char* argv[] ) StorageSetup storageSetup; storageSetup = StorageSetup( - "quad_4el", MeshInfo::fromGmshFile( "../hyteg/data/meshes/quad_4el.msh" ), GeometryMap::Type::IDENTITY ); + "quad_4el", MeshInfo::fromGmshFile( prependHyTeGMeshDir( "2D/quad_4el.msh" ) ), GeometryMap::Type::IDENTITY ); compareApply< P2ElementwiseAffineEpsilonOperator, operatorgeneration::TestOpEpsilon >( makeRefOp,