Improvements to VTU output

Code/Source/solver/ComMod.cpp

@@ -11,31 +11,30 @@
 //
 ComMod::ComMod() 
 {
-  mvMsh        = false;
-
-  stFileFlag   = false;
-  stFileRepl   = false;
-
-  bin2VTK      = false;
-  saveAve      = false;
-  sepOutput    = false;
-  saveATS      = 1;
-  saveIncr     = 10;
-  nITs         = 0;
-  startTS      = 0;
-  stFileName   = "stFile";
-  iniFilePath  = "";
-  stopTrigName = "STOP_SIM";
-  ichckIEN     = true; 
-  zeroAve      = false;
-  cmmInit      = false;
-  cmmVarWall   = false;
-  shlEq        = false;
-  pstEq        = false;
-  sstEq        = false;
-  ibFlag       = false;
-  risFlag      = false;
-
+  mvMsh              = false;
+
+  stFileFlag         = false;
+  stFileRepl         = false;
+
+  bin2VTK            = false;
+  saveAve            = false;
+  alwaysSaveDomainID = false;
+  saveATS            = 1;
+  saveIncr           = 10;
+  nITs               = 0;
+  startTS            = 0;
+  stFileName         = "stFile";
+  iniFilePath        = "";
+  stopTrigName       = "STOP_SIM";
+  ichckIEN           = true;
+  zeroAve            = false;
+  cmmInit            = false;
+  cmmVarWall         = false;
+  shlEq              = false;
+  pstEq              = false;
+  sstEq              = false;
+  ibFlag             = false;
+  risFlag            = false;
 }
 
 //---------

Code/Source/solver/ComMod.h

@@ -1594,15 +1594,16 @@ class ComMod {
     /// @brief Whether to averaged results
     bool saveAve = false;
 
+    /// @brief Whether to save the domain ID to every VTK file rather than to
+    /// the first one only
+    bool alwaysSaveDomainID = false;
+
     /// @brief Whether to save to VTK files
     bool saveVTK = false;
 
     /// @brief Whether any file being saved
     bool savedOnce = false;
 
-    /// @brief Whether to use separator in output
-    bool sepOutput = false;
-
     /// @brief Whether start from beginning or from simulations
     bool stFileFlag = false;
 

Code/Source/solver/CoupledBoundaryCondition.cpp

@@ -993,7 +993,7 @@ void CappingSurface::load_from_vtp(const std::string& vtp_file_path, const faceT
     int vtk_cell_type = 0;
     try {
         conn = vtp_data.get_connectivity();
-        eNoN = vtp_data.np_elem();
+        eNoN = vtp_data.num_points_per_elem();
         vtk_cell_type = vtp_data.elem_type();
     } catch (const std::exception& e) {
         throw CappingSurfaceVtpException("Failed to get connectivity from VTP file '" + vtp_file_path + "': " +

Code/Source/solver/Parameters.cpp

@@ -2807,9 +2807,9 @@ GeneralSimulationParameters::GeneralSimulationParameters() {
   set_parameter("Debug", false, !required, debug);
 
   set_parameter("Include_xml", "", !required, include_xml);
-  set_parameter("Increment_in_saving_restart_files", 0, !required,
+  set_parameter("Increment_in_saving_restart_files", 1, !required,
                 increment_in_saving_restart_files);
-  set_parameter("Increment_in_saving_VTK_files", 0, !required,
+  set_parameter("Increment_in_saving_VTK_files", 1, !required,
                 increment_in_saving_vtk_files);
 
   set_parameter("Name_prefix_of_saved_VTK_files", "", !required,
@@ -2828,6 +2828,8 @@ GeneralSimulationParameters::GeneralSimulationParameters() {
 
   set_parameter("Save_averaged_results", false, !required,
                 save_averaged_results);
+  set_parameter("Save_domain_ID_in_every_file", false, !required,
+                save_domain_id_in_every_file);
   set_parameter("Save_results_in_folder", "", !required,
                 save_results_in_folder);
   set_parameter("Save_results_to_VTK_format", false, required,
@@ -2910,9 +2912,22 @@ void GeneralSimulationParameters::set_values(tinyxml2::XMLElement *xml_element,
     item = item->NextSiblingElement();
   }
 
-  // Check that required parameters have been set.
   if (!from_external_xml) {
+    // Check that required parameters have been set.
     check_required();
+
+    // The saving increments select the time steps to save by taking the
+    // remainder of the time step number, so they cannot be zero.
+    svmp::check<svmp::ParseException>(
+        increment_in_saving_restart_files.value() >= 1,
+        "The GeneralSimulationParameters element "
+        "'Increment_in_saving_restart_files' must be greater than or equal "
+        "to 1.");
+
+    svmp::check<svmp::ParseException>(
+        increment_in_saving_vtk_files.value() >= 1,
+        "The GeneralSimulationParameters element "
+        "'Increment_in_saving_VTK_files' must be greater than or equal to 1.");
   }
 }
 

Code/Source/solver/Parameters.h

@@ -1819,6 +1819,7 @@ class GeneralSimulationParameters : public ParameterLists
     Parameter<bool> debug;
     Parameter<bool> overwrite_restart_file;
     Parameter<bool> save_averaged_results;
+    Parameter<bool> save_domain_id_in_every_file;
     Parameter<bool> save_results_to_vtk_format;
     Parameter<bool> simulation_requires_remeshing;
     Parameter<bool> start_averaging_from_zero;

Code/Source/solver/Simulation.cpp

@@ -69,6 +69,7 @@ void Simulation::set_module_parameters()
   com_mod.saveIncr = general.increment_in_saving_vtk_files.value();
   com_mod.saveATS = general.start_saving_after_time_step.value();
   com_mod.saveAve = general.save_averaged_results.value();
+  com_mod.alwaysSaveDomainID = general.save_domain_id_in_every_file.value();
   com_mod.zeroAve = general.start_averaging_from_zero.value();
   com_mod.stFileRepl = general.overwrite_restart_file.value();
   com_mod.stFileName = chnl_mod.appPath + general.restart_file_name.value();