Merge pull request #1481 from rjoussen/fix-pvd-writer

Fix the pvd file writer for restarts from parent directory

Author: rjoussen

src/core/io/src/4C_io_vtk_writer_base.cpp

@@ -184,6 +184,7 @@ VtkWriterBase::VtkWriterBase(unsigned int myrank, unsigned int num_processors,
     const std::string& restart_name, double restart_time, bool write_binary_output,
     LibB64::CompressionLevel compression_level)
     : currentPhase_(VAGUE),
+      path_existing_working_directory_(path_existing_working_directory),
       num_timestep_digits_(LibB64::ndigits(max_number_timesteps_to_be_written)),
       num_processor_digits_(LibB64::ndigits(num_processors)),
       geometry_name_(geometry_name),
@@ -707,7 +708,7 @@ void VtkWriterBase::create_restarted_initial_collection_file_mid_section(
 
   // open collection file
   std::ifstream restart_collection_file;
-  restart_collection_file.open(restartcollectionfilename.c_str(), std::ios::out);
+  restart_collection_file.open(restartcollectionfilename.c_str(), std::ios::in);
 
   // check if file was found
   if (not restart_collection_file) FOUR_C_THROW(" restart collection file could not be found");
@@ -727,10 +728,12 @@ void VtkWriterBase::create_restarted_initial_collection_file_mid_section(
         std::filesystem::path p_filename(get_xml_option_value(line, "file"));
 
         // Choose base directory: on absolute restart select its parent directory
-        // otherwise keep relative with ".")
+        // otherwise form relative path from current working directory to the restart directory
         const std::filesystem::path base_dir =
-            p_restart.is_absolute() ? p_restart.parent_path()
-                                    : (std::filesystem::path(".") / p_restart.parent_path());
+            p_restart.is_absolute()
+                ? p_restart.parent_path()
+                : std::filesystem::relative(std::filesystem::absolute(p_restart.parent_path()),
+                      std::filesystem::absolute(path_existing_working_directory_));
 
         // Resolve final path: select absolute file paths, otherwise anchor at base directory
         const std::filesystem::path resolved =
@@ -741,7 +744,9 @@ void VtkWriterBase::create_restarted_initial_collection_file_mid_section(
             resolved.lexically_normal().generic_string(), readtime);
       }
       else
+      {
         break;
+      }
     }
   }
 

src/core/io/src/4C_io_vtk_writer_base.hpp

@@ -312,6 +312,9 @@ class VtkWriterBase
   //! containing [time value and filename] of all yet written master files
   std::stringstream collection_file_midsection_cumulated_content_;
 
+  //! full path of the existing working directory where the vtk subdirectory is created.
+  //! relative or absolute depending on output specification
+  std::string path_existing_working_directory_;
 
   //! full path of the working directory for all vtk files to be written into
   std::string working_directory_full_path_;