From c40aa5ad70eeab2dbbd209da2fa26a7159b729a3 Mon Sep 17 00:00:00 2001
From: Daniel Bauer <daniel.j.bauer@fau.de>
Date: Tue, 13 Aug 2024 12:20:46 +0200
Subject: [PATCH] update mesh paths (hyteg/!808)
---
hyteg_integration_tests/src/CurlCurl.cpp | 2 +-
hyteg_integration_tests/src/CurlCurlPlusMass.cpp | 2 +-
hyteg_integration_tests/src/DiffusionP1.cpp | 4 ++--
hyteg_integration_tests/src/DiffusionP1Vector.cpp | 6 +++---
hyteg_integration_tests/src/DiffusionP2.cpp | 4 ++--
hyteg_integration_tests/src/Div.cpp | 2 +-
hyteg_integration_tests/src/DivKGrad.cpp | 4 ++--
hyteg_integration_tests/src/DivT.cpp | 2 +-
hyteg_integration_tests/src/Epsilon.cpp | 4 ++--
hyteg_integration_tests/src/EpsilonVector.cpp | 4 ++--
10 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/hyteg_integration_tests/src/CurlCurl.cpp b/hyteg_integration_tests/src/CurlCurl.cpp
index e692845..deb836c 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 8451a98..f991650 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 6341dfe..ba0c748 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 2cbd2c9..9af9d18 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 c6614e4..5fc3aa2 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 bdaec8a..01b767d 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 4fc2cb6..2717a0c 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 da5fc13..67c70b5 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 0fcb6f2..d79d9e0 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 5ad41ed..3d7ba6a 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,
--
GitLab