CFVMOutput & Streamwise+spanwise periodic

Common/src/CConfig.cpp

@@ -4662,8 +4662,8 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i
       SU2_MPI::Error("Streamwise Periodic Flow currently only implemented for incompressible flow.", CURRENT_FUNCTION);
     if (Kind_Solver == INC_EULER)
       SU2_MPI::Error("Streamwise Periodic Flow + Incompressible Euler: Not tested yet.", CURRENT_FUNCTION);
-    if (nMarker_PerBound != 2)
-      SU2_MPI::Error("Streamwise Periodic Flow currently only implemented for one Periodic Marker pair. Combining Streamwise and Spanwise periodicity not possible in the moment.", CURRENT_FUNCTION);
+    if (nMarker_PerBound == 0)
+      SU2_MPI::Error("A MARKER_PERIODIC pair has to be set with KIND_STREAMWISE_PERIODIC != NONE.", CURRENT_FUNCTION);
     if (Energy_Equation && Streamwise_Periodic_Temperature && nMarker_Isothermal != 0)
       SU2_MPI::Error("No MARKER_ISOTHERMAL marker allowed with STREAMWISE_PERIODIC_TEMPERATURE= YES, only MARKER_HEATFLUX & MARKER_SYM.", CURRENT_FUNCTION);
     if (DiscreteAdjoint && Kind_Streamwise_Periodic == ENUM_STREAMWISE_PERIODIC::MASSFLOW)

SU2_CFD/include/interfaces/CInterface.hpp

@@ -70,6 +70,7 @@ class CInterface {
   unsigned short nSpanMaxAllZones = 0;
 
   unsigned short nVar = 0;
+  static constexpr size_t MAXNDIM = 3;  /*!< \brief Max number of space dimensions, used in some static arrays. */
 
 public:
   /*!

SU2_CFD/include/output/CAdjHeatOutput.hpp

@@ -1,5 +1,5 @@
 /*!
- * \file output_fea_discadj.hpp
+ * \file CAdjHeatOutput.hpp
  * \brief Headers of the adjoint heat output.
  * \author T. Albring
  * \version 7.1.1 "Blackbird"

SU2_CFD/include/output/CFVMOutput.hpp

@@ -0,0 +1,69 @@
+/*!
+ * \file CFVMOutput.hpp
+ * \brief  Headers of the Finite Volume Method output.
+ * \author T. Kattmann
+ * \version 7.1.1 "Blackbird"
+ *
+ * SU2 Project Website: https://su2code.github.io
+ *
+ * The SU2 Project is maintained by the SU2 Foundation
+ * (http://su2foundation.org)
+ *
+ * Copyright 2012-2021, SU2 Contributors (cf. AUTHORS.md)
+ *
+ * SU2 is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "COutput.hpp"
+
+class CFVMOutput : public COutput{
+protected:
+  /*!
+   * \brief Constructor of the class
+   */
+  CFVMOutput(CConfig *config, unsigned short nDim, bool femOutput);
+
+  /*!
+   * \brief Destructor of the class.
+   */
+  ~CFVMOutput(void) = default;
+
+  /*!
+   * \brief Add Coordinates to output.
+   */
+  void AddCoordinates();
+
+  /*!
+   * \brief Load the coordinates.
+   */
+  template<class T>
+  inline void LoadCoordinates(const T& Coord, const unsigned long iPoint) {
+    SetVolumeOutputValue("COORD-X", iPoint, Coord[0]);
+    SetVolumeOutputValue("COORD-Y", iPoint, Coord[1]);
+    if (nDim == 3)
+      SetVolumeOutputValue("COORD-Z", iPoint, Coord[2]);
+  }
+
+  /*!
+   * \brief Add common FVM outputs.
+   */
+  void AddCommonFVMOutputs(const CConfig* config);
+
+  /*!
+   * \brief Load common FVM outputs.
+   */
+  void LoadCommonFVMOutputs(const CConfig* config, const CGeometry* geometry, unsigned long iPoint);
+};

