Merge pull request #1371 from su2code/feature_directres

Make primal residual for adjoint like normal screen output.

Author: TobiKattmann

SU2_CFD/include/drivers/CDiscAdjSinglezoneDriver.hpp

@@ -112,12 +112,6 @@ class CDiscAdjSinglezoneDriver : public CSinglezoneDriver {
    */
   void SetAdj_ObjFunction(void);
 
-  /*!
-   * \brief Print out the direct residuals.
-   * \param[in] kind_recording - Type of recording (full list in ENUM_RECORDING, option_structure.hpp)
-   */
-  void Print_DirectResidual(RECORDING kind_recording);
-
   /*!
    * \brief Record the main computational path.
    */

SU2_CFD/include/drivers/CDriver.hpp

@@ -313,6 +313,12 @@ class CDriver {
    */
   virtual void Update() {}
 
+  /*!
+   * \brief Print out the direct residuals.
+   * \param[in] kind_recording - Type of recording (full list in ENUM_RECORDING, option_structure.hpp)
+   */
+  void Print_DirectResidual(RECORDING kind_recording);
+
 public:
 
   /*!

SU2_CFD/src/drivers/CDiscAdjMultizoneDriver.cpp

@@ -665,6 +665,7 @@ void CDiscAdjMultizoneDriver::SetRecording(RECORDING kind_recording, Kind_Tape t
                                                          config_container, iZone, INST_0);
       AD::Push_TapePosition(); /// leave_zone
     }
+    Print_DirectResidual(kind_recording);
   }
 
   if (kind_recording != RECORDING::CLEAR_INDICES && driver_config->GetWrt_AD_Statistics()) {
@@ -700,58 +701,6 @@ void CDiscAdjMultizoneDriver::DirectIteration(unsigned short iZone, RECORDING ki
                                            solver_container, numerics_container, config_container,
                                            surface_movement, grid_movement, FFDBox, iZone, INST_0);
 
-  /*--- Print residuals in the first iteration ---*/
-
-  if (rank == MASTER_NODE && kind_recording == RECORDING::SOLUTION_VARIABLES) {
-
-    auto solvers = solver_container[iZone][INST_0][MESH_0];
-
-    switch (config_container[iZone]->GetKind_Solver()) {
-
-      case DISC_ADJ_EULER:     case DISC_ADJ_NAVIER_STOKES:
-      case DISC_ADJ_INC_EULER: case DISC_ADJ_INC_NAVIER_STOKES:
-        cout << " Zone " << iZone << " (flow)       - log10[U(0)]    : "
-             << log10(solvers[FLOW_SOL]->GetRes_RMS(0)) << endl;
-        if (config_container[iZone]->AddRadiation()) {
-
-          cout << " Zone " << iZone << " (radiation)  - log10[Rad(0)]  : "
-               << log10(solvers[RAD_SOL]->GetRes_RMS(0)) << endl;
-        }
-        break;
-
-      case DISC_ADJ_RANS: case DISC_ADJ_INC_RANS:
-        cout << " Zone " << iZone << " (flow)       - log10[U(0)]    : "
-             << log10(solvers[FLOW_SOL]->GetRes_RMS(0)) << endl;
-
-        if (!config_container[iZone]->GetFrozen_Visc_Disc()) {
-
-          cout << " Zone " << iZone << " (turbulence) - log10[Turb(0)] : "
-               << log10(solvers[TURB_SOL]->GetRes_RMS(0)) << endl;
-        }
-        if (config_container[iZone]->AddRadiation()) {
-
-          cout << " Zone " << iZone << " (radiation)  - log10[Rad(0)]  : "
-               << log10(solvers[RAD_SOL]->GetRes_RMS(0)) << endl;
-        }
-        break;
-
-      case DISC_ADJ_HEAT:
-        cout << " Zone " << iZone << " (heat)       - log10[Heat(0)] : "
-             << log10(solvers[HEAT_SOL]->GetRes_RMS(0)) << endl;
-        break;
-
-      case DISC_ADJ_FEM:
-        cout << " Zone " << iZone << " (structure)  - ";
-        if(config_container[iZone]->GetGeometricConditions() == STRUCT_DEFORMATION::LARGE)
-          cout << "log10[RTOL-A]  : " << log10(solvers[FEA_SOL]->GetRes_FEM(1)) << endl;
-        else
-          cout << "log10[RMS Ux]  : " << log10(solvers[FEA_SOL]->GetRes_RMS(0)) << endl;
-        break;
-
-      default:
-        break;
-    }
-  }
 }
 
 void CDiscAdjMultizoneDriver::SetObjFunction(RECORDING kind_recording) {

SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp

@@ -244,18 +244,24 @@ void CDiscAdjSinglezoneDriver::SetRecording(RECORDING kind_recording){
 
   iteration->SetRecording(solver_container, geometry_container, config_container, ZONE_0, INST_0, kind_recording);
 
+  if (rank == MASTER_NODE) {
+    cout << "\n-------------------------------------------------------------------------\n";
+    switch(kind_recording) {
+    case RECORDING::CLEAR_INDICES: cout << "Clearing the computational graph." << endl; break;
+    case RECORDING::MESH_COORDS:   cout << "Storing computational graph wrt MESH COORDINATES." << endl; break;
+    case RECORDING::SOLUTION_VARIABLES:
+      cout << "Direct iteration to store the primal computational graph." << endl;
+      cout << "Computing residuals to check the convergence of the direct problem." << endl; break;
+    default: break;
+    }
+  }
+
   /*---Enable recording and register input of the iteration --- */
 
   if (kind_recording != RECORDING::CLEAR_INDICES){
 
     AD::StartRecording();
 
-    if (rank == MASTER_NODE && kind_recording == MainVariables) {
-      cout << endl << "-------------------------------------------------------------------------" << endl;
-      cout << "Direct iteration to store the primal computational graph." << endl;
-      cout << "Compute residuals to check the convergence of the direct problem." << endl;
-    }
-
     iteration->RegisterInput(solver_container, geometry_container, config_container, ZONE_0, INST_0, kind_recording);
   }
 
@@ -437,75 +443,6 @@ void CDiscAdjSinglezoneDriver::DirectRun(RECORDING kind_recording){
 
 }
 
-void CDiscAdjSinglezoneDriver::Print_DirectResidual(RECORDING kind_recording){
-
-  /*--- Print the residuals of the direct iteration that we just recorded ---*/
-  /*--- This routine should be moved to the output, once the new structure is in place ---*/
-  if ((rank == MASTER_NODE) && (kind_recording == MainVariables)){
-
-    switch (config->GetKind_Solver()) {
-
-    case DISC_ADJ_EULER: case DISC_ADJ_NAVIER_STOKES: case DISC_ADJ_RANS:
-    case DISC_ADJ_INC_EULER: case DISC_ADJ_INC_NAVIER_STOKES: case DISC_ADJ_INC_RANS:
-    case DISC_ADJ_FEM_EULER : case DISC_ADJ_FEM_NS : case DISC_ADJ_FEM_RANS :
-      cout << "log10[U(0)]: "   << log10(solver[FLOW_SOL]->GetRes_RMS(0))
-           << ", log10[U(1)]: " << log10(solver[FLOW_SOL]->GetRes_RMS(1))
-           << ", log10[U(2)]: " << log10(solver[FLOW_SOL]->GetRes_RMS(2)) << "." << endl;
-      cout << "log10[U(3)]: " << log10(solver[FLOW_SOL]->GetRes_RMS(3));
-      if (geometry->GetnDim() == 3) cout << ", log10[U(4)]: " << log10(solver[FLOW_SOL]->GetRes_RMS(4));
-      cout << "." << endl;
-      if ( config->GetKind_Turb_Model() != NONE && !config->GetFrozen_Visc_Disc()) {
-        cout << "log10[Turb(0)]: "   << log10(solver[TURB_SOL]->GetRes_RMS(0));
-        if (solver[TURB_SOL]->GetnVar() > 1) cout << ", log10[Turb(1)]: " << log10(solver[TURB_SOL]->GetRes_RMS(1));
-        cout << "." << endl;
-      }
-      if (config->GetWeakly_Coupled_Heat()){
-        cout << "log10[Heat(0)]: "   << log10(solver[HEAT_SOL]->GetRes_RMS(0)) << "." << endl;
-      }
-      if ( config->AddRadiation()) {
-        cout <<"log10[E(rad)]: " << log10(solver[RAD_SOL]->GetRes_RMS(0)) << endl;
-      }
-      break;
-
-    case DISC_ADJ_FEM:
-
-      if (config->GetGeometricConditions() == STRUCT_DEFORMATION::LARGE){
-        cout << "UTOL-A: "   << log10(solver[FEA_SOL]->GetRes_FEM(0))
-             << ", RTOL-A: " << log10(solver[FEA_SOL]->GetRes_FEM(1))
-             << ", ETOL-A: " << log10(solver[FEA_SOL]->GetRes_FEM(2)) << "." << endl;
-      }
-      else{
-        if (geometry->GetnDim() == 2){
-          cout << "log10[RMS Ux]: "   << log10(solver[FEA_SOL]->GetRes_RMS(0))
-               << ", log10[RMS Uy]: " << log10(solver[FEA_SOL]->GetRes_RMS(1)) << "." << endl;
-        }
-        else{
-          cout << "log10[RMS Ux]: "   << log10(solver[FEA_SOL]->GetRes_RMS(0))
-               << ", log10[RMS Uy]: " << log10(solver[FEA_SOL]->GetRes_RMS(1))
-               << ", log10[RMS Uz]: " << log10(solver[FEA_SOL]->GetRes_RMS(2))<< "." << endl;
-        }
-      }
-
-      break;
-
-    case DISC_ADJ_HEAT:
-      cout << "log10[Cons(0)]: "   << log10(solver[HEAT_SOL]->GetRes_RMS(0)) << "." << endl;
-      break;
-
-    }
-
-    cout << "-------------------------------------------------------------------------" << endl << endl;
-  }
-  else if ((rank == MASTER_NODE) && (kind_recording == SecondaryVariables) && (SecondaryVariables != RECORDING::CLEAR_INDICES)){
-    cout << endl << "Recording the computational graph with respect to the ";
-    switch (SecondaryVariables){
-      case RECORDING::MESH_COORDS: cout << "mesh coordinates." << endl;    break;
-      default:                     cout << "secondary variables." << endl; break;
-     }
-  }
-
-}
-
 void CDiscAdjSinglezoneDriver::MainRecording(){
 
   /*--- SetRecording stores the computational graph on one iteration of the direct problem. Calling it with NONE

SU2_CFD/src/drivers/CDriver.cpp

@@ -2654,6 +2654,110 @@ void CDriver::Turbomachinery_Preprocessing(CConfig** config, CGeometry**** geome
 
 CDriver::~CDriver(void) {}
 
+void CDriver::Print_DirectResidual(RECORDING kind_recording) {
+
+  if (!(rank == MASTER_NODE && kind_recording == RECORDING::SOLUTION_VARIABLES)) return;
+
+  const bool multizone = config_container[ZONE_0]->GetMultizone_Problem();
+
+  /*--- Helper lambda func to return lenghty [iVar][iZone] string.  ---*/
+  auto iVar_iZone2string = [&](unsigned short ivar, unsigned short izone) {
+    if (multizone)
+      return "[" + std::to_string(ivar) + "][" + std::to_string(izone) + "]";
+    else
+      return "[" + std::to_string(ivar) + "]";
+  };
+
+  /*--- Print residuals in the first iteration ---*/
+
+  const unsigned short fieldWidth = 15;
+  PrintingToolbox::CTablePrinter RMSTable(&std::cout);
+
+  /*--- The CTablePrinter requires two sweeps:
+    *--- 0. Add the colum names (addVals=0=false) plus CTablePrinter.PrintHeader()
+    *--- 1. Add the RMS-residual values (addVals=1=true) plus CTablePrinter.PrintFooter() ---*/
+  for (int addVals = 0; addVals < 2; addVals++) {
+
+    for (unsigned short iZone = 0; iZone < nZone; iZone++) {
+
+      auto solvers = solver_container[iZone][INST_0][MESH_0];
+      auto configs = config_container[iZone];
+
+      /*--- Note: the FEM-Flow solvers are availalbe for disc. adjoint runs only for SingleZone. ---*/
+      if (configs->GetFluidProblem() || configs->GetFEMSolver()) {
+
+        for (unsigned short iVar = 0; iVar < solvers[FLOW_SOL]->GetnVar(); iVar++) {
+          if (!addVals)
+            RMSTable.AddColumn("rms_Flow" + iVar_iZone2string(iVar, iZone), fieldWidth);
+          else
+            RMSTable << log10(solvers[FLOW_SOL]->GetRes_RMS(iVar));
+        }
+
+        if (configs->GetKind_Turb_Model() != NONE && !configs->GetFrozen_Visc_Disc()) {
+          for (unsigned short iVar = 0; iVar < solvers[TURB_SOL]->GetnVar(); iVar++) {
+            if (!addVals)
+              RMSTable.AddColumn("rms_Turb" + iVar_iZone2string(iVar, iZone), fieldWidth);
+            else
+              RMSTable << log10(solvers[TURB_SOL]->GetRes_RMS(iVar));
+          }
+        }
+
+        if (!multizone && configs->GetWeakly_Coupled_Heat()){
+          if (!addVals) RMSTable.AddColumn("rms_Heat" + iVar_iZone2string(0, iZone), fieldWidth);
+          else RMSTable << log10(solvers[HEAT_SOL]->GetRes_RMS(0));
+        }
+
+        if (configs->AddRadiation()) {
+          if (!addVals) RMSTable.AddColumn("rms_Rad" + iVar_iZone2string(0, iZone), fieldWidth);
+          else RMSTable << log10(solvers[RAD_SOL]->GetRes_RMS(0));
+        }
+
+      }
+      else if (configs->GetStructuralProblem()) {
+
+        if (configs->GetGeometricConditions() == STRUCT_DEFORMATION::LARGE){
+          if (!addVals) {
+            RMSTable.AddColumn("UTOL-A", fieldWidth);
+            RMSTable.AddColumn("RTOL-A", fieldWidth);
+            RMSTable.AddColumn("ETOL-A", fieldWidth);
+          }
+          else {
+            RMSTable << log10(solvers[FEA_SOL]->GetRes_FEM(0))
+                     << log10(solvers[FEA_SOL]->GetRes_FEM(1))
+                     << log10(solvers[FEA_SOL]->GetRes_FEM(2));
+          }
+        }
+        else{
+          if (!addVals) {
+            RMSTable.AddColumn("log10[RMS Ux]", fieldWidth);
+            RMSTable.AddColumn("log10[RMS Uy]", fieldWidth);
+            if (nDim == 3) RMSTable.AddColumn("log10[RMS Uz]", fieldWidth);
+          }
+          else {
+            RMSTable << log10(solvers[FEA_SOL]->GetRes_FEM(0))
+                     << log10(solvers[FEA_SOL]->GetRes_FEM(1));
+            if (nDim == 3) RMSTable << log10(solvers[FEA_SOL]->GetRes_FEM(2));
+          }
+        }
+
+      }
+      else if (configs->GetHeatProblem()) {
+
+        if (!addVals) RMSTable.AddColumn("rms_Heat" + iVar_iZone2string(0, iZone), fieldWidth);
+        else RMSTable << log10(solvers[HEAT_SOL]->GetRes_RMS(0));
+      } else {
+        SU2_MPI::Error("Invalid KindSolver for CDiscAdj-MultiZone/SingleZone-Driver.", CURRENT_FUNCTION);
+      }
+    } // loop iZone
+
+    if (!addVals) RMSTable.PrintHeader();
+    else RMSTable.PrintFooter();
+
+  } // for addVals
+
+  cout << "\n-------------------------------------------------------------------------\n" << endl;
+
+}
 
 CFluidDriver::CFluidDriver(char* confFile, unsigned short val_nZone, SU2_Comm MPICommunicator) : CDriver(confFile, val_nZone, MPICommunicator, false) {
   Max_Iter = config_container[ZONE_0]->GetnInner_Iter();