Merge branch 'develop'

Common/doc/docmain.hpp

@@ -2,7 +2,7 @@
  * \file docmain.hpp
  * \brief This file contains documentation for Doxygen and does not have any significance with respect to C++.
  * \author F. Palacios
- * \version 4.1.1 "Cardinal"
+ * \version 4.1.2 "Cardinal"
  *
  * SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
  *                      Dr. Thomas D. Economon ([email protected]).

Common/include/ad_structure.inl

@@ -2,29 +2,29 @@
 
 
 namespace AD{
-#ifdef CODI_REVERSE_TYPE
+#if defined CODI_REVERSE_TYPE
 
   typedef codi::DataStore CheckpointHandler;
 
   /*--- Stores the indices of the input variables (they might be overwritten) ---*/
 
-  extern std::vector<unsigned int> inputValues;
+  extern std::vector<su2double::GradientData> inputValues;
 
   /*--- Current position inside the adjoint vector ---*/
 
   extern int adjointVectorPosition;
 
   /*--- Reference to the tape ---*/
 
-  extern codi::ChunkTape<double, int>& globalTape;
+  extern su2double::TapeType& globalTape;
 
   extern bool Status;
 
   extern bool PreaccActive;
 
-  extern codi::ChunkTape<double, int>::Position StartPosition, EndPosition;
+  extern su2double::TapeType::Position StartPosition, EndPosition;
 
-  extern std::vector<unsigned int> localInputValues;
+  extern std::vector<su2double::GradientData> localInputValues;
 
   extern std::vector<su2double*> localOutputValues;
 
@@ -33,7 +33,7 @@ namespace AD{
 
   inline void RegisterOutput(su2double& data){AD::globalTape.registerOutput(data);}
 
-  inline void ResetInput(su2double &data){data.getGradientData() = 0;}
+  inline void ResetInput(su2double &data){data.getGradientData() = su2double::GradientData();}
 
   inline void StartRecording(){AD::globalTape.setActive();}
 
@@ -54,7 +54,7 @@ namespace AD{
 
   inline void SetPreaccIn(const su2double &data){
     if (PreaccActive){
-      if (data.getGradientData() != 0){
+      if (data.isActive()){
         localInputValues.push_back(data.getGradientData());
       }
     }
@@ -63,7 +63,7 @@ namespace AD{
   inline void SetPreaccIn(su2double* data, const int size){
     if (PreaccActive){
       for (unsigned short i = 0; i < size; i++){
-        if (data[i].getGradientData() != 0){
+        if (data[i].isActive()){
           localInputValues.push_back(data[i].getGradientData());
         }
       }
@@ -74,7 +74,7 @@ namespace AD{
     if (PreaccActive){
       for (unsigned short i = 0; i < size_x; i++){
         for (unsigned short j = 0; j < size_y; j++){
-          if (data[i][j].getGradientData() != 0){
+          if (data[i][j].isActive()){
             localInputValues.push_back(data[i][j].getGradientData());
           }
         }
@@ -91,7 +91,7 @@ namespace AD{
 
   inline void SetPreaccOut(su2double& data){
     if (PreaccActive){
-      if (data.getGradientData() != 0){
+      if (data.isActive()){
         localOutputValues.push_back(&data);
       }
     }
@@ -100,7 +100,7 @@ namespace AD{
   inline void SetPreaccOut(su2double* data, const int size){
     if (PreaccActive){
       for (unsigned short i = 0; i < size; i++){
-        if (data[i].getGradientData() != 0){
+        if (data[i].isActive()){
           localOutputValues.push_back(&data[i]);
         }
       }
@@ -111,7 +111,7 @@ namespace AD{
     if (PreaccActive){
       for (unsigned short i = 0; i < size_x; i++){
         for (unsigned short j = 0; j < size_y; j++){
-          if (data[i][j].getGradientData() != 0){
+          if (data[i][j].isActive()){
             localOutputValues.push_back(&data[i][j]);
           }
         }

Common/include/config_structure.hpp

@@ -3,7 +3,7 @@
  * \brief All the information about the definition of the physical problem.
  *        The subroutines and functions are in the <i>config_structure.cpp</i> file.
  * \author F. Palacios, T. Economon, B. Tracey
- * \version 4.1.1 "Cardinal"
+ * \version 4.1.2 "Cardinal"
  *
  * SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
  *                      Dr. Thomas D. Economon ([email protected]).
@@ -55,7 +55,7 @@ using namespace std;
  * \brief Main class for defining the problem; basically this class reads the configuration file, and
  *        stores all the information.
  * \author F. Palacios
- * \version 4.1.1 "Cardinal"
+ * \version 4.1.2 "Cardinal"
  */
 
 class CConfig {
@@ -430,11 +430,10 @@ class CConfig {
 	AoS;				/*!< \brief Angle of sideSlip (just external flow). */
   bool Fixed_CL_Mode;			/*!< \brief Activate fixed CL mode (external flow only). */
   su2double Target_CL;			/*!< \brief Specify a target CL instead of AoA (external flow only). */
-  su2double Damp_Fixed_CL;			/*!< \brief Damping coefficient for fixed CL mode (external flow only). */
+  su2double dCl_dAlpha;			/*!< \brief Lift curve slope for fixed CL mode (1/deg, external flow only). */
   unsigned long Iter_Fixed_CL;			/*!< \brief Iterations to re-evaluate the angle of attack (external flow only). */
   bool Update_AoA;			/*!< \brief Boolean flag for whether to update the AoA for fixed lift mode on a given iteration. */
 	su2double ChargeCoeff;		/*!< \brief Charge coefficient (just for poisson problems). */
-	su2double *U_FreeStreamND;			/*!< \brief Reference variables at the infinity, free stream values. */
 	unsigned short Cauchy_Func_Flow,	/*!< \brief Function where to apply the convergence criteria in the flow problem. */
 	Cauchy_Func_AdjFlow,				/*!< \brief Function where to apply the convergence criteria in the adjoint problem. */
 	Cauchy_Elems;						/*!< \brief Number of elements to evaluate. */
@@ -5226,10 +5225,10 @@ class CConfig {
 	su2double GetTarget_CL(void);
 
   /*!
-	 * \brief Get the value of the damping coefficient for fixed CL mode.
-	 * \return Damping coefficient for fixed CL mode.
+	 * \brief Get the value for the lift curve slope for fixed CL mode.
+	 * \return Lift curve slope for fixed CL mode.
 	 */
-	su2double GetDamp_Fixed_CL(void);
+	su2double GetdCl_dAlpha(void);
 
   /*!
    * \brief Get the value of iterations to re-evaluate the angle of attack.

Common/include/config_structure.inl

@@ -2,7 +2,7 @@
  * \file config_structure.inl
  * \brief In-Line subroutines of the <i>config_structure.hpp</i> file.
  * \author F. Palacios, T. Economon
- * \version 4.1.1 "Cardinal"
+ * \version 4.1.2 "Cardinal"
  *
  * SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
  *                      Dr. Thomas D. Economon ([email protected]).
@@ -1114,7 +1114,7 @@ inline bool CConfig::GetFixed_CL_Mode(void) { return Fixed_CL_Mode; }
 
 inline su2double CConfig::GetTarget_CL(void) {return Target_CL; }
 
-inline su2double CConfig::GetDamp_Fixed_CL(void) {return Damp_Fixed_CL; }
+inline su2double CConfig::GetdCl_dAlpha(void) {return dCl_dAlpha; }
 
 inline unsigned long CConfig::GetIter_Fixed_CL(void) {return Iter_Fixed_CL; }
 

Common/include/datatype_structure.hpp

@@ -3,7 +3,7 @@
  * \brief Headers for generalized datatypes.
  *        The subroutines and functions are in the <i>datatype_structure.cpp</i> file.
  * \author T. Albring
- * \version 4.1.1 "Cardinal"
+ * \version 4.1.2 "Cardinal"
  *
  * SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
  *                      Dr. Thomas D. Economon ([email protected]).
@@ -64,7 +64,7 @@ typedef double passivedouble;
  * \brief Namespace for defining the datatype wrapper routines; this class features as a base class for
  * type interfaces for non-primitive dataypes e.g. used by AD, complex etc.
  * \author T. Albring
- * \version 4.1.1 "Cardinal"
+ * \version 4.1.2 "Cardinal"
  */
 namespace SU2_TYPE{
   /*!

Common/include/datatype_structure.inl

@@ -2,7 +2,7 @@
  * \file datatype_structure.inl
  * \brief In-Line subroutines of the <i>datatype_structure.hpp</i> file.
  * \author T. Albring
- * \version 4.1.1 "Cardinal"
+ * \version 4.1.2 "Cardinal"
  *
  * SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
  *                      Dr. Thomas D. Economon ([email protected]).

Common/include/datatypes/codi_forward_structure.hpp

@@ -2,7 +2,7 @@
  * \file codi_forward_structure.hpp
  * \brief Header for codi forward type definition.
  * \author T. Albring
- * \version 4.1.1 "Cardinal"
+ * \version 4.1.2 "Cardinal"
  *
  * SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
  *                      Dr. Thomas D. Economon ([email protected]).

Common/include/datatypes/codi_forward_structure.inl

@@ -2,7 +2,7 @@
  * \file codi_forward_structure.inl
  * \brief Inline subroutines for <i>codi_forward_structure.hpp<i>.
  * \author T. Albring
- * \version 4.1.1 "Cardinal"
+ * \version 4.1.2 "Cardinal"
  *
  * SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
  *                      Dr. Thomas D. Economon ([email protected]).

Common/include/datatypes/codi_reverse_structure.hpp

@@ -2,7 +2,7 @@
  * \file codi_reverse_structure.hpp
  * \brief Header for codi reverse type definition.
  * \author T. Albring
- * \version 4.1.1 "Cardinal"
+ * \version 4.1.2 "Cardinal"
  *
  * SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
  *                      Dr. Thomas D. Economon ([email protected]).
@@ -33,4 +33,8 @@
 #include "codi.hpp"
 #include "tools/dataStore.hpp"
 
+#ifdef CODI_INDEX_TAPE
+typedef codi::RealReverseIndex su2double;
+#else
 typedef codi::RealReverse su2double;
+#endif

Common/include/datatypes/codi_reverse_structure.inl

@@ -2,7 +2,7 @@
  * \file codi_reverse_structure.inl
  * \brief Inline subroutines for <i>datatype_structure.hpp<i>.
  * \author T. Albring
- * \version 4.1.1 "Cardinal"
+ * \version 4.1.2 "Cardinal"
  *
  * SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
  *                      Dr. Thomas D. Economon ([email protected]).

Common/include/datatypes/complex_structure.hpp

@@ -2,7 +2,7 @@
  * \file complex_structure.hpp
  * \brief Headers for complex datatype definition.
  * \author T. Albring
- * \version 4.1.1 "Cardinal"
+ * \version 4.1.2 "Cardinal"
  *
  * SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
  *                      Dr. Thomas D. Economon ([email protected]).
@@ -43,7 +43,7 @@ inline double real(const double& r);
  * \brief Class for defining the complex datatype for complex step gradient computation.
  * Based on complexify.h by Peter Sturdza.
  * \author T. Albring
- * \version 4.1.1 "Cardinal"
+ * \version 4.1.2 "Cardinal"
  */
 
 class CComplexType : public std::complex<double> {

Common/include/datatypes/complex_structure.inl

@@ -2,7 +2,7 @@
  * \file complex_structure.inl
  * \brief In-Line subroutines of the <i>datatype_structure.hpp</i> file.
  * \author T. Albring
- * \version 4.1.1 "Cardinal"
+ * \version 4.1.2 "Cardinal"
  *
  * SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
  *                      Dr. Thomas D. Economon ([email protected]).

Common/include/datatypes/primitive_structure.hpp

@@ -2,7 +2,7 @@
  * \file primitive_structure.hpp
  * \brief Header for the primitive datatype.
  * \author T. Albring
- * \version 4.1.1 "Cardinal"
+ * \version 4.1.2 "Cardinal"
  *
  * SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
  *                      Dr. Thomas D. Economon ([email protected]).

Common/include/datatypes/primitive_structure.inl

@@ -2,7 +2,7 @@
  * \file primitive_structure.inl
  * \brief Inline subroutines for <i>datatype_structure.hpp<i>.
  * \author T. Albring
- * \version 4.1.1 "Cardinal"
+ * \version 4.1.2 "Cardinal"
  *
  * SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
  *                      Dr. Thomas D. Economon ([email protected]).

Common/include/dual_grid_structure.hpp

@@ -3,7 +3,7 @@
  * \brief Headers of the main subroutines for doing the complete dual grid structure.
  *        The subroutines and functions are in the <i>dual_grid_structure.cpp</i> file.
  * \author F. Palacios, T. Economon
- * \version 4.1.1 "Cardinal"
+ * \version 4.1.2 "Cardinal"
  *
  * SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
  *                      Dr. Thomas D. Economon ([email protected]).
@@ -48,7 +48,7 @@ using namespace std;
  * \brief Class for controlling the dual volume definition. The dual volume is compose by 
  *        three main elements: points, edges, and vertices.
  * \author F. Palacios
- * \version 4.1.1 "Cardinal"
+ * \version 4.1.2 "Cardinal"
  */
 class CDualGrid{
 protected:
@@ -65,7 +65,7 @@ class CDualGrid{
 	/*! 
 	 * \brief Destructor of the class. 
 	 */
-	~CDualGrid(void);
+	virtual ~CDualGrid(void);
 
 	/*! 
 	 * \brief A pure virtual member.
@@ -133,7 +133,7 @@ class CDualGrid{
  * \class CPoint
  * \brief Class for point definition (including control volume definition).
  * \author F. Palacios
- * \version 4.1.1 "Cardinal"
+ * \version 4.1.2 "Cardinal"
  */
 class CPoint : public CDualGrid {
 private:
@@ -740,7 +740,7 @@ class CPoint : public CDualGrid {
  * \class CEdge
  * \brief Class for defining an edge.
  * \author F. Palacios
- * \version 4.1.1 "Cardinal"
+ * \version 4.1.2 "Cardinal"
  */
 class CEdge : public CDualGrid {
 private:
@@ -877,7 +877,7 @@ class CEdge : public CDualGrid {
  * \class CVertex
  * \brief Class for vertex definition (equivalent to edges, but for the boundaries).
  * \author F. Palacios
- * \version 4.1.1 "Cardinal"
+ * \version 4.1.2 "Cardinal"
  */
 class CVertex : public CDualGrid {
 private:

Common/include/dual_grid_structure.inl

@@ -2,7 +2,7 @@
  * \file dual_grid_structure.inl
  * \brief In-Line subroutines of the <i>dual_grid_structure.hpp</i> file.
  * \author F. Palacios, T. Economon
- * \version 4.1.1 "Cardinal"
+ * \version 4.1.2 "Cardinal"
  *
  * SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
  *                      Dr. Thomas D. Economon ([email protected]).