Cleaned up interface. Adjusted other Xcode projects.

Common/include/config_structure.hpp

@@ -434,6 +434,7 @@ class CConfig {
   unsigned short nParamDV;		/*!< \brief Number of parameters of the design variable. */
   string DV_Filename;      /*!< \brief Filename for providing surface positions from an external parameterization. */
   string DV_Sens_Filename;      /*!< \brief Provide a file of sensitivities from an external adjoint. */
+  unsigned short Sensitivity_FileFormat; /*!< \brief Format of the input volume sensitivity files (SU2_DOT). */
   su2double **ParamDV;				/*!< \brief Parameters of the design variable. */
   su2double **CoordFFDBox;				/*!< \brief Coordinates of the FFD boxes. */
   unsigned short **DegreeFFDBox;	/*!< \brief Degree of the FFD boxes. */
@@ -765,7 +766,7 @@ class CConfig {
   Wrt_Performance,            /*!< \brief Write the performance summary at the end of a calculation.  */
   Wrt_InletFile,                   /*!< \brief Write a template inlet profile file */
   Wrt_Slice,                   /*!< \brief Write 1D slice of a 2D cartesian solution */
-  Wrt_External_Sensitivity,   /*!< \brief Write raw sensitivities (dJ/dx) on surfaces to ASCII file. */
+  Wrt_Projected_Sensitivity,   /*!< \brief Write projected sensitivities (dJ/dx) on surfaces to ASCII file. */
   Plot_Section_Forces;       /*!< \brief Write sectional forces for specified markers. */
   unsigned short Console_Output_Verb,  /*!< \brief Level of verbosity for console output */
   Kind_Average;        /*!< \brief Particular average for the marker analyze. */
@@ -3264,10 +3265,16 @@ class CConfig {
   bool GetWrt_Slice(void);
 
   /*!
-   * \brief Get information about writing raw sensitivities on surfaces to an ASCII file with rows as x, y, z, dJ/dx, dJ/dy, dJ/dz for each vertex.
-   * \return <code>TRUE</code> means that raw sensitivities on surfaces to an ASCII file with rows as x, y, z, dJ/dx, dJ/dy, dJ/dz for each vertex will be written.
+   * \brief Get information about writing projected sensitivities on surfaces to an ASCII file with rows as x, y, z, dJ/dx, dJ/dy, dJ/dz for each vertex.
+   * \return <code>TRUE</code> means that projected sensitivities on surfaces in an ASCII file with rows as x, y, z, dJ/dx, dJ/dy, dJ/dz for each vertex will be written.
    */
-  bool GetWrt_External_Sensitivity(void);
+  bool GetWrt_Projected_Sensitivity(void);
+
+  /*!
+   * \brief Get information about the format for the input volume sensitvities.
+   * \return Format of the input volume sensitivities.
+   */
+  unsigned short GetSensitivity_Format(void);
 
   /*!
    * \brief Get information about writing sectional force files.

Common/include/config_structure.inl

@@ -1714,7 +1714,9 @@ inline void CConfig::SetWrt_InletFile(bool val_wrt_inletfile) { Wrt_InletFile =
 
 inline bool CConfig::GetWrt_Slice(void) { return Wrt_Slice; }
 
-inline bool CConfig::GetWrt_External_Sensitivity(void) { return Wrt_External_Sensitivity; }
+inline bool CConfig::GetWrt_Projected_Sensitivity(void) { return Wrt_Projected_Sensitivity; }
+
+inline unsigned short CConfig::GetSensitivity_Format(void) { return Sensitivity_FileFormat; }
 
 inline bool CConfig::GetPlot_Section_Forces(void) { return Plot_Section_Forces; }
 
@@ -2079,4 +2081,4 @@ inline unsigned short CConfig::GetEig_Val_Comp(void) {return eig_val_comp; }
 
 inline su2double CConfig::GetUQ_URLX(void) {return uq_urlx; }
 
-inline bool CConfig::GetUQ_Permute(void) { return uq_permute; }
+inline bool CConfig::GetUQ_Permute(void) { return uq_permute; }

Common/include/geometry_structure.hpp

@@ -1329,7 +1329,7 @@ class CGeometry {
    * \brief A virtual member.
    * \param config - Config
    */
-  virtual void ReadExternalSensitivity(CConfig *config);
+  virtual void ReadUnorderedSensitivity(CConfig *config);
 
   /*!
    * \brief A virtual member.
@@ -2473,10 +2473,10 @@ void UpdateTurboVertex(CConfig *config,unsigned short val_iZone, unsigned short
   void SetSensitivity(CConfig *config);
 
   /*!
-   * \brief Read the sensitivity from adjoint solution file and store it.
+   * \brief Read the sensitivity from unordered ASCII adjoint solution file and store it.
    * \param[in] config - Definition of the particular problem.
    */
-  void ReadExternalSensitivity(CConfig *config);
+  void ReadUnorderedSensitivity(CConfig *config);
 
   /*!
    * \brief Get the Sensitivity at a specific point.

Common/include/geometry_structure.inl

@@ -482,7 +482,7 @@ inline vector<vector<unsigned long> > CMultiGridGeometry::GetPlanarPoints() { re
 
 inline void CGeometry::SetSensitivity(CConfig* config) {}
 
-inline void CGeometry::ReadExternalSensitivity(CConfig* config) {}
+inline void CGeometry::ReadUnorderedSensitivity(CConfig* config) {}
 
 inline su2double CGeometry::GetSensitivity(unsigned long iPoint, unsigned short iDim) { return 0.0;}
 

Common/include/option_structure.hpp

@@ -1569,6 +1569,18 @@ static const map<string, ENUM_OUTPUT> Output_Map = CCreateMap<string, ENUM_OUTPU
 ("PARAVIEW", PARAVIEW)
 ("PARAVIEW_BINARY", PARAVIEW_BINARY);
 
+/*!
+ * \brief type of volume sensitivity file formats (inout to SU2_DOT)
+ */
+enum ENUM_SENSITIVITY {
+  NATIVE_BINARY = 1,           /*!< \brief SU2 native binary format for the volume sensitivity input. */
+  UNORDERED_ASCII = 2           /*!< \brief Unordered ASCII list (x,y,z,dJ/dx,dJ/dy/dJ/dz) format for the volume sensitivity input. */
+};
+
+static const map<string, ENUM_SENSITIVITY> Sensitivity_Map = CCreateMap<string, ENUM_SENSITIVITY>
+("NATIVE_BINARY", NATIVE_BINARY)
+("UNORDERED_ASCII", UNORDERED_ASCII);
+
 /*!
  * \brief type of jump definition
  */
@@ -1643,7 +1655,6 @@ enum ENUM_PARAM {
   FFD_TWIST_2D = 22,		     /*!< \brief Free form deformation for 3D design (camber change). */
   FFD_CONTROL_SURFACE = 23,	 /*!< \brief Free form deformation for 3D design (control surface). */
   FFD_ANGLE_OF_ATTACK = 24,   /*!< \brief Angle of attack for FFD problem. */
-  EXTERNAL_SENSITIVITY = 25, /*!< \brief External volume sensitivities input via file for surface projection. */
 
   HICKS_HENNE = 30,	         /*!< \brief Hicks-Henne bump function for airfoil deformation. */
   PARABOLIC = 31,		         /*!< \brief Parabolic airfoil definition as design variables. */
@@ -1691,7 +1702,6 @@ static const map<string, ENUM_PARAM> Param_Map = CCreateMap<string, ENUM_PARAM>
 ("PARABOLIC", PARABOLIC)
 ("AIRFOIL", AIRFOIL)
 ("SURFACE_FILE", SURFACE_FILE)
-("EXTERNAL_SENSITIVITY", EXTERNAL_SENSITIVITY)
 ("NO_DEFORMATION", NO_DEFORMATION)
 ("CST", CST)
 ("ELECTRIC_FIELD", DV_EFIELD)
@@ -2766,7 +2776,6 @@ class COptionDVParam : public COptionBase {
         case FFD_THICKNESS:        nParamDV = 3; break;
         case FFD_ANGLE_OF_ATTACK:  nParamDV = 2; break;
         case SURFACE_FILE:         nParamDV = 0; break;
-        case EXTERNAL_SENSITIVITY: nParamDV = 0; break;
         case DV_EFIELD:            nParamDV = 2; break;
         case DV_YOUNG:             nParamDV = 0; break;
         case DV_POISSON:           nParamDV = 0; break;

Common/src/config_structure.cpp

@@ -1688,8 +1688,6 @@ void CConfig::SetConfig_Options(unsigned short val_iZone, unsigned short val_nZo
   addBoolOption("WRT_PERFORMANCE", Wrt_Performance, false);
     /* DESCRIPTION: Output a 1D slice of a 2D cartesian solution \ingroup Config*/
   addBoolOption("WRT_SLICE", Wrt_Slice, false);
-  /* DESCRIPTION: Write raw sensitivities (dJ/dx) on surfaces to ASCII file. \ingroup Config*/
-  addBoolOption("WRT_EXTERNAL_SENSITIVITY", Wrt_External_Sensitivity, false);
   /*!\brief MARKER_ANALYZE_AVERAGE
    *  \n DESCRIPTION: Output averaged flow values on specified analyze marker.
    *  Options: AREA, MASSFLUX
@@ -1871,8 +1869,10 @@ void CConfig::SetConfig_Options(unsigned short val_iZone, unsigned short val_nZo
   addDVValueOption("DV_VALUE", nDV_Value, DV_Value, nDV, ParamDV, Design_Variable);
   /* DESCRIPTION: Provide a file of surface positions from an external parameterization. */
   addStringOption("DV_FILENAME", DV_Filename, string("surface_positions.dat"));
-  /* DESCRIPTION: Provide a file of sensitivities from an external adjoint as an ASCII file with rows of x, y, z, dJ/dx, dJ/dy, dJ/dz for each grid point. */
-  addStringOption("DV_SENS_FILENAME", DV_Sens_Filename, string("external_sens.dat"));
+  /* DESCRIPTION: File of sensitivities as an ASCII file with rows of x, y, z, dJ/dx, dJ/dy, dJ/dz for each grid point (can be volume or surface). */
+  addStringOption("DV_SENS_FILENAME", DV_Sens_Filename, string("surface_sens.dat"));
+  /*!\brief OUTPUT_FORMAT \n DESCRIPTION: I/O format for output plots. \n OPTIONS: see \link Output_Map \endlink \n DEFAULT: TECPLOT \ingroup Config */
+  addEnumOption("DV_SENSITIVITY_FORMAT", Sensitivity_FileFormat, Sensitivity_Map, NATIVE_BINARY);
 	/* DESCRIPTION: Hold the grid fixed in a region */
   addBoolOption("HOLD_GRID_FIXED", Hold_GridFixed, false);
 	default_grid_fix[0] = -1E15; default_grid_fix[1] = -1E15; default_grid_fix[2] = -1E15;
@@ -4291,11 +4291,12 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
     }
   }
 
-  /*--- If we are executing SU2_DOT in external sensitivity mode, then
-   force the external sensitivity file to be written. ---*/
+  /*--- If we are executing SU2_DOT in surface file mode, then
+   force the projected surface sensitivity file to be written. ---*/
 
-  if ((Kind_SU2 == SU2_DOT) && (Design_Variable[0] == EXTERNAL_SENSITIVITY)) {
-    Wrt_External_Sensitivity = true;
+  Wrt_Projected_Sensitivity = false;
+  if ((Kind_SU2 == SU2_DOT) && (Design_Variable[0] == SURFACE_FILE)) {
+    Wrt_Projected_Sensitivity = true;
   }
 
   /*--- Check the conductivity model. Deactivate the turbulent component
@@ -5311,7 +5312,6 @@ void CConfig::SetOutput(unsigned short val_software, unsigned short val_izone) {
           (Design_Variable[iDV] != SCALE_GRID) &&
           (Design_Variable[iDV] != TRANSLATE_GRID) &&
           (Design_Variable[iDV] != ROTATE_GRID) &&
-          (Design_Variable[iDV] != EXTERNAL_SENSITIVITY) &&
           (Design_Variable[iDV] != SURFACE_FILE)) {
 
         if (iDV == 0)

Common/src/geometry_structure.cpp

@@ -19114,7 +19114,7 @@ void CPhysicalGeometry::SetSensitivity(CConfig *config) {
 
 }
 
-void CPhysicalGeometry::ReadExternalSensitivity(CConfig *config) {
+void CPhysicalGeometry::ReadUnorderedSensitivity(CConfig *config) {
 
   /*--- This routine makes SU2_DOT more interoperable with other
    packages so that folks can customize their workflows. For example, one
@@ -19143,7 +19143,8 @@ void CPhysicalGeometry::ReadExternalSensitivity(CConfig *config) {
   ifstream external_file;
   ofstream sens_file;
 
-  if (rank == MASTER_NODE) cout << "Reading in external sensitivity."<< endl;
+  if (rank == MASTER_NODE)
+    cout << "Parsing unordered ASCII volume sensitivity file."<< endl;
 
   /*--- Allocate space for the sensitivity and initialize. ---*/
 
@@ -19154,12 +19155,12 @@ void CPhysicalGeometry::ReadExternalSensitivity(CConfig *config) {
     }
   }
 
-  /*--- Get the filename for the external sensitivity file input. ---*/
+  /*--- Get the filename for the unordered ASCII sensitivity file input. ---*/
 
   filename = config->GetDV_Sens_Filename();
   external_file.open(filename.data(), ios::in);
   if (external_file.fail()) {
-    SU2_MPI::Error(string("There is no external sensitivity file ") +
+    SU2_MPI::Error(string("There is no unordered ASCII sensitivity file ") +
                    filename, CURRENT_FUNCTION);
   }
 
@@ -19185,7 +19186,7 @@ void CPhysicalGeometry::ReadExternalSensitivity(CConfig *config) {
 
   /*--- Loop over all interior mesh nodes owned by this rank and find the
    matching point with minimum distance. Once we have the match, store the
-   external sensitivity from the file for that node. ---*/
+   sensitivities from the file for that node. ---*/
 
   if (VertexADT.IsEmpty()) {
 
@@ -19222,7 +19223,7 @@ void CPhysicalGeometry::ReadExternalSensitivity(CConfig *config) {
 
         if (rankID == rank) {
 
-          /*--- Store external sensitivity at the matched local node. ---*/
+          /*--- Store the sensitivities at the matched local node. ---*/
 
           for (iDim = 0; iDim < nDim; iDim++)
             Sensitivity[pointID*nDim+iDim] = Sens_External[iDim];

SU2_CFD/include/output_structure.hpp

@@ -654,7 +654,7 @@ class COutput {
    * \param[in] val_iZone - Current zone.
    * \param[in] val_nZone - Total number of zones.
    */
-  void WriteExternalSensitivity(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone);
+  void WriteProjectedSensitivity(CConfig *config, CGeometry *geometry, unsigned short val_iZone, unsigned short val_nZone);
 
   /*!
    * \brief Write the nodal coordinates and connectivity to a Tecplot binary mesh file.

SU2_CFD/src/output_structure.cpp

@@ -8633,8 +8633,8 @@ void COutput::SetBaselineResult_Files(CSolver ***solver, CGeometry ***geometry,
 
         }
 
-        if (config[iZone]->GetWrt_External_Sensitivity()) {
-          WriteExternalSensitivity(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
+        if (config[iZone]->GetWrt_Projected_Sensitivity()) {
+          WriteProjectedSensitivity(config[iZone], geometry[iZone][iInst], iZone, val_nZone);
         }
 
         if (FileFormat == TECPLOT_BINARY) {

SU2_CFD/src/output_su2.cpp

@@ -312,10 +312,10 @@ void COutput::WriteCoordinates_Binary(CConfig *config, CGeometry *geometry, unsi
 
 }
 
-void COutput::WriteExternalSensitivity(CConfig *config,
-                                       CGeometry *geometry,
-                                       unsigned short val_iZone,
-                                       unsigned short val_nZone) {
+void COutput::WriteProjectedSensitivity(CConfig *config,
+                                        CGeometry *geometry,
+                                        unsigned short val_iZone,
+                                        unsigned short val_nZone) {
 
   unsigned short iVar;
   unsigned long iPoint, iElem, iNode;
@@ -325,9 +325,9 @@ void COutput::WriteExternalSensitivity(CConfig *config,
 
   filename = config->GetDV_Sens_Filename();
 
-  /*--- Open external sensitivity file. Note that we are overwriting the
+  /*--- Open projected sensitivity file. Note that we are overwriting the
    volume sensitivity file that was the original input for projection,
-   if this is executed in EXTERNAL_SENSITIVITY mode. ---*/
+   if DV_SENSITIVITY_FORMAT= UNORDERED_ASCII. ---*/
 
   ofstream Sens_File;
   Sens_File.open(filename.c_str(), ios::out);

SU2_DOT/src/SU2_DOT.cpp

@@ -273,8 +273,8 @@ int main(int argc, char *argv[]) {
       grid_movement[iZone] = new CVolumetricMovement(geometry_container[iZone][INST_0], config_container[iZone]);
 
       /*--- Read in sensitivities from file. ---*/
-      if (config_container[ZONE_0]->GetDesign_Variable(0) == EXTERNAL_SENSITIVITY)
-        geometry_container[iZone][INST_0]->ReadExternalSensitivity(config_container[iZone]);
+      if (config_container[ZONE_0]->GetSensitivity_Format() == UNORDERED_ASCII)
+        geometry_container[iZone][INST_0]->ReadUnorderedSensitivity(config_container[iZone]);
       else
         geometry_container[iZone][INST_0]->SetSensitivity(config_container[iZone]);
 
@@ -292,7 +292,8 @@ int main(int argc, char *argv[]) {
      output->SetSensitivity_Files(geometry_container, config_container, nZone);
    }
 
-   if (config_container[ZONE_0]->GetDesign_Variable(0) != NONE){
+   if ((config_container[ZONE_0]->GetDesign_Variable(0) != NONE) &&
+       (config_container[ZONE_0]->GetDesign_Variable(0) != SURFACE_FILE)){
 
      /*--- Initialize structure to store the gradient ---*/
 

SU2_IDE/Xcode/SU2_CFD.xcodeproj/project.pbxproj

@@ -118,7 +118,7 @@
 		0530E56D17FDF7C600733CE8 /* variable_direct_elasticity.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = variable_direct_elasticity.cpp; path = ../../SU2_CFD/src/variable_direct_elasticity.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		0530E56F17FDF7D300733CE8 /* numerics_direct_elasticity.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = numerics_direct_elasticity.cpp; path = ../../SU2_CFD/src/numerics_direct_elasticity.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		0541ABEE1370F5A6002D668B /* SU2_CFD */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = SU2_CFD; sourceTree = BUILT_PRODUCTS_DIR; };
-		05755F091A54AC4500600019 /* output_su2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = output_su2.cpp; path = ../../SU2_CFD/src/output_su2.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
+		05755F091A54AC4500600019 /* output_su2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = output_su2.cpp; path = ../../SU2_CFD/src/output_su2.cpp; sourceTree = "<group>"; };
 		05812D7A1F2787540086FCB0 /* output_physics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = output_physics.cpp; path = ../../SU2_CFD/src/output_physics.cpp; sourceTree = "<group>"; };
 		05812D7C1F2787B60086FCB0 /* output_structure.inl */ = {isa = PBXFileReference; lastKnownFileType = text; name = output_structure.inl; path = ../../SU2_CFD/include/output_structure.inl; sourceTree = "<group>"; };
 		05AF9F1D1BE1E1830062E1F1 /* element_linear.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = element_linear.cpp; path = ../../Common/src/element_linear.cpp; sourceTree = "<group>"; };
@@ -178,7 +178,7 @@
 		05E6DBD417EB62A100FA1F7E /* numerics_template.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = numerics_template.cpp; path = ../../SU2_CFD/src/numerics_template.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		05E6DBD517EB62A100FA1F7E /* output_cgns.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = output_cgns.cpp; path = ../../SU2_CFD/src/output_cgns.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		05E6DBD617EB62A100FA1F7E /* output_paraview.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = output_paraview.cpp; path = ../../SU2_CFD/src/output_paraview.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
-		05E6DBD717EB62A100FA1F7E /* output_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = output_structure.cpp; path = ../../SU2_CFD/src/output_structure.cpp; sourceTree = "<group>"; };
+		05E6DBD717EB62A100FA1F7E /* output_structure.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = output_structure.cpp; path = ../../SU2_CFD/src/output_structure.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		05E6DBD817EB62A100FA1F7E /* output_tecplot.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = output_tecplot.cpp; path = ../../SU2_CFD/src/output_tecplot.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		05E6DBDA17EB62A100FA1F7E /* solver_adjoint_mean.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = solver_adjoint_mean.cpp; path = ../../SU2_CFD/src/solver_adjoint_mean.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		05E6DBDD17EB62A100FA1F7E /* solver_adjoint_turbulent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = solver_adjoint_turbulent.cpp; path = ../../SU2_CFD/src/solver_adjoint_turbulent.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };