💻 Fix pdstrain parallel vtp

Author: kks32

include/.clang-format .clang-format

@@ -92,12 +92,12 @@ link_libraries (${CMAKE_THREAD_LIBS_INIT})
 # MKL
 find_package(MKL)
 if (MKL_FOUND)
-  if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+  if (NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
     link_libraries(iomp5)
+    include_directories(${MKL_INCLUDE_DIR})
+    link_libraries(${MKL_LIBRARIES})
+    add_definitions("-DUSE_MKL")
   endif()
-  include_directories(${MKL_INCLUDE_DIR})
-  link_libraries(${MKL_LIBRARIES})
-  add_definitions("-DUSE_MKL")
 endif()
 
 

CMakeLists.txt

@@ -1,4 +1,4 @@
 #!/bin/bash
-find ../include/ -iname *.h -o -iname *.tcc | xargs clang-format -i
-find ../src/ -iname *.h -o -iname *.cc | xargs clang-format -i
-find ../tests/ -iname *.h -o -iname *.cc | xargs clang-format -i
+find ../include/ -iname *.h -o -iname *.tcc | xargs clang-format -style=file -i
+find ../src/ -iname *.h -o -iname *.cc | xargs clang-format -style=file -i
+find ../tests/ -iname *.h -o -iname *.cc | xargs clang-format -style=file -i

clang-tools/format.sh

@@ -526,9 +526,9 @@ void mpm::MPMBase<Tdim>::write_vtk(mpm::Index step, mpm::Index max_steps) {
       auto parallel_file = io_->output_file(attribute, ".pvtp", uuid_, step,
                                             max_steps, write_mpi_rank)
                                .string();
-
+      unsigned ncomponents = 1;
       vtk_writer->write_parallel_vtk(parallel_file, attribute, mpi_size, step,
-                                     max_steps);
+                                     max_steps, ncomponents);
     }
 #endif
   }

include/elements/.clang-format

@@ -189,15 +189,14 @@ void VtkWriter::write_parallel_vtk(const std::string& filename,
       data_type + "=\"" + attribute +
       "\">\n\t\t<PDataArray "
       "type=\"Float64\" Name=\"" +
-      attribute +
-      "\" "
-      "NumberOfComponents=\"" +
-      std::to_string(ncomponents) +
-      "\"/>\n\t</"
+      attribute + "\"";
+  if (ncomponents != 1)
+    ppolydata += " NumberOfComponents=\"" + std::to_string(ncomponents) + "\"";
+  ppolydata +=
+      "/>\n\t</"
       "PPointData>\n\n\t<PPoints>\n\t\t<PDataArray "
       "type=\"Float32\" Name=\"Points\" "
-      "NumberOfComponents=\"" +
-      std::to_string(ncomponents) + "\"/>\n\t</PPoints>\n";
+      "NumberOfComponents=\"3\"/>\n\t</PPoints>\n";
 
   for (unsigned i = 0; i < mpi_size; ++i) {
     std::stringstream file_name;

include/elements/2d/.clang-format

@@ -77,11 +77,10 @@ TEST_CASE("VTK Writer is checked", "[vtk][writer]") {
         "\">\n\t\t<PDataArray "
         "type=\"Float64\" Name=\"" +
         attribute +
-        "\" "
-        "NumberOfComponents=\"1\"/>\n\t</"
+        "\"/>\n\t</"
         "PPointData>\n\n\t<PPoints>\n\t\t<PDataArray "
         "type=\"Float32\" Name=\"Points\" "
-        "NumberOfComponents=\"1\"/>\n\t</PPoints>\n";
+        "NumberOfComponents=\"3\"/>\n\t</PPoints>\n";
 
     for (unsigned i = 0; i < mpi_size; ++i)
       ppolydata += "\n\t<Piece Source=\"" + attribute + "-" +