.gitlab-ci.yml

@@ -8,7 +8,7 @@ variables:
 include:
   - local: '/.gitlab-ci/clang14-mpi-debug.yml'
   - local: '/.gitlab-ci/clang14-mpi-release.yml'
-  - local: '/.gitlab-ci/gcc10-mpi-coverage.yml'
-  - local: '/.gitlab-ci/gcc10-mpi-release.yml'
-  - local: '/.gitlab-ci/gcc10-seq-coverage.yml'
-  - local: '/.gitlab-ci/gcc10-seq-release.yml'
+  - local: '/.gitlab-ci/gcc11-mpi-coverage.yml'
+  - local: '/.gitlab-ci/gcc11-mpi-release.yml'
+  - local: '/.gitlab-ci/gcc11-seq-coverage.yml'
+  - local: '/.gitlab-ci/gcc11-seq-release.yml'

.gitlab-ci/gcc10-mpi-release.yml

-test:gcc10-mpi-release:
-  image: localhost:5000/ubuntu_jammy_gcc10_mpi
-  stage: test
-  needs: []
-  script:
-    - mkdir -p build/gcc10-release-mpi
-    - cd build/gcc10-release-mpi
-    - CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Release
-    - make -j 4
-    - make test
-  cache:
-    key: "${CI_COMMIT_REF_SLUG}-gcc10-release-mpi"
-    paths:
-      - build/gcc10-release-mpi
-    untracked: true

.gitlab-ci/gcc10-seq-release.yml

-test:gcc10-seq-release:
-  image: localhost:5000/ubuntu_jammy_gcc10
-  stage: test
-  needs: []
-  script:
-    - mkdir -p build/gcc10-release-seq
-    - cd build/gcc10-release-seq
-    - CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Release
-    - make -j 4
-    - make check
-  cache:
-    key: "${CI_COMMIT_REF_SLUG}-gcc10-release-seq"
-    paths:
-      - build/gcc10-release-seq
-    untracked: true

.gitlab-ci/gcc10-mpi-coverage.yml → .gitlab-ci/gcc11-mpi-coverage.yml

-coverage:gcc10-mpi-coverage:
-  image: localhost:5000/ubuntu_jammy_gcc10_mpi
+coverage:gcc11-mpi-coverage:
+  image: localhost:5000/ubuntu_jammy_gcc11_mpi
   stage: coverage
   needs: []
   script:
-    - mkdir -p build/gcc10-cov-mpi
-    - cd build/gcc10-cov-mpi
-    - CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage
+    - mkdir -p build/gcc11-cov-mpi
+    - cd build/gcc11-cov-mpi
+    - CXX=g++-11 CC=gcc-11 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage
     - make -j 4
   cache:
-    key: "${CI_COMMIT_REF_SLUG}-gcc10-cov-mpi"
+    key: "${CI_COMMIT_REF_SLUG}-gcc11-cov-mpi"
     paths:
-      - build/gcc10-cov-mpi
+      - build/gcc11-cov-mpi
     untracked: true
   coverage: '/^\s*Total:\|(\d*\.\d|\d*)\%.*$/'

.gitlab-ci/gcc11-mpi-release.yml

+test:gcc11-mpi-release:
+  image: localhost:5000/ubuntu_jammy_gcc11_mpi
+  stage: test
+  needs: []
+  script:
+    - mkdir -p build/gcc11-release-mpi
+    - cd build/gcc11-release-mpi
+    - CXX=g++-11 CC=gcc-11 cmake ../.. -DCMAKE_BUILD_TYPE=Release
+    - make -j 4
+    - make test
+  cache:
+    key: "${CI_COMMIT_REF_SLUG}-gcc11-release-mpi"
+    paths:
+      - build/gcc11-release-mpi
+    untracked: true

.gitlab-ci/gcc10-seq-coverage.yml → .gitlab-ci/gcc11-seq-coverage.yml

-coverage:gcc10-seq-coverage:
-  image: localhost:5000/ubuntu_jammy_gcc10
+coverage:gcc11-seq-coverage:
+  image: localhost:5000/ubuntu_jammy_gcc11
   stage: coverage
   needs: []
   script:
-    - mkdir -p build/gcc10-cov
-    - cd build/gcc10-cov
-    - CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage
+    - mkdir -p build/gcc11-cov
+    - cd build/gcc11-cov
+    - CXX=g++-11 CC=gcc-11 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage
     - make -j 4
   cache:
-    key: "${CI_COMMIT_REF_SLUG}-gcc10-cov"
+    key: "${CI_COMMIT_REF_SLUG}-gcc11-cov"
     paths:
-      - build/gcc10-cov
+      - build/gcc11-cov
     untracked: true
   coverage: '/^\s*Total:\|(\d*\.\d|\d*)\%.*$/'

.gitlab-ci/gcc11-seq-release.yml

+test:gcc11-seq-release:
+  image: localhost:5000/ubuntu_jammy_gcc11
+  stage: test
+  needs: []
+  script:
+    - mkdir -p build/gcc11-release-seq
+    - cd build/gcc11-release-seq
+    - CXX=g++-11 CC=gcc-11 cmake ../.. -DCMAKE_BUILD_TYPE=Release
+    - make -j 4
+    - make check
+  cache:
+    key: "${CI_COMMIT_REF_SLUG}-gcc11-release-seq"
+    paths:
+      - build/gcc11-release-seq
+    untracked: true

src/mesh/GmshReader.cpp

@@ -39,8 +39,7 @@ GmshConnectivityBuilder<1>::GmshConnectivityBuilder(const GmshReader::GmshData&
   Array<int> cell_number_vector(nb_cells);
 
   Array<unsigned int> cell_to_node_row(nb_cells + 1);
-  parallel_for(
-    cell_to_node_row.size(), PUGS_LAMBDA(const CellId cell_id) { cell_to_node_row[cell_id] = 2 * cell_id; });
+  parallel_for(cell_to_node_row.size(), PUGS_LAMBDA(const CellId cell_id) { cell_to_node_row[cell_id] = 2 * cell_id; });
 
   Array<unsigned int> cell_to_node_list(cell_to_node_row[cell_to_node_row.size() - 1]);
   for (CellId cell_id = 0; cell_id < nb_cells; ++cell_id) {
@@ -1054,8 +1053,7 @@ inline auto remove_embedding_spaces = [](std::string_view line) -> std::string_v
 
 inline constexpr int number_of_gmsh_entities = 93;
 
-inline constexpr auto primitive_number_of_nodes = []() constexpr
-{
+inline constexpr auto primitive_number_of_nodes = []() constexpr {
   std::array<short, number_of_gmsh_entities> number_of_nodes;
   number_of_nodes.fill(-1);
 
@@ -1094,11 +1092,9 @@ inline constexpr auto primitive_number_of_nodes = []() constexpr
   number_of_nodes[92] = 125;   // 125-node fourth order hexahedron
 
   return number_of_nodes;
-}
-();
+}();
 
-inline constexpr auto entity_name = []() constexpr
-{
+inline constexpr auto entity_name = []() constexpr {
   std::array<std::string_view, number_of_gmsh_entities> name;
   name.fill("unknown");
   name[0]  = "edges";
@@ -1136,11 +1132,9 @@ inline constexpr auto entity_name = []() constexpr
   name[92] = "125-node fourth order hexahedron";
 
   return name;
-}
-();
+}();
 
-inline constexpr auto supported_entity = []() constexpr
-{
+inline constexpr auto supported_entity = []() constexpr {
   std::array<bool, number_of_gmsh_entities> supported;
   supported.fill(false);
   supported[0]  = true;   // edge
@@ -1153,8 +1147,7 @@ inline constexpr auto supported_entity = []() constexpr
   supported[14] = true;   // point
 
   return supported;
-}
-();
+}();
 
 inline auto tokenize = [](std::string_view& line, auto& tokens) {
   size_t token_idx = 0;
@@ -1363,6 +1356,11 @@ struct actions<physical_section>
                   << e.what();
         throw NormalError(error_msg.str());
       }
+
+      std::cout << "===== PhysicalNames =====\n";
+      for (auto i : gmsh_data.m_physical_ref_map) {
+        std::cout << i.first << " -> " << i.second << '\n';
+      }
     } else {
       throw UnexpectedError("invalid file format version: " + std::to_string(gmsh_data.format.version));
     }
@@ -1694,6 +1692,7 @@ struct actions<elements_section>
 
     gmsh_data.entity_number.resize(number_of_elements);
     gmsh_data.entity_type.resize(number_of_elements);
+    gmsh_data.entity_reference.resize(number_of_elements);
     gmsh_data.element_vertices.resize(number_of_elements);
 
     std::vector<std::string_view> element_tokens;
@@ -1724,12 +1723,13 @@ struct actions<elements_section>
         }
 
         parse_int(block_tokens[0]);   // entity dim
-        parse_int(block_tokens[1]);   // entity tag
+        const int entity_tag                  = parse_int(block_tokens[1]);
         const size_t element_type             = parse_int(block_tokens[2]) - 1;
         const size_t number_of_block_elements = parse_size_t(block_tokens[3]);
 
         for (size_t i_block_element = 0; i_block_element < number_of_block_elements; ++i_block_element) {
           gmsh_data.entity_type[i_element + i_block_element]      = element_type;
+          gmsh_data.entity_reference[i_element + i_block_element] = entity_tag;
         }
 
         const size_t element_number_of_nodes = primitive_number_of_nodes[element_type];
@@ -1775,8 +1775,6 @@ struct actions<elements_section>
     } else {
       throw UnexpectedError("invalid file format " + std::to_string(gmsh_data.format.version));
     }
-
-    std::cout << rang::fgB::yellow << __FILE__ << ':' << __LINE__ << rang::fg::reset << ": read element: done\n";
   }
 };