fix for gmsh master branch

src/physical_element.cpp

@@ -134,11 +134,15 @@ physical_elements_factory::physical_elements_factory(const entity_params& ep)
 #else
     gmm::getKeysForElements(elemType, basis_func_name(approx_order),
         tagKeys, entityKeys, coord, tag, false);
-    assert(tk.size() == ek.size());
+    assert(tagKeys.size() == entityKeys.size());
 #endif
 
     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());
+#else
+    assert(keys_per_elem*cellTags.size() == tagKeys.size());
+#endif
 }
 
 std::vector<physical_element>
@@ -174,7 +178,7 @@ physical_elements_factory::get_elements()
         for (size_t i = 0; i < keys_per_elem; i++)
         {
 #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
             auto vi = tagKeys[keys_per_elem*elem + i];
             auto vu = entityKeys[keys_per_elem*elem + i];
@@ -189,9 +193,9 @@ physical_elements_factory::get_elements()
         auto elem_base = elem*num_gf;
 
         for (size_t gf = 0; gf < num_gf; gf++)
-        {   
+        {
             auto gf_offset = elem_base + gf;
- 
+
             const auto JSIZE = 3*3; /* Jacobian matrix size */
             auto jacs_base = gf_offset*JSIZE;
             assert(jacs_base+8 < cellJacs.size());
@@ -258,7 +262,7 @@ element_key::operator<(const element_key& other) const
 {
     if (m_dim != other.m_dim or m_elemType != other.m_elemType)
         return false;
-    
+
     if (m_key_data[0] != other.m_key_data[0])
         return false;
 
@@ -275,7 +279,7 @@ element_key::operator==(const element_key& other) const
 {
     if (m_dim != other.m_dim or m_elemType != other.m_elemType)
         return false;
-    
+
     if (m_key_data[0] != other.m_key_data[0])
         return false;
 
@@ -304,7 +308,7 @@ element_key_factory::element_key_factory(int dim, int tag, int etype)
 
     std::vector<size_t> nTags;
     gmm::getElementFaceNodes(etype, 3, nTags, tag, true);
-            
+
     for (size_t i = 0; i < nTags.size(); i+= 3)
     {
         element_key ek;