Skip to content
Snippets Groups Projects

small fix to compile with gmsh master

Merged Christophe Geuzaine requested to merge fix-gmsh-master into master
2 files
+ 29
28
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 11
7
@@ -134,11 +134,15 @@ physical_elements_factory::physical_elements_factory(const entity_params& ep)
@@ -134,11 +134,15 @@ physical_elements_factory::physical_elements_factory(const entity_params& ep)
#else
#else
gmm::getKeysForElements(elemType, basis_func_name(approx_order),
gmm::getKeysForElements(elemType, basis_func_name(approx_order),
tagKeys, entityKeys, coord, tag, false);
tagKeys, entityKeys, coord, tag, false);
assert(tk.size() == ek.size());
assert(tagKeys.size() == entityKeys.size());
#endif
#endif
keys_per_elem = gmm::getNumberOfKeysForElements(elemType, basis_func_name(approx_order));
keys_per_elem = gmm::getNumberOfKeysForElements(elemType, basis_func_name(approx_order));
 
#ifdef USE_INITIAL_4_8_4_API
assert(keys_per_elem*cellTags.size() == keypairs.size());
assert(keys_per_elem*cellTags.size() == keypairs.size());
 
#else
 
assert(keys_per_elem*cellTags.size() == tagKeys.size());
 
#endif
}
}
std::vector<physical_element>
std::vector<physical_element>
@@ -174,7 +178,7 @@ physical_elements_factory::get_elements()
@@ -174,7 +178,7 @@ physical_elements_factory::get_elements()
for (size_t i = 0; i < keys_per_elem; i++)
for (size_t i = 0; i < keys_per_elem; i++)
{
{
#ifdef USE_INITIAL_4_8_4_API
#ifdef USE_INITIAL_4_8_4_API
auto [vi, vu] = keypairs[keys_per_elem*elem + i];
auto [vi, vu] = keypairs[keys_per_elem*elem + i];
#else
#else
auto vi = tagKeys[keys_per_elem*elem + i];
auto vi = tagKeys[keys_per_elem*elem + i];
auto vu = entityKeys[keys_per_elem*elem + i];
auto vu = entityKeys[keys_per_elem*elem + i];
@@ -189,9 +193,9 @@ physical_elements_factory::get_elements()
@@ -189,9 +193,9 @@ physical_elements_factory::get_elements()
auto elem_base = elem*num_gf;
auto elem_base = elem*num_gf;
for (size_t gf = 0; gf < num_gf; gf++)
for (size_t gf = 0; gf < num_gf; gf++)
{
{
auto gf_offset = elem_base + gf;
auto gf_offset = elem_base + gf;
const auto JSIZE = 3*3; /* Jacobian matrix size */
const auto JSIZE = 3*3; /* Jacobian matrix size */
auto jacs_base = gf_offset*JSIZE;
auto jacs_base = gf_offset*JSIZE;
assert(jacs_base+8 < cellJacs.size());
assert(jacs_base+8 < cellJacs.size());
@@ -258,7 +262,7 @@ element_key::operator<(const element_key& other) const
@@ -258,7 +262,7 @@ element_key::operator<(const element_key& other) const
{
{
if (m_dim != other.m_dim or m_elemType != other.m_elemType)
if (m_dim != other.m_dim or m_elemType != other.m_elemType)
return false;
return false;
if (m_key_data[0] != other.m_key_data[0])
if (m_key_data[0] != other.m_key_data[0])
return false;
return false;
@@ -275,7 +279,7 @@ element_key::operator==(const element_key& other) const
@@ -275,7 +279,7 @@ element_key::operator==(const element_key& other) const
{
{
if (m_dim != other.m_dim or m_elemType != other.m_elemType)
if (m_dim != other.m_dim or m_elemType != other.m_elemType)
return false;
return false;
if (m_key_data[0] != other.m_key_data[0])
if (m_key_data[0] != other.m_key_data[0])
return false;
return false;
@@ -304,7 +308,7 @@ element_key_factory::element_key_factory(int dim, int tag, int etype)
@@ -304,7 +308,7 @@ element_key_factory::element_key_factory(int dim, int tag, int etype)
std::vector<size_t> nTags;
std::vector<size_t> nTags;
gmm::getElementFaceNodes(etype, 3, nTags, tag, true);
gmm::getElementFaceNodes(etype, 3, nTags, tag, true);
for (size_t i = 0; i < nTags.size(); i+= 3)
for (size_t i = 0; i < nTags.size(); i+= 3)
{
{
element_key ek;
element_key ek;
Loading