Merge branch 'develop' into adaptive_edge_color_group_size

Author: jblueh

AUTHORS.md

@@ -71,6 +71,7 @@ Eduardo Molina
 Edwin van der Weide
 Ethan Alan Hereth
 Florian Dittmann
+Filip Hahs
 Francesco Poli
 Francisco D. Palacios
 Gaurav Bansal

Common/include/CConfig.hpp

@@ -5911,6 +5911,15 @@ class CConfig {
    */
   su2double GetMarkerTranslationRate(unsigned short iMarkerMoving, unsigned short iDim) const { return MarkerTranslation_Rate[3*iMarkerMoving + iDim];}
 
+  /*!
+   * \brief Set the translation rate of the marker.
+   * \param[in] iDim - spatial component
+   * \param[in] val - translational velocity
+   */
+  void SetMarkerTranslationRate(unsigned short iMarkerMoving, unsigned short iDim, su2double val) {
+    MarkerTranslation_Rate[3 * iMarkerMoving + iDim] = val;
+  }
+
   /*!
    * \brief Get the rotation rate of the mesh.
    * \param[in] iDim - spatial component
@@ -5934,6 +5943,16 @@ class CConfig {
    */
   su2double GetMarkerRotationRate(unsigned short iMarkerMoving, unsigned short iDim) const { return MarkerRotation_Rate[3*iMarkerMoving + iDim];}
 
+  /*!
+   * \brief Set the rotation rate of the marker.
+   * \param[in] iMarkerMoving -  Index of the moving marker (as specified in Marker_Moving)
+   * \param[in] iDim - spatial component
+   * \param[in] val - Rotational velocity
+   */
+  void SetMarkerRotationRate(unsigned short iMarkerMoving, unsigned short iDim, su2double val) {
+    MarkerRotation_Rate[3 * iMarkerMoving + iDim] = val;
+  }
+
   /*!
    * \brief Get the pitching rate of the mesh.
    * \param[in] iDim - spatial component

SU2_CFD/include/drivers/CDriver.hpp

@@ -536,6 +536,24 @@ class CDriver : public CDriverBase {
    */
   void SetRotationRate(passivedouble rot_x, passivedouble rot_y, passivedouble rot_z);
 
+  /*!
+   * \brief Set the moving wall marker rotation rates.
+   * \param[in] iMaker - Index of moving wall marker.
+   * \param[in] rot_x - Value of Angular velocity about x-axes.
+   * \param[in] rot_y - Value of Angular velocity about y-axes.
+   * \param[in] rot_z - Value of Angular velocity about z-axes.
+   */
+  void SetMarkerRotationRate(unsigned short iMarker, passivedouble rot_x, passivedouble rot_y, passivedouble rot_z);
+
+  /*!
+   * \brief Set the moving wall marker translation rates.
+   * \param[in] iMaker - Index of moving wall marker.
+   * \param[in] vel_x - Value of velocity along x-axis.
+   * \param[in] vel_y - Value of velocity along y-axis.
+   * \param[in] vel_z - Value of velocity along z-axis.
+   */
+  void SetMarkerTranslationRate(unsigned short iMarker, passivedouble vel_x, passivedouble vel_y, passivedouble vel_z);
+  
 /// \}
 };
 

SU2_CFD/src/iteration/CIteration.cpp

@@ -90,9 +90,11 @@ void CIteration::SetGrid_Movement(CGeometry** geometry, CSurfaceMovement* surfac
       break;
   }
 
