Skip to content

Commit a426000

Browse files
committed
make omega/strain max passive
1 parent 3890998 commit a426000

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

Common/include/basic_types/ad_structure.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ FORCEINLINE unsigned long GetErrorCount(const ErrorReport& report) { return repo
750750
FORCEINLINE void SetTag(int tag) { AD::getTape().setCurTag(tag); }
751751
FORCEINLINE void ClearTagOnVariable(su2double& v) { AD::getTape().clearTagOnVariable(v); }
752752

753-
static void tagErrorCallback(int const& correctTag, int const& wrongTag, void* userData) {
753+
static void tagErrorCallback(const int& correctTag, const int& wrongTag, void* userData) {
754754
auto* report = static_cast<ErrorReport*>(userData);
755755

756756
report->ErrorCounter += 1;

SU2_CFD/include/solvers/CFVMFlowSolverBase.inl

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -646,10 +646,7 @@ void CFVMFlowSolverBase<V, R>::ComputeVorticityAndStrainMag(const CConfig& confi
646646
const su2double vy = nodes->GetVelocity(iPoint, 1);
647647
const su2double y = geometry->nodes->GetCoord(iPoint, 1);
648648
AD::StartPreacc();
649-
AD::SetPreaccIn(omegaMax);
650-
AD::SetPreaccIn(strainMax);
651649
AD::SetPreaccIn(VelocityGradient, nDim, nDim);
652-
AD::SetPreaccIn(Vorticity, 3);
653650
AD::SetPreaccIn(vy, y);
654651

655652
StrainMag(iPoint) = 0.0;
@@ -674,13 +671,11 @@ void CFVMFlowSolverBase<V, R>::ComputeVorticityAndStrainMag(const CConfig& confi
674671

675672
StrainMag(iPoint) = sqrt(2.0*StrainMag(iPoint));
676673
AD::SetPreaccOut(StrainMag(iPoint));
677-
678-
strainMax = max(strainMax, StrainMag(iPoint));
679-
AD::SetPreaccOut(strainMax);
680-
omegaMax = max(omegaMax, GeometryToolbox::Norm(3, Vorticity));
681-
AD::SetPreaccOut(omegaMax);
682-
683674
AD::EndPreacc();
675+
676+
/*--- Max is not differentiable, so we not register them for preacc. ---*/
677+
strainMax = SU2_TYPE::GetValue(max(strainMax, StrainMag(iPoint)));
678+
omegaMax = SU2_TYPE::GetValue(max(omegaMax, GeometryToolbox::Norm(3, Vorticity)));
684679
}
685680
END_SU2_OMP_FOR
686681

0 commit comments

Comments
 (0)