Skip to content

Commit 8fc2f16

Browse files
authored
Merge pull request #1319 from Geode-solutions/fix/geometrical_operations_on_mesh
fix(GeometricalOperationsOnMesh): update template parameter for geome…
2 parents a0cb368 + ae8cb4e commit 8fc2f16

2 files changed

Lines changed: 11 additions & 15 deletions

File tree

bindings/python/src/mesh/helpers/geometrical_operations_on_mesh.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@
4343
const auto translate_name##mesh##dimension = absl::StrCat( \
4444
"translate_", mesh_name, std::to_string( dimension ), "D" ); \
4545
module.def( translate_name##mesh##dimension.c_str(), \
46-
&translate_mesh< mesh, mesh##Builder, dimension > )
46+
&translate_mesh< mesh##dimension##D > )
4747

4848
#define PYTHON_RESCALE( mesh, mesh_name, dimension ) \
4949
const auto rescale_name##mesh##dimension = absl::StrCat( \
5050
"rescale_", mesh_name, std::to_string( dimension ), "D" ); \
5151
module.def( rescale_name##mesh##dimension.c_str(), \
52-
&rescale_mesh< mesh, mesh##Builder, dimension > )
52+
&rescale_mesh< mesh##dimension##D > )
5353

5454
namespace geode
5555
{

include/geode/mesh/helpers/geometrical_operations_on_mesh.hpp

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,30 +29,26 @@
2929

3030
namespace geode
3131
{
32-
template < template < index_t > class Mesh,
33-
template < index_t > class MeshBuilder,
34-
index_t dimension >
35-
void translate_mesh( Mesh< dimension >& mesh,
36-
MeshBuilder< dimension >& builder,
37-
const Vector< dimension >& translation )
32+
template < class Mesh >
33+
void translate_mesh( Mesh& mesh,
34+
typename Mesh::Builder& builder,
35+
const Vector< Mesh::dim >& translation )
3836
{
3937
for( const auto v : Range{ mesh.nb_vertices() } )
4038
{
4139
builder.set_point( v, mesh.point( v ) + translation );
4240
}
4341
}
4442

45-
template < template < index_t > class Mesh,
46-
template < index_t > class MeshBuilder,
47-
index_t dimension >
48-
void rescale_mesh( Mesh< dimension >& mesh,
49-
MeshBuilder< dimension >& builder,
50-
const std::array< double, dimension >& scale )
43+
template < class Mesh >
44+
void rescale_mesh( Mesh& mesh,
45+
typename Mesh::Builder& builder,
46+
const std::array< double, Mesh::dim >& scale )
5147
{
5248
for( const auto v : Range{ mesh.nb_vertices() } )
5349
{
5450
auto point = mesh.point( v );
55-
for( const auto d : LRange{ dimension } )
51+
for( const auto d : LRange{ Mesh::dim } )
5652
{
5753
point.set_value( d, point.value( d ) * scale[d] );
5854
}

0 commit comments

Comments
 (0)