make the extra allocation more generic

Author: pcarruscag

SU2_CFD/include/solvers/CIncEulerSolver.hpp

@@ -404,8 +404,9 @@ class CIncEulerSolver : public CFVMFlowSolverBase<CIncEulerVariable, ENUM_REGIME
    * \brief Register In- or Output.
    * \param[in] input - Boolean whether In- or Output should be registered.
    * \param[in] config - The particular config.
+   * \returns The number of extra variables.
    */
-  void RegisterSolutionExtra(bool input, const CConfig* config) final;
+  unsigned long RegisterSolutionExtra(bool input, const CConfig* config) final;
 
   /*!
    * \brief Seed the adjoint of the extra solution at the output.

SU2_CFD/include/solvers/CSolver.hpp

@@ -3547,8 +3547,9 @@ class CSolver {
    * \brief Register In- or Output.
    * \param[in] input - Boolean whether In- or Output should be registered.
    * \param[in] config - The particular config.
+   * \returns The number of extra variables.
    */
-  virtual void RegisterSolutionExtra(bool input, const CConfig* config) {}
+  virtual unsigned long RegisterSolutionExtra(bool input, const CConfig* config) { return 0; }
 
   /*!
    * \brief Seed the adjoint of the extra solution at the output.

SU2_CFD/include/variables/CDiscAdjVariable.hpp

@@ -54,9 +54,10 @@ class CDiscAdjVariable : public CVariable {
   CDiscAdjVariable(const su2double* sol, unsigned long npoint, unsigned long ndim, unsigned long nvar, CConfig *config);
 
   /*!
-   * \brief Destructor of the class.
+   * \brief Allocate extra adjoint variables.
+   * \param[in] nVarExtra - Number of extra variables.
    */
-  ~CDiscAdjVariable() override = default;
+  void AllocateAdjointSolutionExtra(unsigned long nVarExtra);
 
   /*!
    * \brief Set the sensitivity at the node

SU2_CFD/src/solvers/CDiscAdjSolver.cpp

@@ -29,20 +29,19 @@
 #include "../../../Common/include/toolboxes/geometry_toolbox.hpp"
 #include "../../../Common/include/parallelization/omp_structure.hpp"
 
-CDiscAdjSolver::CDiscAdjSolver(CGeometry *geometry, CConfig *config, CSolver *direct_solver,
+CDiscAdjSolver::CDiscAdjSolver(CGeometry *geometry, CConfig *config, CSolver *direct_sol,
                                unsigned short Kind_Solver, unsigned short iMesh)  : CSolver() {
 
+  /*-- Store some information about direct solver ---*/
+
+  KindDirect_Solver = Kind_Solver;
+  direct_solver = direct_sol;
+
   adjoint = true;
 
   nVar = direct_solver->GetnVar();
   nDim = geometry->GetnDim();
 
-  /*--- Initialize arrays to NULL ---*/
-
-  /*-- Store some information about direct solver ---*/
-  this->KindDirect_Solver = Kind_Solver;
-  this->direct_solver = direct_solver;
-
   nMarker      = config->GetnMarker_All();
   nPoint       = geometry->GetnPoint();
   nPointDomain = geometry->GetnPointDomain();
@@ -86,6 +85,11 @@ CDiscAdjSolver::CDiscAdjSolver(CGeometry *geometry, CConfig *config, CSolver *di
   nodes = new CDiscAdjVariable(Solution.data(), nPoint, nDim, nVar, config);
   SetBaseClassPointerToNodes();
 
+  /*--- Allocate extra solution variables, if any are in use. ---*/
+
+  const auto nVarExtra = direct_solver->RegisterSolutionExtra(true, config);
+  nodes->AllocateAdjointSolutionExtra(nVarExtra);
+
   switch(KindDirect_Solver){
   case RUNTIME_FLOW_SYS:
     SolverName = "ADJ.FLOW";

SU2_CFD/src/solvers/CIncEulerSolver.cpp

@@ -3106,11 +3106,13 @@ void CIncEulerSolver::SetFreeStream_Solution(const CConfig *config){
 
 }
 
-void CIncEulerSolver::RegisterSolutionExtra(bool input, const CConfig* config) {
+unsigned long CIncEulerSolver::RegisterSolutionExtra(bool input, const CConfig* config) {
   if (config->GetKind_Streamwise_Periodic() == ENUM_STREAMWISE_PERIODIC::MASSFLOW) {
     if (input) AD::RegisterInput(SPvals.Streamwise_Periodic_PressureDrop);
     else AD::RegisterOutput(SPvalsUpdated.Streamwise_Periodic_PressureDrop);
+    return 1;
   }
+  return 0;
 }
 
 void CIncEulerSolver::SetAdjoint_SolutionExtra(const su2activevector& adj_sol, const CConfig* config) {

SU2_CFD/src/variables/CDiscAdjVariable.cpp

@@ -49,3 +49,11 @@ void CDiscAdjVariable::Set_External_To_DualTimeDer() {
   assert(External.size() == DualTime_Derivative.size());
   parallelCopy(External.size(), DualTime_Derivative.data(), External.data());
 }
+
+void CDiscAdjVariable::AllocateAdjointSolutionExtra(unsigned long nVarExtra) {
+  if (nVarExtra == 0) return;
+  SolutionExtra.resize(nVarExtra) = su2double(1e-16);
+  /*--- These are only for multizone, but since nVarExtra is small we allocate by default. ---*/
+  SolutionExtra_BGS_k.resize(nVarExtra) = su2double(1e-16);
+  ExternalExtra.resize(nVarExtra) = su2double(0.0);
+}

SU2_CFD/src/variables/CVariable.cpp

@@ -72,14 +72,6 @@ CVariable::CVariable(unsigned long npoint, unsigned long ndim, unsigned long nva
       AD_InputIndex.resize(nPoint,nVar) = -1;
       AD_OutputIndex.resize(nPoint,nVar) = -1;
     }
-
-    if (config->GetKind_Streamwise_Periodic() == ENUM_STREAMWISE_PERIODIC::MASSFLOW) {
-      SolutionExtra.resize(1) = su2double(1e-16);
-      if (config->GetMultizone_Problem()) {
-        SolutionExtra_BGS_k.resize(1) = su2double(1e-16);
-        ExternalExtra.resize(1) = su2double(0.0);
-      }
-    }
   }
 
   if (config->GetMultizone_Problem())