Merge branch 'develop' into feature_preconditioning

Author: Cristopher-Morales

Common/include/basic_types/ad_structure.hpp

@@ -52,12 +52,12 @@ inline void StartRecording() {}
  * \brief Pause the recording of the operations and involved variables.
  * If called, all operations occuring after the call will not be stored on the computational graph.
  */
-inline void PauseRecording() {}
+inline bool PauseRecording() { return false; }
 
 /*!
  * \brief Resume the recording of the operations and variables after the recording had been paused.
  */
-inline void ResumeRecording() {}
+inline void ResumeRecording(bool wasActive) { (void)wasActive; }
 
 /*!
  * \brief Stops the recording of the operations and variables.
@@ -413,9 +413,19 @@ FORCEINLINE void ResetInput(su2double& data) { data = data.getValue(); }
 
 FORCEINLINE void StartRecording() { AD::getTape().setActive(); }
 
-FORCEINLINE void PauseRecording() { AD::getTape().setPassive(); }
+FORCEINLINE bool PauseRecording() {
+  if (AD::getTape().isActive()) {
+    AD::getTape().setPassive();
+    return true;
+  }
+  return false;
+}
 
-FORCEINLINE void ResumeRecording() { AD::getTape().setActive(); }
+FORCEINLINE void ResumeRecording(bool wasActive) {
+  if (wasActive) {
+    AD::getTape().setActive();
+  }
+}
 
 FORCEINLINE void StopRecording() { AD::getTape().setPassive(); }
 

SU2_CFD/include/solvers/CFVMFlowSolverBase.inl

@@ -673,9 +673,11 @@ void CFVMFlowSolverBase<V, R>::ComputeVorticityAndStrainMag(const CConfig& confi
     AD::SetPreaccOut(StrainMag(iPoint));
     AD::EndPreacc();
 
-    /*--- Max is not differentiable, so we not register them for preacc. ---*/
-    strainMax = SU2_TYPE::GetValue(max(strainMax, StrainMag(iPoint)));
-    omegaMax = SU2_TYPE::GetValue(max(omegaMax, GeometryToolbox::Norm(3, Vorticity)));
+    /*--- The derivative with respect to strainMax and omegaMax is not required. ---*/
+    bool wa = AD::PauseRecording();
+    strainMax = max(strainMax, StrainMag(iPoint));
+    omegaMax = max(omegaMax, GeometryToolbox::Norm(3, Vorticity));
+    AD::ResumeRecording(wa);
   }
   END_SU2_OMP_FOR
 

meson.build

@@ -6,7 +6,7 @@ project('SU2', 'c', 'cpp',
         default_options: ['buildtype=release',
                           'warning_level=0',
                           'c_std=c99',
-                          'cpp_std=c++11'])
+                          'cpp_std=c++17'])
 
 fsmod = import('fs')
 if not fsmod.exists('su2preconfig.timestamp')