Fix output names of unsteady simulation

SU2_CFD/include/output/COutput.hpp

@@ -418,6 +418,12 @@ class COutput {
    */
   void SetMultizoneHistoryOutput(COutput** output, CConfig **config, CConfig *driver_config,
                                   unsigned long TimeIter, unsigned long OuterIter);
+
+  /*!
+   * \brief Sets the current time iteration
+   * \param[in] timeIter - the current time iteration
+   */
+  inline void SetCurTimeIter(unsigned long val_curTimeIter) {curTimeIter = val_curTimeIter;}
 
   /*!
    * \brief Sets the volume output filename

SU2_CFD/src/drivers/CMultizoneDriver.cpp

@@ -397,6 +397,10 @@ void CMultizoneDriver::Corrector(unsigned short val_iZone) {
 
 bool CMultizoneDriver::OuterConvergence(unsigned long OuterIter) {
 
+  // Set the current time iter for the multizone problem
+  bool unsteady = config_container[ZONE_0]->GetTime_Domain();
+  if (unsteady) driver_output->SetCurTimeIter(config_container[ZONE_0]->GetTimeIter());
+
   /*--- Update the residual for the all the zones. ---*/
 
   for (iZone = 0; iZone < nZone; iZone++) {

SU2_CFD/src/iteration/CFluidIteration.cpp

@@ -376,6 +376,8 @@ void CFluidIteration::Solve(COutput* output, CIntegration**** integration, CGeom
   /*--- Boolean to determine if we are running a static or dynamic case ---*/
   bool steady = !config[val_iZone]->GetTime_Domain();
 
+  if (!steady) output->SetCurTimeIter(config[val_iZone]->GetTimeIter());
+
   unsigned long Inner_Iter, nInner_Iter = config[val_iZone]->GetnInner_Iter();
   bool StopCalc = false;
 

SU2_CFD/src/output/COutput.cpp

@@ -207,7 +207,6 @@ void COutput::SetHistoryOutput(CGeometry *geometry,
                                   unsigned long OuterIter,
                                   unsigned long InnerIter) {
 
-  curTimeIter  = TimeIter;
   curAbsTimeIter = max(TimeIter, config->GetStartWindowIteration()) - config->GetStartWindowIteration();
   curOuterIter = OuterIter;
   curInnerIter = InnerIter;
@@ -273,7 +272,6 @@ void COutput::SetHistoryOutput(CGeometry ****geometry, CSolver *****solver, CCon
 
 void COutput::SetMultizoneHistoryOutput(COutput **output, CConfig **config, CConfig *driver_config, unsigned long TimeIter, unsigned long OuterIter){
 
-  curTimeIter  = TimeIter;
   curAbsTimeIter = max(TimeIter, driver_config->GetStartWindowIteration()) - driver_config->GetStartWindowIteration();
   curOuterIter = OuterIter;
 
@@ -476,7 +474,7 @@ void COutput::WriteToFile(CConfig *config, CGeometry *geometry, OUTPUT_TYPE form
       extension = CSU2MeshFileWriter::fileExt;
 
       if (fileName.empty())
-        fileName = volumeFilename;
+        fileName = config->GetFilename(volumeFilename, "", curTimeIter);
 
       if (!config->GetWrt_Volume_Overwrite())
         filename_iter = config->GetFilename_Iter(fileName, curInnerIter, curOuterIter);