Skip to content
Snippets Groups Projects
Commit c40aa5ad authored by Daniel Bauer's avatar Daniel Bauer :speech_balloon:
Browse files

update mesh paths (hyteg/!808)

parent 3d931552
No related branches found
No related tags found
1 merge request!24Parametric mappings
Pipeline #68456 failed
...@@ -34,7 +34,7 @@ int main( int argc, char* argv[] ) ...@@ -34,7 +34,7 @@ int main( int argc, char* argv[] )
const uint_t level = 2; const uint_t level = 2;
const StorageSetup storageSetup( 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 thresholdOverMachineEpsApply = 225;
real_t thresholdOverMachineEpsInvDiag = 9.0e6; real_t thresholdOverMachineEpsInvDiag = 9.0e6;
......
...@@ -61,7 +61,7 @@ int main( int argc, char* argv[] ) ...@@ -61,7 +61,7 @@ int main( int argc, char* argv[] )
const uint_t level = 2; const uint_t level = 2;
const StorageSetup storageSetup( 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 thresholdOverMachineEpsApply = 225;
real_t thresholdOverMachineEpsInvDiag = 9.0e6; real_t thresholdOverMachineEpsInvDiag = 9.0e6;
......
...@@ -40,12 +40,12 @@ int main( int argc, char* argv[] ) ...@@ -40,12 +40,12 @@ int main( int argc, char* argv[] )
if ( d == 2 ) if ( d == 2 )
{ {
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 );
} }
else else
{ {
storageSetup = StorageSetup( 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 >( testOperators< P1Function< real_t >, P1ElementwiseLaplaceOperator, operatorgeneration::TestOpDiffusion >(
......
...@@ -19,10 +19,10 @@ ...@@ -19,10 +19,10 @@
#include "core/DataTypes.h" #include "core/DataTypes.h"
#include "hyteg/elementwiseoperators/P1ElementwiseOperator.hpp" #include "hyteg/elementwiseoperators/P1ElementwiseOperator.hpp"
#include "mixed_operator/VectorLaplaceOperator.hpp"
#include "Diffusion/TestOpDiffusion.hpp" #include "Diffusion/TestOpDiffusion.hpp"
#include "OperatorGenerationTest.hpp" #include "OperatorGenerationTest.hpp"
#include "mixed_operator/VectorLaplaceOperator.hpp"
using namespace hyteg; using namespace hyteg;
using walberla::real_t; using walberla::real_t;
...@@ -40,12 +40,12 @@ int main( int argc, char* argv[] ) ...@@ -40,12 +40,12 @@ int main( int argc, char* argv[] )
if ( d == 2 ) if ( d == 2 )
{ {
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 );
} }
else else
{ {
storageSetup = StorageSetup( 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 >( testOperators< P1VectorFunction< real_t >, P1ElementwiseVectorLaplaceOperator, operatorgeneration::TestOpDiffusion >(
......
...@@ -40,12 +40,12 @@ int main( int argc, char* argv[] ) ...@@ -40,12 +40,12 @@ int main( int argc, char* argv[] )
if ( d == 2 ) if ( d == 2 )
{ {
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 );
} }
else else
{ {
storageSetup = StorageSetup( 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 >( testOperators< P2Function< real_t >, P2ElementwiseLaplaceOperator, operatorgeneration::TestOpDiffusion >(
......
...@@ -33,7 +33,7 @@ int main( int argc, char* argv[] ) ...@@ -33,7 +33,7 @@ int main( int argc, char* argv[] )
const uint_t level = 3; const uint_t level = 3;
StorageSetup storageSetup( 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 thresholdOverMachineEpsApply = 225;
......
...@@ -66,12 +66,12 @@ int main( int argc, char* argv[] ) ...@@ -66,12 +66,12 @@ int main( int argc, char* argv[] )
if ( d == 2 ) if ( d == 2 )
{ {
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 );
} }
else else
{ {
storageSetup = StorageSetup( 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 >( compareApply< P2ElementwiseAffineDivKGradOperator, operatorgeneration::TestOpDivKGrad >(
......
...@@ -33,7 +33,7 @@ int main( int argc, char* argv[] ) ...@@ -33,7 +33,7 @@ int main( int argc, char* argv[] )
const uint_t level = 3; const uint_t level = 3;
StorageSetup storageSetup( 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 thresholdOverMachineEpsApply = 225;
......
...@@ -78,12 +78,12 @@ int main( int argc, char* argv[] ) ...@@ -78,12 +78,12 @@ int main( int argc, char* argv[] )
if ( d == 2 ) if ( d == 2 )
{ {
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 );
} }
else else
{ {
storageSetup = StorageSetup( 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 >( compareApply< P2ElementwiseOperator< FORM >, operatorgeneration::TestOpEpsilon >(
......
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
#include "core/DataTypes.h" #include "core/DataTypes.h"
#include "hyteg/elementwiseoperators/P2ElementwiseOperator.hpp" #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/forms/form_hyteg_generated/p2/p2_epsilonvar_affine_q4.hpp"
#include "hyteg/p2functionspace/P2Function.hpp" #include "hyteg/p2functionspace/P2Function.hpp"
#include "Epsilon/TestOpEpsilon.hpp" #include "Epsilon/TestOpEpsilon.hpp"
#include "OperatorGenerationTest.hpp" #include "OperatorGenerationTest.hpp"
#include "constant_stencil_operator/P2ConstantEpsilonOperator.hpp"
using namespace hyteg; using namespace hyteg;
using walberla::real_t; using walberla::real_t;
...@@ -67,7 +67,7 @@ int main( int argc, char* argv[] ) ...@@ -67,7 +67,7 @@ int main( int argc, char* argv[] )
StorageSetup storageSetup; StorageSetup storageSetup;
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 >( compareApply< P2ElementwiseAffineEpsilonOperator, operatorgeneration::TestOpEpsilon >(
makeRefOp, makeRefOp,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment