Merge branch 'develop' into update_config_template

Author: bigfooted

AUTHORS.md

@@ -98,6 +98,7 @@ Kedar Naik
 Kürşat Yurt
 LaSerpe
 Lennaert Tol
+Liang Cheng
 Lisa Kusch
 Matteo Pini
 Max Aehle

Common/include/basic_types/ad_structure.hpp

@@ -78,6 +78,19 @@ inline void RegisterOutput(su2double& data) {}
  */
 inline void ResizeAdjoints() {}
 
+/*!
+ * \brief Declare that the adjoints are being used, to protect against resizing.
+ *
+ * Should be used together with AD::EndUseAdjoints() to protect AD::SetDerivative() and AD::GetDerivative() calls,
+ * multiple at once if possible.
+ */
+inline void BeginUseAdjoints() {}
+
+/*!
+ * \brief Declare that the adjoints are no longer being used.
+ */
+inline void EndUseAdjoints() {}
+
 /*!
  * \brief Sets the adjoint value at index to val
  * \param[in] index - Position in the adjoint vector.
@@ -375,6 +388,10 @@ FORCEINLINE void Reset() {
 
 FORCEINLINE void ResizeAdjoints() { AD::getTape().resizeAdjointVector(); }
 
+FORCEINLINE void BeginUseAdjoints() { AD::getTape().beginUseAdjointVector(); }
+
+FORCEINLINE void EndUseAdjoints() { AD::getTape().endUseAdjointVector(); }
+
 FORCEINLINE void SetIndex(int& index, const su2double& data) { index = data.getIdentifier(); }
 
 // WARNING: For performance reasons, this method does not perform bounds checking.

Common/include/parallelization/omp_structure.hpp

@@ -189,14 +189,14 @@ void omp_finalize();
  */
 
 #define BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS             \
-  SU2_OMP_BARRIER                                    \
+  SU2_OMP_BARRIER;                                   \
   if (omp_in_parallel()) AD::StartNoSharedReading(); \
   SU2_OMP_MASTER
 
 #define END_SU2_OMP_SAFE_GLOBAL_ACCESS             \
   END_SU2_OMP_MASTER                               \
   if (omp_in_parallel()) AD::EndNoSharedReading(); \
-  SU2_OMP_BARRIER
+  SU2_OMP_BARRIER;
 
 #define SU2_OMP_SAFE_GLOBAL_ACCESS(...) BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS{__VA_ARGS__} END_SU2_OMP_SAFE_GLOBAL_ACCESS
 

Common/src/CConfig.cpp

@@ -7304,7 +7304,7 @@ void CConfig::SetOutput(SU2_COMPONENT val_software, unsigned short val_izone) {
   if (nMarker_Inlet_Species != 0) {
     BoundaryTable << "Species Inlet boundary";
     for (iMarker_Inlet = 0; iMarker_Inlet < nMarker_Inlet_Species; iMarker_Inlet++) {
-      BoundaryTable << Marker_Inlet[iMarker_Inlet];
+      BoundaryTable << Marker_Inlet_Species[iMarker_Inlet];
       if (iMarker_Inlet < nMarker_Inlet_Species-1)  BoundaryTable << " ";
     }
     BoundaryTable.PrintFooter();

SU2_CFD/include/output/COutput.hpp

@@ -806,6 +806,11 @@ class COutput {
    */
   void SetCommonHistoryFields();
 
+  /*!
+   * \brief Request the history fields common for all solvers.
+   */
+  void RequestCommonHistory(bool dynamic);
+
   /*!
    * \brief Parses user-defined outputs.
    */

SU2_CFD/src/drivers/CDiscAdjMultizoneDriver.cpp

@@ -781,7 +781,9 @@ void CDiscAdjMultizoneDriver::SetAdjObjFunction() {
   }
   if (rank == MASTER_NODE) {
     AD::ResizeAdjoints();
+    AD::BeginUseAdjoints();
     AD::SetDerivative(ObjFunc_Index, SU2_TYPE::GetValue(seeding));
+    AD::EndUseAdjoints();
   }
 }
 

SU2_CFD/src/iteration/CDiscAdjFEAIteration.cpp

@@ -275,7 +275,9 @@ void CDiscAdjFEAIteration::InitializeAdjoint(CSolver***** solver, CGeometry****
   /*--- Initialize the adjoints the conservative variables ---*/
 
   AD::ResizeAdjoints();
+  AD::BeginUseAdjoints();
   solver[iZone][iInst][MESH_0][ADJFEA_SOL]->SetAdjoint_Output(geometry[iZone][iInst][MESH_0], config[iZone]);
+  AD::EndUseAdjoints();
 }
 
 bool CDiscAdjFEAIteration::Monitor(COutput* output, CIntegration**** integration, CGeometry**** geometry,

SU2_CFD/src/iteration/CDiscAdjFluidIteration.cpp

@@ -361,6 +361,7 @@ void CDiscAdjFluidIteration::InitializeAdjoint(CSolver***** solver, CGeometry***
   auto geometry0 = geometry[iZone][iInst][MESH_0];
 
   AD::ResizeAdjoints();
+  AD::BeginUseAdjoints();
 
   SU2_OMP_PARALLEL_(if(solvers0[ADJFLOW_SOL]->GetHasHybridParallel())) {
 
@@ -392,6 +393,8 @@ void CDiscAdjFluidIteration::InitializeAdjoint(CSolver***** solver, CGeometry***
 
   }
   END_SU2_OMP_PARALLEL
+
+  AD::EndUseAdjoints();
 }
 
 void CDiscAdjFluidIteration::RegisterInput(CSolver***** solver, CGeometry**** geometry, CConfig** config,

SU2_CFD/src/iteration/CDiscAdjHeatIteration.cpp

@@ -159,7 +159,9 @@ void CDiscAdjHeatIteration::InitializeAdjoint(CSolver***** solver, CGeometry****
   /*--- Initialize the adjoints the solution variables ---*/
 
   AD::ResizeAdjoints();
+  AD::BeginUseAdjoints();
   solver[iZone][iInst][MESH_0][ADJHEAT_SOL]->SetAdjoint_Output(geometry[iZone][iInst][MESH_0], config[iZone]);
+  AD::EndUseAdjoints();
 }
 
 void CDiscAdjHeatIteration::RegisterInput(CSolver***** solver, CGeometry**** geometry, CConfig** config,

SU2_CFD/src/output/CAdjFlowCompOutput.cpp

@@ -36,8 +36,7 @@ CAdjFlowCompOutput::CAdjFlowCompOutput(CConfig *config, unsigned short nDim) : C
   /*--- Set the default history fields if nothing is set in the config file ---*/
 
   if (nRequestedHistoryFields == 0) {
-    requestedHistoryFields.emplace_back("ITER");
-    requestedHistoryFields.emplace_back("RMS_RES");
+    RequestCommonHistory(config->GetTime_Domain());
     requestedHistoryFields.emplace_back("SENSITIVITY");
     nRequestedHistoryFields = requestedHistoryFields.size();
   }