SU2_CFD/include/output/CFlowIncOutput.hpp

@@ -1,5 +1,5 @@
-/*!
- * \file CFlowIncCompOutput.hpp
+/*!
+ * \file CFlowIncOutput.hpp
  * \brief  Headers of the incompressible flow output.
  * \author T. Albring, R. Sanchez
  * \version 7.1.1 "Blackbird"

SU2_CFD/include/output/CFlowOutput.hpp

@@ -27,10 +27,10 @@
 
 #pragma once
 
-#include "COutput.hpp"
+#include "CFVMOutput.hpp"
 #include "../variables/CVariable.hpp"
 
-class CFlowOutput : public COutput{
+class CFlowOutput : public CFVMOutput{
 public:
   /*!
    * \brief Constructor of the class
@@ -142,14 +142,4 @@ class CFlowOutput : public COutput{
    */
   void LoadTimeAveragedData(unsigned long iPoint, CVariable *node_flow);
 
-  /*!
-   * \brief Add common FVM outputs.
-   */
-  void AddCommonFVMOutputs(const CConfig* config);
-
-  /*!
-   * \brief Load common FVM outputs.
-   */
-  void LoadCommonFVMOutputs(const CConfig* config, const CGeometry* geometry, unsigned long iPoint);
-
 };

SU2_CFD/include/output/CHeatOutput.hpp

@@ -1,6 +1,6 @@
 /*!
  * \file CHeatOutput.hpp
- * \brief  Headers of the heat output.
+ * \brief Headers of the heat output.
  * \author R. Sanchez, T. Albring.
  * \version 7.1.1 "Blackbird"
  *
@@ -27,15 +27,15 @@
 
 #pragma once
 
-#include "COutput.hpp"
+#include "CFVMOutput.hpp"
 
 
 /*! \class CHeatOutput
  *  \brief Output class for heat problems.
  *  \author R. Sanchez, T. Albring.
  *  \date June 5, 2018.
  */
