su2code · talbring · Sep 23, 2019 · Aug 21, 2019 · Aug 21, 2019 · Aug 21, 2019
diff --git a/Common/include/dual_grid_structure.hpp b/Common/include/dual_grid_structure.hpp
@@ -152,20 +152,20 @@ class CPoint : public CDualGrid {
   Boundary,                           /*!< \brief To see if a point belong to the boundary (including MPI). */
   PhysicalBoundary,                   /*!< \brief To see if a point belong to the physical boundary (without includin MPI). */
   SolidBoundary,                      /*!< \brief To see if a point belong to the physical boundary (without includin MPI). */
-  PeriodicBoundary;                      /*!< \brief To see if a point belongs to a periodic boundary (without including MPI). */
+  PeriodicBoundary;                   /*!< \brief To see if a point belongs to a periodic boundary (without including MPI). */
   long *Vertex;                       /*!< \brief Index of the vertex that correspond which the control volume (we need one for each marker in the same node). */
   su2double *Coord,                   /*!< \brief vector with the coordinates of the node. */
-  *Coord_Old,                         /*!< \brief Old coordinates vector for geometry smoothing. */
-  *Coord_Sum,                         /*!< \brief Sum of coordinates vector for geometry smoothing. */
-  *Coord_n,                           /*!< \brief Coordinates at time n for use with dynamic meshes. */
-  *Coord_n1,                          /*!< \brief Coordinates at time n-1 for use with dynamic meshes. */
-  *Coord_p1;                          /*!< \brief Coordinates at time n+1 for use with dynamic meshes. */
+            *Coord_Old,               /*!< \brief Old coordinates vector for primal solution reloading for Disc.Adj. with dynamic grid. */
+            *Coord_Sum,               /*!< \brief Sum of coordinates vector for geometry smoothing. */
+            *Coord_n,                 /*!< \brief Coordinates at time n for use with dynamic meshes. */
+            *Coord_n1,                /*!< \brief Coordinates at time n-1 for use with dynamic meshes. */
+            *Coord_p1;                /*!< \brief Coordinates at time n+1 for use with dynamic meshes. */
   su2double *GridVel;                 /*!< \brief Velocity of the grid for dynamic mesh cases. */
   su2double **GridVel_Grad;           /*!< \brief Gradient of the grid velocity for dynamic meshes. */
   unsigned long Parent_CV;            /*!< \brief Index of the parent control volume in the agglomeration process. */
   unsigned short nChildren_CV;        /*!< \brief Number of children in the agglomeration process. */
   vector<unsigned long> Children_CV;  /*!< \brief Index of the children control volumes in the agglomeration process. */
-  bool Agglomerate_Indirect,					/*!< \brief This flag indicates if the indirect points can be agglomerated. */
+  bool Agglomerate_Indirect,          /*!< \brief This flag indicates if the indirect points can be agglomerated. */
   Agglomerate;                        /*!< \brief This flag indicates if the element has been agglomerated. */
   bool Move;                          /*!< \brief This flag indicates if the point is going to be move in the grid deformation process. */
   unsigned long color;                /*!< \brief Color of the point in the partitioning strategy. */
@@ -567,12 +567,12 @@ class CPoint : public CDualGrid {
 	su2double* GetCoord_p1(void);
 
 	/*! 
-	 * \brief Set the coordinates of the control volume at time n.
+	 * \brief Set the coordinates of the control volume at time n to the ones in <i>Coord</i>.
 	 */
 	void SetCoord_n(void);
 
 	/*! 
-	 * \brief Set the coordinates of the control volume at time n-1.
+	 * \brief Set the coordinates of the control volume at time n-1 to the ones in <i>Coord_n</i>.
 	 */
 	void SetCoord_n1(void);
 
@@ -708,6 +708,11 @@ class CPoint : public CDualGrid {
 	 * \param[in] val_coord_old - Value of the coordinates.
 	 */	
 	void SetCoord_Old(su2double *val_coord_old);
+
+	/*!
+	 * \brief Set the value of the vector <i>Coord_Old</i> to <i>Coord</i>.
+	 */
+	void SetCoord_Old(void);
 
 	/*! 
 	 * \brief Set the value of the grid velocity at the point.
@@ -718,6 +723,7 @@ class CPoint : public CDualGrid {
 
 	/*! 
 	 * \overload
+	 * \brief Set the value of the grid velocity at the point.
 	 * \param[in] val_gridvel - Value of the grid velocity.
 	 */	
 	void SetGridVel(su2double *val_gridvel);

diff --git a/Common/include/dual_grid_structure.inl b/Common/include/dual_grid_structure.inl
@@ -172,8 +172,8 @@ inline void CPoint::SetnChildren_CV (unsigned short val_nchildren_CV) {	nChildre
 inline void CPoint::SetParent_CV (unsigned long val_parent_CV) { Parent_CV = val_parent_CV; Agglomerate = true; }
 
 inline void CPoint::SetGridVel(su2double *val_gridvel) { 
-	for (unsigned short iDim = 0; iDim < nDim; iDim++)
-		GridVel[iDim] = val_gridvel[iDim];
+  for (unsigned short iDim = 0; iDim < nDim; iDim++)
+    GridVel[iDim] = val_gridvel[iDim];
 }
 
 inline void CPoint::SetVolume_n (void) { Volume[1] = Volume[0]; }
@@ -184,6 +184,11 @@ inline su2double CPoint::GetVolume_n (void) { return Volume[1]; }
 
 inline su2double CPoint::GetVolume_nM1 (void) { return Volume[2]; }
 
+inline void CPoint::SetCoord_Old (void) {
+  for (unsigned short iDim = 0; iDim < nDim; iDim++)
+    Coord_Old[iDim] = Coord[iDim];
+}
+
 inline void CPoint::SetCoord_n (void) { 
 	for (unsigned short iDim = 0; iDim < nDim; iDim++)
 		Coord_n[iDim] = Coord[iDim];

diff --git a/Common/src/config_structure.cpp b/Common/src/config_structure.cpp
@@ -4451,10 +4451,17 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
 
       Restart_Flow = false;
 
-      if (GetGrid_Movement()) {
-        SU2_MPI::Error("Dynamic mesh movement currently not supported for the discrete adjoint solver.", CURRENT_FUNCTION);
+      if (GetKind_GridMovement() != RIGID_MOTION &&
+          GetKind_GridMovement() != NO_MOVEMENT) {
+        SU2_MPI::Error(string("Dynamic mesh movement currently only supported for the discrete adjoint solver for\n") + 
+                       string("GRID_MOVEMENT = RIGID_MOTION."), CURRENT_FUNCTION);
       }
 
+      /*--- Quickfix to not trigger the error message below if SINGLEZONE_DRIVER is used.
+            Once the old driver (i.e. EXT_ITER with it) is removed, the Error conditional
+            can be changed. ---*/
+      if (SinglezoneDriver) nExtIter = Time_Iter;
+
       if (Unst_AdjointIter- long(nExtIter) < 0){
         SU2_MPI::Error(string("Invalid iteration number requested for unsteady adjoint.\n" ) +
                        string("Make sure EXT_ITER is larger or equal than UNST_ADJOINT_ITER."),

diff --git a/Common/src/dual_grid_structure.cpp b/Common/src/dual_grid_structure.cpp
@@ -137,6 +137,7 @@ CPoint::CPoint(unsigned short val_nDim, unsigned long val_globalindex, CConfig *
       Coord_p1 = new su2double[nDim];
       Coord_n  = new su2double[nDim];
       Coord_n1 = new su2double[nDim];
+      Coord_Old = new su2double[nDim];
     }
   }
 
@@ -241,6 +242,7 @@ CPoint::CPoint(su2double val_coord_0, su2double val_coord_1, unsigned long val_g
       Coord_p1 = new su2double[nDim];
       Coord_n  = new su2double[nDim];
       Coord_n1 = new su2double[nDim];
+      Coord_Old = new su2double[nDim];
       for (iDim = 0; iDim < nDim; iDim ++) {
         Coord_p1[iDim] = Coord[iDim];
         Coord_n[iDim]  = Coord[iDim];
@@ -351,6 +353,7 @@ CPoint::CPoint(su2double val_coord_0, su2double val_coord_1, su2double val_coord
       Coord_p1 = new su2double[nDim];
       Coord_n  = new su2double[nDim];
       Coord_n1 = new su2double[nDim];
+      Coord_Old = new su2double[nDim];
       for (iDim = 0; iDim < nDim; iDim ++) {
         Coord_p1[iDim] = Coord[iDim];
         Coord_n[iDim]  = Coord[iDim];

diff --git a/Common/src/geometry_structure.cpp b/Common/src/geometry_structure.cpp
@@ -13464,7 +13464,6 @@ void CPhysicalGeometry::SetSensitivity(CConfig *config) {
   bool sa  = (config->GetKind_Turb_Model() == SA)   || (config->GetKind_Turb_Model() == SA_NEG)  ||
              (config->GetKind_Turb_Model() == SA_E) || (config->GetKind_Turb_Model() == SA_COMP) ||
              (config->GetKind_Turb_Model() == SA_E_COMP);
-  bool grid_movement = config->GetGrid_Movement();
   bool frozen_visc = config->GetFrozen_Visc_Disc();
   unsigned short Kind_Solver = config->GetKind_Solver();
   bool flow = ((Kind_Solver == DISC_ADJ_EULER)          ||
@@ -13499,7 +13498,6 @@ void CPhysicalGeometry::SetSensitivity(CConfig *config) {
     skipVar += skipMult*(nDim+2);
     if (sst && !frozen_visc) { skipVar += skipMult*2;}
     if (sa && !frozen_visc)  { skipVar += skipMult*1;}
-    if (grid_movement)       { skipVar += nDim;}
   }
   else if (Kind_Solver == DISC_ADJ_HEAT) {
     skipVar += 1;

diff --git a/Common/src/grid_movement_structure.cpp b/Common/src/grid_movement_structure.cpp
@@ -1904,7 +1904,7 @@ void CVolumetricMovement::Rigid_Rotation(CGeometry *geometry, CConfig *config,
   su2double dtheta, dphi, dpsi, cosTheta, sinTheta;
   su2double cosPhi, sinPhi, cosPsi, sinPsi;
   bool harmonic_balance = (config->GetUnsteady_Simulation() == HARMONIC_BALANCE);
-  bool adjoint = config->GetContinuous_Adjoint();
+  bool adjoint = (config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint());
 
 
   /*--- Problem dimension and physical time step ---*/
@@ -2067,7 +2067,7 @@ void CVolumetricMovement::Rigid_Pitching(CGeometry *geometry, CConfig *config, u
   unsigned short nDim = geometry->GetnDim();
   unsigned long iPoint;
   bool harmonic_balance = (config->GetUnsteady_Simulation() == HARMONIC_BALANCE);
-  bool adjoint = config->GetContinuous_Adjoint();
+  bool adjoint = (config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint());
 
 
   /*--- Retrieve values from the config file ---*/
@@ -2214,7 +2214,7 @@ void CVolumetricMovement::Rigid_Plunging(CGeometry *geometry, CConfig *config, u
   unsigned short iDim, nDim = geometry->GetnDim();
   unsigned long iPoint;
   bool harmonic_balance = (config->GetUnsteady_Simulation() == HARMONIC_BALANCE);
-  bool adjoint = config->GetContinuous_Adjoint();
+  bool adjoint = (config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint());
 
 
   /*--- Retrieve values from the config file ---*/
@@ -2346,7 +2346,7 @@ void CVolumetricMovement::Rigid_Translation(CGeometry *geometry, CConfig *config
   unsigned short iDim, nDim = geometry->GetnDim();
   unsigned long iPoint;
   bool harmonic_balance = (config->GetUnsteady_Simulation() == HARMONIC_BALANCE);
-  bool adjoint = config->GetContinuous_Adjoint();
+  bool adjoint = (config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint());
 
 
   /*--- Retrieve values from the config file ---*/
@@ -6347,7 +6347,7 @@ void CSurfaceMovement::SetBoundary_Flutter3D(CGeometry *geometry, CConfig *confi
   su2double time_new, time_old;
   su2double Omega[3], Ampl[3];
   su2double DEG2RAD = PI_NUMBER/180.0;
-  bool adjoint = config->GetContinuous_Adjoint();
+  bool adjoint = (config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint());
   unsigned short iDim = 0;
 
   /*--- Retrieve values from the config file ---*/
@@ -6441,7 +6441,7 @@ void CSurfaceMovement::SetExternal_Deformation(CGeometry *geometry, CConfig *con
   string DV_Filename, UnstExt, text_line;
   ifstream surface_positions;
   bool unsteady = config->GetUnsteady_Simulation();
-  bool adjoint = config->GetContinuous_Adjoint();
+  bool adjoint = (config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint());
 
   /*--- Load stuff from config ---*/
 

diff --git a/SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp b/SU2_CFD/src/drivers/CDiscAdjSinglezoneDriver.cpp
@@ -152,18 +152,6 @@ void CDiscAdjSinglezoneDriver::Run() {
     if(!config->GetTime_Domain() && (MainVariables == FLOW_CONS_VARS))
       config->SetExtIter(Adjoint_Iter);
 
-    /*--- Secondary sensitivities must be computed with a certain frequency. ---*/
-    /*--- It is also done at the beginning so all memory gets allocated.     ---*/
-    if ((Adjoint_Iter % config->GetWrt_Sol_Freq() == 0) && (SecondaryVariables != NONE)){
-
-      /*--- Computes secondary sensitivities ---*/
-      SecondaryRecording();
-
-      /*--- Recompute main sensitivities ---*/
-      MainRecording();
-
-    }
-
     iteration->InitializeAdjoint(solver_container, geometry_container, config_container, ZONE_0, INST_0);
 
     /*--- Initialize the adjoint of the objective function with 1.0. ---*/
@@ -201,29 +189,24 @@ void CDiscAdjSinglezoneDriver::Run() {
 
 void CDiscAdjSinglezoneDriver::Postprocess() {
 
+  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 :
 
+      /*--- Compute the geometrical sensitivities ---*/
+      SecondaryRecording();
+      break;
 
-  if (config->GetKind_Solver() == DISC_ADJ_EULER ||
-      config->GetKind_Solver() == DISC_ADJ_NAVIER_STOKES ||
-      config->GetKind_Solver() == DISC_ADJ_RANS ||
-      config->GetKind_Solver() == DISC_ADJ_INC_EULER ||
-      config->GetKind_Solver() == DISC_ADJ_INC_NAVIER_STOKES ||
-      config->GetKind_Solver() == DISC_ADJ_INC_RANS){
-
-    /*--- Compute the geometrical sensitivities ---*/
-    SecondaryRecording();
-
-  }
-
-  if (config->GetKind_Solver() == DISC_ADJ_FEM){
-
-    /*--- Apply the boundary condition to clamped nodes ---*/
-    iteration->Postprocess(output,integration_container,geometry_container,solver_container,numerics_container,
-                           config_container,surface_movement,grid_movement,FFDBox,ZONE_0,INST_0);
+    case DISC_ADJ_FEM :
 
-    RecordingState = NONE;
+      /*--- Apply the boundary condition to clamped nodes ---*/
+      iteration->Postprocess(output,integration_container,geometry_container,solver_container,numerics_container,
+                             config_container,surface_movement,grid_movement,FFDBox,ZONE_0,INST_0);
 
-  }
+      RecordingState = NONE;
+      break;
+  }//switch
 
 }
 

diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp
@@ -3831,10 +3831,12 @@ void CDriver::StartSolver(){
     PreprocessExtIter(ExtIter);
 
     /*--- Perform a dynamic mesh update if required. ---*/
-
-      if (!fem_solver && !(config_container[ZONE_0]->GetGrid_Movement() && config_container[ZONE_0]->GetDiscrete_Adjoint())) {
-        DynamicMeshUpdate(ExtIter);
-      }
+    /*--- For the Disc.Adj. of a case with (rigidly) moving grid, the appropriate
+          mesh cordinates are read from the restart files. ---*/
+    if (!fem_solver &&
+        !(config_container[ZONE_0]->GetGrid_Movement() && config_container[ZONE_0]->GetDiscrete_Adjoint())) {
+      DynamicMeshUpdate(ExtIter);
+    }
 
     /*--- Run a single iteration of the problem (fluid, elasticity, heat, ...). ---*/
 

diff --git a/SU2_CFD/src/drivers/CSinglezoneDriver.cpp b/SU2_CFD/src/drivers/CSinglezoneDriver.cpp
@@ -155,8 +155,10 @@ void CSinglezoneDriver::Preprocess(unsigned long TimeIter) {
         numerics_container, config_container, surface_movement, grid_movement, FFDBox, ZONE_0, INST_0);
 
   /*--- Perform a dynamic mesh update if required. ---*/
-
-  DynamicMeshUpdate(TimeIter);
+  /*--- For the Disc.Adj. of a case with (rigidly) moving grid, the appropriate
+          mesh cordinates are read from the restart files. ---*/
+  if (!(config_container[ZONE_0]->GetGrid_Movement() && config_container[ZONE_0]->GetDiscrete_Adjoint()))
+    DynamicMeshUpdate(TimeIter);
 
 }