From 5b678067ec9f660e7d08b278da8b0e244510efb6 Mon Sep 17 00:00:00 2001 From: "Josy P. Pullockara" Date: Mon, 16 Oct 2023 21:30:45 +0530 Subject: [PATCH] ActDisk_CG cleanup --- Common/include/CConfig.hpp | 16 ---------------- Common/src/CConfig.cpp | 26 -------------------------- SU2_CFD/src/solvers/CEulerSolver.cpp | 4 ---- 3 files changed, 46 deletions(-) diff --git a/Common/include/CConfig.hpp b/Common/include/CConfig.hpp index ea147f2f64d..74fc04d6f7a 100644 --- a/Common/include/CConfig.hpp +++ b/Common/include/CConfig.hpp @@ -348,7 +348,6 @@ class CConfig { su2double *ActDiskOutlet_Torque_BEM; /*!< \brief Specified outlet torque for actuator disk. */ su2double **ActDisk_PressJump, **ActDisk_TempJump, **ActDisk_Omega; /*!< \brief Specified deltas for actuator disk.*/ -//su2double **ActDisk_XCG, **ActDisk_YCG, **ActDisk_ZCG; /*!< \brief Specified CG for actuator disk.*/ su2double **ActDisk_CG[3]; /*!< \brief Specified CG for actuator disk.*/ su2double **ActDisk_RotRate; /*!< \brief Value of the Rotation Rate.*/ su2double BEM_blade_angle ; /*!< \brief Propeller blade angle.*/ @@ -6657,26 +6656,11 @@ class CConfig { */ su2double GetActDisk_PressJump(const string& val_marker, unsigned short val_index) const; -///*! -// * \brief Get the XCG of the actuator disk. -// */ -//su2double GetActDisk_XCG(string val_marker, unsigned short val_index) const; - -///*! -// * \brief Get the YCG of the actuator disk. -// */ -//su2double GetActDisk_YCG(string val_marker, unsigned short val_index) const; - -///*! -// * \brief Get the ZCG of the actuator disk. -// */ -//su2double GetActDisk_ZCG(string val_marker, unsigned short val_index) const; /*! * \brief Get the CG of the actuator disk. */ su2double GetActDisk_CG(unsigned short iDim, string val_marker, unsigned short val_index) const; - /*! * \brief Get the blade angle of the propeller. */ diff --git a/Common/src/CConfig.cpp b/Common/src/CConfig.cpp index 738a215abd1..b8489f1ff23 100644 --- a/Common/src/CConfig.cpp +++ b/Common/src/CConfig.cpp @@ -1529,7 +1529,6 @@ void CConfig::SetConfig_Options() { /*!\brief MARKER_ACTDISK_CG\n DESCRIPTION: Actuator disk with CG for blade element momentum (BEM) method. \ingroup Config*/ addActDiskOption("MARKER_ACTDISK_CG", nMarker_ActDiskInlet, nMarker_ActDiskOutlet, Marker_ActDiskInlet, Marker_ActDiskOutlet, -// ActDisk_XCG, ActDisk_YCG, ActDisk_ZCG); ActDisk_CG[0], ActDisk_CG[1], ActDisk_CG[2]); /*!\brief ACTDISK_FILENAME \n DESCRIPTION: Input file for a specified actuator disk (w/ extension) \n DEFAULT: actdiskinput.dat \ingroup Config*/ @@ -8695,31 +8694,6 @@ su2double CConfig::GetActDisk_PressJump(const string& val_marker, unsigned short return ActDisk_PressJump[iMarker_ActDisk][val_value]; } -/* -su2double CConfig::GetActDisk_XCG(string val_marker, unsigned short val_value) const { - unsigned short iMarker_ActDisk; - for (iMarker_ActDisk = 0; iMarker_ActDisk < nMarker_ActDiskInlet; iMarker_ActDisk++) - if ((Marker_ActDiskInlet[iMarker_ActDisk] == val_marker) || - (Marker_ActDiskOutlet[iMarker_ActDisk] == val_marker)) break; - return ActDisk_XCG[iMarker_ActDisk][val_value]; -} - -su2double CConfig::GetActDisk_YCG(string val_marker, unsigned short val_value) const { - unsigned short iMarker_ActDisk; - for (iMarker_ActDisk = 0; iMarker_ActDisk < nMarker_ActDiskInlet; iMarker_ActDisk++) - if ((Marker_ActDiskInlet[iMarker_ActDisk] == val_marker) || - (Marker_ActDiskOutlet[iMarker_ActDisk] == val_marker)) break; - return ActDisk_YCG[iMarker_ActDisk][val_value]; -} - -su2double CConfig::GetActDisk_ZCG(string val_marker, unsigned short val_value) const { - unsigned short iMarker_ActDisk; - for (iMarker_ActDisk = 0; iMarker_ActDisk < nMarker_ActDiskInlet; iMarker_ActDisk++) - if ((Marker_ActDiskInlet[iMarker_ActDisk] == val_marker) || - (Marker_ActDiskOutlet[iMarker_ActDisk] == val_marker)) break; - return ActDisk_ZCG[iMarker_ActDisk][val_value]; -} -*/ su2double CConfig::GetActDisk_CG(unsigned short iDim, string val_marker, unsigned short val_value) const { unsigned short iMarker_ActDisk; for (iMarker_ActDisk = 0; iMarker_ActDisk < nMarker_ActDiskInlet; iMarker_ActDisk++) diff --git a/SU2_CFD/src/solvers/CEulerSolver.cpp b/SU2_CFD/src/solvers/CEulerSolver.cpp index 8dbfd602130..829af2fe572 100644 --- a/SU2_CFD/src/solvers/CEulerSolver.cpp +++ b/SU2_CFD/src/solvers/CEulerSolver.cpp @@ -4115,7 +4115,6 @@ void CEulerSolver::SetActDisk_BEM_VLAD(CGeometry *geometry, CSolver **solver_con su2double ADBem_Axis[MAXNDIM] = {0.0}, ADBem_J = 0.0; static su2double ADBem_Omega= 0.0; -//static su2double ADBem_XCG= 0.0, ADBem_YCG=0.0, ADBem_ZCG=0.0; static su2double ADBem_CG[MAXNDIM] = {0.0, 0.0, 0.0}; /*--- BEM VLAD ---*/ @@ -4144,9 +4143,6 @@ void CEulerSolver::SetActDisk_BEM_VLAD(CGeometry *geometry, CSolver **solver_con Marker_Tag = config->GetMarker_All_TagBound(iMarker); ADBem_Omega = config->GetActDisk_Omega(Marker_Tag, 0); - //ADBem_XCG = config->GetActDisk_XCG(Marker_Tag, 0); - //ADBem_YCG = config->GetActDisk_YCG(Marker_Tag, 0); - //ADBem_ZCG = config->GetActDisk_ZCG(Marker_Tag, 0); for (iDim=0; iDim < nDim; iDim++){ ADBem_CG[iDim] = config->GetActDisk_CG(iDim, Marker_Tag, 0); }