-class CHeatOutput final: public COutput {
+class CHeatOutput final: public CFVMOutput {
 public:
 
   /*!

SU2_CFD/include/output/CMeshOutput.hpp

@@ -1,6 +1,6 @@
 /*!
  * \file CMeshOutput.hpp
- * \brief  Headers of the mesh output.
+ * \brief Headers of the mesh output.
  * \author R. Sanchez, T. Albring.
  * \version 7.1.1 "Blackbird"
  *

SU2_CFD/include/output/CMultizoneOutput.hpp

@@ -1,5 +1,5 @@
 /*!
- * \file CDriverOutput.hpp
+ * \file CMultizoneOutput.hpp
  * \brief Headers of the main subroutines for screen and history output in multizone problems.
  * \author R. Sanchez, T. Albring
  * \version 7.1.1 "Blackbird"
@@ -44,7 +44,7 @@
 using namespace std;
 
 /*!
- * \class CDriverOutput
+ * \class CMultizoneOutput
  * \brief Class for writing the multizone output.
  * \author R. Sanchez, T. Albring.
  */
@@ -53,7 +53,7 @@ class CMultizoneOutput final: public COutput {
 protected:
   unsigned short nZone; //!< Number of zones
 
-  string bgs_res_name; //!< Block-Gauss seidel residual name
+  string bgs_res_name; //!< Block-Gauss Seidel residual name
   bool write_zone;     //!< Boolean indicating whether the individual zones write to screen
 
 public:

SU2_CFD/include/output/COutputFactory.hpp

@@ -1,5 +1,5 @@
 /*!
- * \file COutput.hpp
+ * \file COutputFactory.hpp
  * \brief Headers of the output class.
  * \author T.Albring
  * \version 7.1.1 "Blackbird"

SU2_CFD/include/output/COutputLegacy.hpp

@@ -1,7 +1,7 @@
 /*!
- * \file output.hpp
+ * \file COutputLegacy.hpp
  * \brief Headers of the main subroutines for generating the file outputs.
- *        The subroutines and functions are in the <i>output_structure.cpp</i> file.
+ *        The subroutines and functions are in the <i>output_structure_legacy.cpp</i> file.
  * \author F. Palacios, T. Economon, M. Colonno
  * \version 7.1.1 "Blackbird"
  *

SU2_CFD/include/variables/CVariable.hpp

@@ -78,7 +78,7 @@ class CVariable {
   MatrixType Solution_Min;   /*!< \brief Min solution for limiter computation. */
 
   MatrixType AuxVar;             /*!< \brief Auxiliary variable for gradient computation. */
-  CVectorOfMatrix Grad_AuxVar;   /*!< \brief Gradient of the auxiliary variables  of the problem. */
+  CVectorOfMatrix Grad_AuxVar;   /*!< \brief Gradient of the auxiliary variables of the problem. */
 
   VectorType Max_Lambda_Inv;   /*!< \brief Maximun inviscid eingenvalue. */
   VectorType Max_Lambda_Visc;  /*!< \brief Maximun viscous eingenvalue. */

SU2_CFD/obj/Makefile.am

@@ -136,6 +136,7 @@ libSU2Core_sources = ../src/definition_structure.cpp \
   ../src/output/output_physics.cpp \
   ../src/output/CMeshOutput.cpp \
   ../src/output/CElasticityOutput.cpp \
+  ../src/output/CFVMOutput.cpp \
   ../src/output/CFlowOutput.cpp \
   ../src/output/CFlowCompOutput.cpp \
   ../src/output/CFlowCompFEMOutput.cpp \

SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp

@@ -345,18 +345,6 @@ void CDiscAdjSinglezoneDriver::SetObjFunction(){
 
     solver[FLOW_SOL]->SetTotal_ComboObj(0.0);
 
-//    if (config->GetnMarker_Analyze() != 0)
-//      output->SpecialOutput_AnalyzeSurface(solver[FLOW_SOL], geometry, config, false);
-
-//    if ((config->GetnMarker_Analyze() != 0) && compressible)
-//      output->SpecialOutput_Distortion(solver[FLOW_SOL], geometry, config, false);
-
-//    if (config->GetnMarker_NearFieldBound() != 0)
-//      output->SpecialOutput_SonicBoom(solver[FLOW_SOL], geometry, config, false);
-
-//    if (config->GetPlot_Section_Forces())
-//      output->SpecialOutput_SpanLoad(solver[FLOW_SOL], geometry, config, false);
-
     /*--- Surface based obj. function ---*/
 
     solver[FLOW_SOL]->Evaluate_ObjFunc(config);

SU2_CFD/src/drivers/CMultizoneDriver.cpp

@@ -139,14 +139,11 @@ CMultizoneDriver::~CMultizoneDriver(void) {
 void CMultizoneDriver::StartSolver() {
 
   /*--- Find out the minimum of all references times and then set each zone to this (same) value.
-   * (To ensure that all zones run synchronously in time, be it a dimensional or non-dimensionalized one.) ---*/
+        To ensure that all zones run synchronously in time, be it a dimensional or non-dimensionalized one. ---*/
 
-  su2double Time_Ref = config_container[ZONE_0]->GetTime_Ref();
-
-  for (iZone = 1; iZone < nZone; iZone++) {
-    if (config_container[iZone]->GetTime_Ref() < Time_Ref)
-      Time_Ref = config_container[iZone]->GetTime_Ref();
-  }
+  su2double Time_Ref = std::numeric_limits<su2double>::max();
+  for (iZone = 0; iZone < nZone; iZone++)
+    Time_Ref = min(Time_Ref, config_container[iZone]->GetTime_Ref());
 
   for (iZone = 0; iZone < nZone; iZone++) {