-  if (config->GetSurface_Movement(AEROELASTIC) || config->GetSurface_Movement(AEROELASTIC_RIGID_MOTION)) {
+  if (config->GetSurface_Movement(AEROELASTIC) || config->GetSurface_Movement(AEROELASTIC_RIGID_MOTION) || config->GetSurface_Movement(MOVING_WALL)) {
     /*--- Apply rigid mesh transformation to entire grid first, if necessary ---*/
+    
     if (IntIter == 0) {
+
       if (Kind_Grid_Movement == AEROELASTIC_RIGID_MOTION) {
         if (rank == MASTER_NODE) cout << endl << " Performing rigid mesh transformation." << endl;
 
@@ -110,6 +112,11 @@ void CIteration::SetGrid_Movement(CGeometry** geometry, CSurfaceMovement* surfac
 
         grid_movement->UpdateMultiGrid(geometry, config);
       }
+      if (config->GetSurface_Movement(MOVING_WALL)) {
+        for (auto iMGlevel = 0u; iMGlevel <= config->GetnMGLevels(); iMGlevel++) {
+          geometry[iMGlevel]->SetWallVelocity(config, iMGlevel == 0u);
+        }
+      }
 
     }
 

SU2_CFD/src/python_wrapper_structure.cpp

@@ -163,3 +163,15 @@ void CDriver::SetRotationRate(passivedouble rot_x, passivedouble rot_y, passived
   main_config->SetRotation_Rate(2, rot_z);
 }
 
+void CDriver::SetMarkerRotationRate(unsigned short iMarker, passivedouble rot_x, passivedouble rot_y, passivedouble rot_z) {
+  config_container[selected_zone]->SetMarkerRotationRate(iMarker, 0, rot_x);
+  config_container[selected_zone]->SetMarkerRotationRate(iMarker, 1, rot_y);
+  config_container[selected_zone]->SetMarkerRotationRate(iMarker, 2, rot_z);
+}
+
+void CDriver::SetMarkerTranslationRate(unsigned short iMarker, passivedouble vel_x, passivedouble vel_y, passivedouble vel_z) {
+  config_container[selected_zone]->SetMarkerTranslationRate(iMarker, 0, vel_x);
+  config_container[selected_zone]->SetMarkerTranslationRate(iMarker, 1, vel_y);
+  config_container[selected_zone]->SetMarkerTranslationRate(iMarker, 2, vel_z);
+}
+

TestCases/hybrid_regression.py

@@ -436,16 +436,16 @@ def main():
     cavity.cfg_dir   = "moving_wall/cavity"
     cavity.cfg_file  = "lam_cavity.cfg"
     cavity.test_iter = 25
-    cavity.test_vals = [-5.627934, -0.164469, 0.052000, 2.547063]
+    cavity.test_vals = [-5.627868, -0.164404, 0.053310, 2.545839]
     test_list.append(cavity)
 
     # Spinning cylinder
     spinning_cylinder           = TestCase('spinning_cylinder')
     spinning_cylinder.cfg_dir   = "moving_wall/spinning_cylinder"
     spinning_cylinder.cfg_file  = "spinning_cylinder.cfg"
     spinning_cylinder.test_iter = 25
-    spinning_cylinder.test_vals         = [-8.001291, -2.607959, 1.501321, 1.488559]
-    spinning_cylinder.test_vals_aarch64 = [-8.001291, -2.607959, 1.501321, 1.488559]
+    spinning_cylinder.test_vals         = [-8.006541, -2.609759, 1.495662, 1.486341]
+    spinning_cylinder.test_vals_aarch64 = [-8.006541, -2.609759, 1.495662, 1.486341]
     test_list.append(spinning_cylinder)
 
     ######################################

TestCases/parallel_regression.py

@@ -925,15 +925,15 @@ def main():
     cavity.cfg_dir   = "moving_wall/cavity"
     cavity.cfg_file  = "lam_cavity.cfg"
     cavity.test_iter = 25
-    cavity.test_vals = [-5.611007, -0.146826, 1.113206, 1.491678]
+    cavity.test_vals = [-5.610928, -0.146749, 1.114461, 1.490381]
     test_list.append(cavity)
 
     # Spinning cylinder
     spinning_cylinder           = TestCase('spinning_cylinder')
     spinning_cylinder.cfg_dir   = "moving_wall/spinning_cylinder"
     spinning_cylinder.cfg_file  = "spinning_cylinder.cfg"
     spinning_cylinder.test_iter = 25
-    spinning_cylinder.test_vals = [-7.802803, -2.362844, 1.687705, 1.519676]
+    spinning_cylinder.test_vals = [-7.806016, -2.364954, 1.683365, 1.517059]
     test_list.append(spinning_cylinder)
 
     ######################################

TestCases/py_wrapper/rotating_cylinder/run.py

@@ -0,0 +1,19 @@
+import pysu2			            # imports the SU2 wrapped module
+from mpi4py import MPI
+import numpy as np
+
+comm = MPI.COMM_WORLD
+rank = comm.Get_rank()
+rotation_vector = np.linspace(0,20,10)
+SU2Driver = pysu2.CSinglezoneDriver("spinning_cylinder.cfg",1, comm)
+
+for i, rate in enumerate(rotation_vector):
+    SU2Driver.SetMarkerRotationRate(0,0,0,rate)
+    SU2Driver.Preprocess(i)
+    SU2Driver.Run()
+    SU2Driver.Postprocess()
+    SU2Driver.Output(i)
+    SU2Driver.Update()
+SU2Driver.Finalize()
+
+   

TestCases/py_wrapper/rotating_cylinder/spinning_cylinder.cfg

@@ -0,0 +1,115 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                              %
+% SU2 configuration file                                                       %
+% Case description: Laminar flow around a spinning cylinder                    %
+% Author: Thomas D. Economon                                                   %
+% Institution: Stanford University                                             %
+% Date: 2013.08.21                                                             %
+% File Version 7.5.1 "Blackbird"                                               %
+%                                                                              %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------%
+%
+SOLVER= NAVIER_STOKES
+KIND_TURB_MODEL= NONE
+MATH_PROBLEM= DIRECT
+RESTART_SOL= NO
+
+% ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------%
+%
+MACH_NUMBER= 0.1
+AOA= 0.0
+SIDESLIP_ANGLE= 0.0
+FREESTREAM_TEMPERATURE= 288.15
+REYNOLDS_NUMBER= 200.0
+REYNOLDS_LENGTH= 1.0
+
+% ----------------------- DYNAMIC MESH DEFINITION -----------------------------%
+%
+SURFACE_MOVEMENT= MOVING_WALL
+MACH_MOTION= 0.1
+MARKER_MOVING= ( cylinder )
+SURFACE_MOTION_ORIGIN= 0.5 0.0 0.0 
+SURFACE_ROTATION_RATE = 0.0 0.0 -199.0738
+
+% ---------------------- REFERENCE VALUE DEFINITION ---------------------------%
+%
+REF_ORIGIN_MOMENT_X = 0.00
+REF_ORIGIN_MOMENT_Y = 0.00
+REF_ORIGIN_MOMENT_Z = 0.00
+REF_LENGTH= 1.0
+REF_AREA= 1.0
+
+% -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
+%
+MARKER_HEATFLUX= ( cylinder, 0.0 )
+MARKER_FAR= ( farfield )
+MARKER_PLOTTING= ( cylinder )
+MARKER_MONITORING= ( cylinder )
+
+% ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
+%
+NUM_METHOD_GRAD= WEIGHTED_LEAST_SQUARES
+CFL_NUMBER= 100.0
+CFL_ADAPT= NO
+CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.0, 100.0 )
+ITER= 99999
+
+% ----------------------- SLOPE LIMITER DEFINITION ----------------------------%
+%
+VENKAT_LIMITER_COEFF= 0.03
+ADJ_SHARP_LIMITER_COEFF= 3.0
+REF_SHARP_EDGES= 3.0
+SENS_REMOVE_SHARP= NO
+
+% ------------------------ LINEAR SOLVER DEFINITION ---------------------------%
+%
+LINEAR_SOLVER= FGMRES
+LINEAR_SOLVER_PREC= LU_SGS
+LINEAR_SOLVER_ERROR= 1E-4
+LINEAR_SOLVER_ITER= 5
+
+% -------------------------- MULTIGRID PARAMETERS -----------------------------%
+%
+MGLEVEL= 3
+MGCYCLE= V_CYCLE
+MG_PRE_SMOOTH= ( 1, 1, 1, 1 )
+MG_POST_SMOOTH= ( 0, 0, 0, 0 )
+MG_CORRECTION_SMOOTH= ( 0, 0, 0, 0 )
+MG_DAMP_RESTRICTION= 0.5
+MG_DAMP_PROLONGATION= 0.5
+
+% -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------%
+%
+CONV_NUM_METHOD_FLOW= ROE
+MUSCL_FLOW= YES
+SLOPE_LIMITER_FLOW= NONE
+JST_SENSOR_COEFF= ( 0.5, 0.02 )
+TIME_DISCRE_FLOW= EULER_IMPLICIT
+
+% --------------------------- CONVERGENCE PARAMETERS --------------------------%
+%
+CONV_RESIDUAL_MINVAL= -15
+CONV_STARTITER= 10
+CONV_CAUCHY_ELEMS= 100
+CONV_CAUCHY_EPS= 1E-7
+
+% ------------------------- INPUT/OUTPUT INFORMATION --------------------------%
+%
+MESH_FILENAME= mesh_cylinder_lam.su2
+MESH_FORMAT= SU2
+MESH_OUT_FILENAME= mesh_out.su2
+SOLUTION_FILENAME= solution_flow.dat
+SOLUTION_ADJ_FILENAME= solution_adj.dat
+TABULAR_FORMAT= CSV
+CONV_FILENAME= history
+RESTART_FILENAME= restart_flow.dat
+RESTART_ADJ_FILENAME= restart_adj.dat
+VOLUME_FILENAME= flow
+VOLUME_ADJ_FILENAME= adjoint
+GRAD_OBJFUNC_FILENAME= of_grad.dat
+SURFACE_FILENAME= surface_flow
+SURFACE_ADJ_FILENAME= surface_adjoint
+OUTPUT_WRT_FREQ= 100
+SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)

TestCases/serial_regression.py

@@ -750,15 +750,15 @@ def main():
     cavity.cfg_dir   = "moving_wall/cavity"
     cavity.cfg_file  = "lam_cavity.cfg"
     cavity.test_iter = 25
-    cavity.test_vals = [-5.627934, -0.164470, 0.051972, 2.547039]
+    cavity.test_vals = [ -5.627868, -0.164405, 0.053283, 2.545817]
     test_list.append(cavity)
 
     # Spinning cylinder
     spinning_cylinder           = TestCase('spinning_cylinder')
     spinning_cylinder.cfg_dir   = "moving_wall/spinning_cylinder"
     spinning_cylinder.cfg_file  = "spinning_cylinder.cfg"
     spinning_cylinder.test_iter = 25
-    spinning_cylinder.test_vals = [-7.889994, -2.469385, 1.708162, 1.670039]
+    spinning_cylinder.test_vals = [-7.892807, -2.467378, 1.702819, 1.669208]
     test_list.append(spinning_cylinder)
 
     ######################################
@@ -1066,6 +1066,7 @@ def main():
     airfoilRBF.cfg_dir   = "fea_fsi/Airfoil_RBF"
     airfoilRBF.cfg_file  = "config.cfg"
     airfoilRBF.test_iter = 1
+
     airfoilRBF.test_vals = [1.000000, -2.786186, -4.977944]
     airfoilRBF.tol       = 0.0001
     airfoilRBF.multizone = True