Chore in discrete adjoint bits #1257

TobiKattmann · 2021-04-07T12:46:37Z

Hi all,

As I am stepping through DA cases with my debugger I am cleaning some things left and right. No major changes.

making local vars const when possible
moving the config->GetBool directly to the conditional instead of making it a var and using it 1 time
removing dead code
adding some comments
some typos fixed

PR Checklist

I am submitting my contribution to the develop branch.
My contribution generates no new compiler warnings (try with the '-Wall -Wextra -Wno-unused-parameter -Wno-empty-body' compiler flags, or simply --warnlevel=2 when using meson).
My contribution is commented and consistent with SU2 style.
I have added a test case that demonstrates my contribution, if necessary.
I have updated appropriate documentation (Tutorials, Docs Page, config_template.cpp) , if necessary.

Making vars const. Moving declaration of boolean or loop vars directly to where they are used. Some typos, line breaks fixed.

…functions.

…oint

TobiKattmann · 2021-04-07T17:42:14Z

SU2_CFD/src/solvers/CDiscAdjSolver.cpp

@@ -376,7 +371,7 @@ void CDiscAdjSolver::ExtractAdjoint_Solution(CGeometry *geometry, CConfig *confi

  if (time_n_needed) {
    SU2_OMP_FOR_STAT(omp_chunk_size)
-    for (auto iPoint = 0u; iPoint < nPoint; iPoint++) {
+    for (auto iPoint = 0ul; iPoint < nPoint; iPoint++) {


this iPoint change from 0u to 0ul is less of a necessity then rather a consistency thing

…oint

This reverts commit d662ce0.

This reverts commit e28e7bb.

…oint

SU2_CFD/include/variables/CDiscAdjVariable.hpp

SU2_CFD/src/drivers/CDiscAdjMultizoneDriver.cpp

…oint

TobiKattmann · 2021-05-05T19:12:36Z

SU2_CFD/src/drivers/CMultizoneDriver.cpp

-    StopCalc = FinalTimeReached || MaxIterationsReached;
+    return (FinalTimeReached || MaxIterationsReached);
  }

-  return StopCalc;


StopCalc is class data and was returned to itself, so I made the function to not use that var

TobiKattmann · 2021-05-05T21:06:32Z

SU2_CFD/src/drivers/CMultizoneDriver.cpp

-    /*--- Read the target pressure for inverse design. ---------------------------------------------*/
-    /*--- TODO: This routine should be taken out of output, and made general for multiple zones. ---*/
-//    if (config_container[iZone]->GetInvDesign_Cp() == YES)
-//      output[iZone]->SetCp_InverseDesign(solver_container[iZone][INST_0][MESH_0][FLOW_SOL],


I removed all the inverse design stuff that was commented out in multiple places

TobiKattmann · 2021-05-05T21:08:09Z

SU2_CFD/src/iteration/CDiscAdjHeatIteration.cpp


  /*--- For the unsteady adjoint, load direct solutions from restart files. ---*/

  if (config[val_iZone]->GetTime_Marching() != TIME_MARCHING::STEADY) {
-    Direct_Iter = SU2_TYPE::Int(config[val_iZone]->GetUnst_AdjointIter()) - SU2_TYPE::Int(TimeIter) - 2;
+    const int Direct_Iter = SU2_TYPE::Int(config[val_iZone]->GetUnst_AdjointIter()) - SU2_TYPE::Int(TimeIter) - 2 + dual_time;


now consistent with CDiscAdjFluidIteration.cpp

Fun fact, SU2_TYPE::Int implies a cast to su2double, followed cast to int, yeyy

what are those casts via SU2_TYPE methods even for

TobiKattmann · 2021-05-05T21:28:29Z

@cvencro Merging this will most likely result in some conflicts with #1260 which are hopefully easy to resolve as it is mostly stylistic stuff without any real changes to the code. @pcarruscag I reverted CDiscADjVariable.hpp/cpp and will readd the briefs in #1260

pcarruscag · 2021-05-05T22:55:49Z

SU2_CFD/src/drivers/CDriver.cpp

-    MDOFs         += (su2double)DOFsPerPoint*(su2double)geometry_container[iZone][INST_0][MESH_0]->GetGlobal_nPoint()/(1.0e6);
-    MDOFsDomain   += (su2double)DOFsPerPoint*(su2double)geometry_container[iZone][INST_0][MESH_0]->GetGlobal_nPointDomain()/(1.0e6);
+    Mpoints       += static_cast<su2double>(geometry_container[iZone][INST_0][MESH_0]->GetGlobal_nPoint())/(1.0e6);
+    MpointsDomain += static_cast<su2double>(geometry_container[iZone][INST_0][MESH_0]->GetGlobal_nPointDomain())/(1.0e6);
+    MDOFs         += static_cast<su2double>(DOFsPerPoint)*static_cast<su2double>(geometry_container[iZone][INST_0][MESH_0]->GetGlobal_nPoint())/(1.0e6);


The casts are not really needed.

pcarruscag · 2021-05-05T23:03:24Z

SU2_CFD/src/solvers/CDiscAdjSolver.cpp

    if (dual_time) {
      for (auto iVar = 0u; iVar < nVar; iVar++) {
        Solution[iVar] += nodes->GetDual_Time_Derivative(iPoint,iVar);
      }
    }
+
+    /*--- Set the adjoint values of the primal (TK::??) solution. ---*/


pcarruscag · 2021-05-05T23:03:42Z

SU2_CFD/src/solvers/CHeatSolver.cpp

-        dTdn = -(nodes->GetSolution(Point_Normal,0) - Twall)/dist_ij;
+        dTdn = -(nodes->GetTemperature(Point_Normal) - Twall)/dist_ij;


pcarruscag · 2021-05-06T08:13:53Z

SU2_CFD/src/iteration/CDiscAdjHeatIteration.cpp

-    const int Direct_Iter = SU2_TYPE::Int(config[val_iZone]->GetUnst_AdjointIter()) - SU2_TYPE::Int(TimeIter) - 2 + dual_time;
+    const int Direct_Iter = static_cast<int>(config[val_iZone]->GetUnst_AdjointIter()) - static_cast<int>(TimeIter) - 2 + dual_time;



TobiKattmann added 5 commits April 7, 2021 10:58

Remove commented out Inverse-Design code.

fbc6e06

Line breaks and mention missing comments in CDiscAdjVariable.

bf048dc

Minor cleanups in DA driver/iteration/solver.

f11964c

Making vars const. Moving declaration of boolean or loop vars directly to where they are used. Some typos, line breaks fixed.

Using static_cast in CDriver for some output.

cf9c309

Remove unused ExtractAdjoint_Geometry and G/Set_OldSolution_Geometry …

9747887

…functions.

pr-triage bot added the PR: draft label Apr 7, 2021

TobiKattmann added 2 commits April 7, 2021 16:14

Merge remote-tracking branch 'origin/develop' into chore_discrete_adj…

56fe7d4

…oint

minor build fix

0564af1

TobiKattmann added the changelog:chore label Apr 7, 2021

TobiKattmann mentioned this pull request Apr 7, 2021

Hybrid Parallel AD (Part 1/?) #1214

Merged

5 tasks

TobiKattmann added 2 commits April 7, 2021 19:20

Merge remote-tracking branch 'origin/develop' into chore_discrete_adj…

13721c3

…oint

More var declaration removed from function head.

3782885

TobiKattmann commented Apr 7, 2021

View reviewed changes

TobiKattmann and others added 17 commits April 7, 2021 19:45

minor build fix

592ba61

Merge branch 'develop' into chore_discrete_adjoint

2c925e7

Merge branch 'develop' into chore_discrete_adjoint

9d6fa20

Merge remote-tracking branch 'origin/develop' into chore_discrete_adj…

1b59033

…oint

Merge remote-tracking branch 'origin/develop' into chore_discrete_adj…

0027937

…oint

Some Var def changes.

02f6bed

Merge remote-tracking branch 'origin/develop' into chore_discrete_adj…

49013d4

…oint

Fix build error

5809597

Little changes to PR #1259 of @cvencro

1e571d6

Two remarks to PR #1268 of @bigfooted

f945eb1

Merge remote-tracking branch 'origin/develop' into chore_discrete_adj…

793101d

…oint

Move COORDs to CommonFVMOutput. Following #1266 by @pcarruscag

e28e7bb

Fix build. Add Node_Geo to CommonFVMOutput

d662ce0

Revert "Fix build. Add Node_Geo to CommonFVMOutput"

b7bf9da

This reverts commit d662ce0.

Revert "Move COORDs to CommonFVMOutput. Following #1266 by @pcarruscag"

11ae1a9

This reverts commit e28e7bb.

Merge remote-tracking branch 'origin/develop' into chore_discrete_adj…

d00346a

…oint

Clean CMultizoneDriver::Monitor

7c3ab4c

Some more comments and cleanup in discadjsolver

c1d65e7

pcarruscag reviewed May 2, 2021

View reviewed changes

SU2_CFD/include/variables/CDiscAdjVariable.hpp Outdated Show resolved Hide resolved

SU2_CFD/src/drivers/CDiscAdjMultizoneDriver.cpp Outdated Show resolved Hide resolved

TobiKattmann added 5 commits May 2, 2021 18:41

remove superfluous comments from CDiscAdjVar

90624f1

Merge remote-tracking branch 'origin/develop' into chore_discrete_adj…

30ddda9

…oint

Cleaning CDiscAdjHeatIteration a bit

14e3c74

Various smaller cleanups in DiscAdj bits

4b552b5

Revert CDiscAdjVar to develop for easy merge with #1260

07c1184

TobiKattmann commented May 5, 2021

View reviewed changes

Removing temporary comments + latest changes + revert CDiscAdjVar.cpp

c181b8e

TobiKattmann changed the title ~~[WIP] Chore in discrete adjoint bits~~ Chore in discrete adjoint bits May 5, 2021

TobiKattmann marked this pull request as ready for review May 5, 2021 21:04

pr-triage bot added PR: unreviewed and removed PR: draft labels May 5, 2021

TobiKattmann commented May 5, 2021

View reviewed changes

pcarruscag reviewed May 5, 2021

View reviewed changes

Adress PR comments: remove static-casts + minor things

d9089d3

pcarruscag approved these changes May 6, 2021

View reviewed changes

pr-triage bot added PR: reviewed-approved and removed PR: unreviewed labels May 6, 2021

Merge branch 'develop' into chore_discrete_adjoint

67354dc

pr-triage bot added PR: unreviewed and removed PR: reviewed-approved labels May 6, 2021

TobiKattmann merged commit 2782983 into develop May 6, 2021

TobiKattmann deleted the chore_discrete_adjoint branch May 6, 2021 10:35

pr-triage bot added PR: merged and removed PR: unreviewed labels May 6, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Chore in discrete adjoint bits #1257

Chore in discrete adjoint bits #1257

TobiKattmann commented Apr 7, 2021 •

edited

Loading

TobiKattmann Apr 7, 2021

TobiKattmann May 5, 2021

TobiKattmann May 5, 2021

TobiKattmann May 5, 2021 •

edited

Loading

pcarruscag May 5, 2021

TobiKattmann May 6, 2021

TobiKattmann commented May 5, 2021

pcarruscag May 5, 2021

pcarruscag May 5, 2021

TobiKattmann May 6, 2021

pcarruscag May 5, 2021

pcarruscag May 6, 2021

		dTdn = -(nodes->GetSolution(Point_Normal,0) - Twall)/dist_ij;
		dTdn = -(nodes->GetTemperature(Point_Normal) - Twall)/dist_ij;

		const int Direct_Iter = SU2_TYPE::Int(config[val_iZone]->GetUnst_AdjointIter()) - SU2_TYPE::Int(TimeIter) - 2 + dual_time;
		const int Direct_Iter = static_cast<int>(config[val_iZone]->GetUnst_AdjointIter()) - static_cast<int>(TimeIter) - 2 + dual_time;

Chore in discrete adjoint bits #1257

Chore in discrete adjoint bits #1257

Conversation

TobiKattmann commented Apr 7, 2021 • edited Loading

PR Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TobiKattmann May 5, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TobiKattmann commented May 5, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TobiKattmann commented Apr 7, 2021 •

edited

Loading

TobiKattmann May 5, 2021 •

edited

Loading