Darpa ml

.gitignore

@@ -45,3 +45,7 @@ externals/autotools/share
 REVERSE/
 NORMAL/
 DIRECTDIFF/
+
+# 
+TestCases/mesh_adaptation/ONERAM6/save_ADAP
+TestCases/mesh_adaptation/ONERAM6/ADAP

Common/include/config_structure.inl

@@ -33,8 +33,16 @@
 
 inline su2double CConfig::GetCFL_AdaptParam(unsigned short val_index) { return CFL_AdaptParam[val_index]; }
 
+inline su2double CConfig::GetHard_Limiting_Param(unsigned short val_index) { return Hard_Limiting_Param[val_index]; }
+
+inline su2double CConfig::GetCFL_LocalAdaptParam(unsigned short val_index) { return CFL_LocalAdaptParam[val_index]; }
+
+inline bool CConfig::GetLocal_CFL_Adapt(void) { return Local_CFL_Adapt; }
+
 inline bool CConfig::GetCFL_Adapt(void) { return CFL_Adapt; }
 
+inline bool CConfig::GetLocal_Relax_Factor(void) { return Local_Relax_Factor; }
+
 inline void CConfig::SetInflow_Mach(unsigned short val_imarker, su2double val_fanface_mach) { Inflow_Mach[val_imarker] = val_fanface_mach; }
 
 inline void CConfig::SetInflow_Pressure(unsigned short val_imarker, su2double val_fanface_pressure) { Inflow_Pressure[val_imarker] = val_fanface_pressure; }
@@ -196,6 +204,10 @@ inline su2double CConfig::GetModVel_FreeStreamND(void) { return ModVel_FreeStrea
 
 inline su2double CConfig::GetPressure_FreeStream(void) { return Pressure_FreeStream; }
 
+inline su2double CConfig::GetSA_Production_Factor(void) { return SA_Production_Factor; }
+
+inline double CConfig::GetbetaArr(int index) { return betaArr[index]; }
+
 inline su2double CConfig::GetTemperature_ve_FreeStream(void) { return Temperature_ve_FreeStream; }
 
 inline su2double CConfig::GetPrandtl_Lam(void) { return Prandtl_Lam; }
@@ -295,6 +307,10 @@ inline su2double CConfig::GetFroude(void) { return Froude; }
 
 inline void CConfig::SetPressure_FreeStreamND(su2double val_pressure_freestreamnd) { Pressure_FreeStreamND = val_pressure_freestreamnd; }
 
+inline void CConfig::SetSA_Production_Factor(su2double val_SA_Production_Factor) { SA_Production_Factor = val_SA_Production_Factor; }
+
+inline void CConfig::SetbetaArr(double *val_betaArr){ betaArr = val_betaArr; }
+
 inline void CConfig::SetPressure_FreeStream(su2double val_pressure_freestream) { Pressure_FreeStream = val_pressure_freestream; }
 
 inline void CConfig::SetDensity_FreeStreamND(su2double val_density_freestreamnd) { Density_FreeStreamND = val_density_freestreamnd; }
@@ -417,6 +433,12 @@ inline unsigned short CConfig::GetFFD_Continuity(void) { return FFD_Continuity;
 
 inline unsigned short CConfig::GetnRKStep(void) { return nRKStep; }
 
+inline unsigned short CConfig::GetnWallTemp(void) { return nWallTemp; }
+
+inline unsigned short CConfig::GetnBSplineCoefs(void) { return nBSplineCoefs; }
+
+inline su2double CConfig::Get_WallTemp_Value(unsigned short val) { return WallTemp[val]; }
+
 inline su2double CConfig::Get_Alpha_RKStep(unsigned short val_step) { return RK_Alpha_Step[val_step]; }
 
 inline unsigned short CConfig::GetMG_PreSmooth(unsigned short val_mesh) {	
@@ -446,6 +468,8 @@ inline bool CConfig::GetWrt_Unsteady(void) { return Wrt_Unsteady; }
 
 inline bool CConfig::GetLowFidelitySim(void) { return LowFidelitySim; }
 
+inline bool CConfig::GetSaveDefFile(void) { return SaveDefFile; }
+
 inline bool CConfig::GetIonization(void) { return ionization; }
 
 inline unsigned short CConfig::GetKind_Solver(void) { return Kind_Solver; }
@@ -762,6 +786,8 @@ inline bool CConfig::GetEquivArea(void) { return EquivArea; }
 
 inline bool CConfig::GetInvDesign_Cp(void) { return InvDesign_Cp; }
 
+inline bool CConfig::GetNozzleThrust(void) { return NozzleThrust; }
+
 inline bool CConfig::GetInvDesign_HeatFlux(void) { return InvDesign_HeatFlux; }
 
 inline void CConfig::SetnMarker_All(unsigned short val_nmarker) { nMarker_All = val_nmarker; }
@@ -844,6 +870,8 @@ inline unsigned short CConfig::GetnMarker_Max(void) { return nMarker_Max; }
 
 inline unsigned short CConfig::GetnMarker_EngineInflow(void) {	return nMarker_EngineInflow; }
 
+inline unsigned short CConfig::GetnMarker_WallTemp(void) {	return nMarker_WallTemp; }
+
 inline unsigned short CConfig::GetnMarker_EngineBleed(void) {	return nMarker_EngineBleed; }
 
 inline unsigned short CConfig::GetnMarker_EngineExhaust(void) { return nMarker_EngineExhaust; }
@@ -864,6 +892,8 @@ inline unsigned short CConfig::GetnMarker_ActDisk_Outlet(void) { return nMarker_
 
 inline string CConfig::GetMesh_FileName(void) { return Mesh_FileName; }
 
+inline string CConfig::GetThrust_FileName(void) { return Thrust_FileName; }
+
 inline string CConfig::GetMesh_Out_FileName(void) { return Mesh_Out_FileName; }
 
 inline unsigned short CConfig::GetMesh_FileFormat(void) { return Mesh_FileFormat; }
@@ -946,12 +976,17 @@ inline bool CConfig::GetEngine_Intake(void) { return Engine_Intake; }
 
 inline su2double CConfig::GetDV_Value(unsigned short val_dv, unsigned short val_value) { return DV_Value[val_dv][val_value]; }
 
+inline su2double CConfig::GetBSplineCoefs_Value(unsigned short val) { return BSplineCoefs[val]; }
+inline unsigned short CConfig::GetBSplineCoefs_DV_Value(unsigned short val) { return BSplineCoefs_DV[val]; }
+
 inline void CConfig::SetDV_Value(unsigned short val_dv, unsigned short val_ind, su2double val) { DV_Value[val_dv][val_ind] = val; }
 
 inline su2double CConfig::GetOrderMagResidual(void) { return OrderMagResidual; }
 
 inline su2double CConfig::GetMinLogResidual(void) { return MinLogResidual; }
 
+inline su2double CConfig::GetMaxLogResidual(void) { return MaxLogResidual; }
+
 inline su2double CConfig::GetDamp_Engine_Inflow(void) { return Damp_Engine_Inflow; }
 
 inline su2double CConfig::GetDamp_Engine_Bleed(void) { return Damp_Engine_Bleed; }
@@ -1042,6 +1077,10 @@ inline bool CConfig::GetWrt_Limiters(void) { return Wrt_Limiters; }
 
 inline bool CConfig::GetWrt_SharpEdges(void) { return Wrt_SharpEdges; }
 
+inline bool CConfig::GetWrt_InriaMesh(void) { return Wrt_InriaMesh; }
+
+inline bool CConfig::GetMesh_Decomposition(void) { return Mesh_Decomposition; }
+
 inline bool CConfig::GetWrt_Halo(void) { return Wrt_Halo; }
 
 inline bool CConfig::GetPlot_Section_Forces(void) { return Plot_Section_Forces; }

Common/include/dual_grid_structure.hpp

@@ -164,6 +164,7 @@ class CPoint : public CDualGrid {
   bool Move;                          /*!< \brief This flag indicates if the point is going to be move in the grid deformation process. */
   unsigned short color;               /*!< \brief Color of the point in the partitioning strategy. */
   su2double Wall_Distance;            /*!< \brief Distance to the nearest wall. */
+  unsigned long Vertex_nearWall;	  /*!< \brief Global index of the wall vertex nearest to the cell >*/
   su2double SharpEdge_Distance;       /*!< \brief Distance to a sharp edge. */
   su2double Curvature;                /*!< \brief Value of the surface curvature (SU2_GEO). */
   unsigned long GlobalIndex;          /*!< \brief Global index in the parallel simulation. */
@@ -221,6 +222,9 @@ class CPoint : public CDualGrid {
 	 * \param[in] val_distance - Value of the distance.
 	 */
 	void SetWall_Distance(su2double val_distance);
+
+	void SetVertex_nearWall(unsigned long val_Vertex_nearWall);
+
 
   /*!
 	 * \brief Set the value of the distance to a sharp edge.
@@ -233,7 +237,9 @@ class CPoint : public CDualGrid {
 	 * \return Value of the distance to the nearest wall.
 	 */
 	su2double GetWall_Distance(void);
-
+
+	unsigned long GetVertex_nearWall(void);
+
   /*!
 	 * \brief Set the value of the curvature at a surface node.
 	 * \param[in] val_curvature - Value of the curvature.

Common/include/dual_grid_structure.inl

@@ -215,12 +215,16 @@ inline bool CPoint::GetDomain(void) { return Domain; }
 
 inline void CPoint::SetWall_Distance(su2double val_distance) { Wall_Distance = val_distance; }
 
+inline void CPoint::SetVertex_nearWall(unsigned long val_Vertex_nearWall) { Vertex_nearWall = val_Vertex_nearWall; }
+
 inline void CPoint::SetCurvature(su2double val_curvature) { Curvature = val_curvature; }
 
 inline void CPoint::SetSharpEdge_Distance(su2double val_distance) { SharpEdge_Distance = val_distance; }
 
 inline su2double CPoint::GetWall_Distance(void) { return Wall_Distance; }
 
+inline unsigned long CPoint::GetVertex_nearWall(void) { return Vertex_nearWall; }
+
 inline su2double CPoint::GetCurvature(void) { return Curvature; }
 
 inline su2double CPoint::GetSharpEdge_Distance(void) { return SharpEdge_Distance; }

Common/include/geometry_structure.hpp

@@ -45,6 +45,11 @@ extern "C" {
 #ifdef HAVE_CGNS
   #include "cgnslib.h"
 #endif
+#ifdef HAVE_INRIA
+extern "C" {
+#include "libmesh6.h"
+}
+#endif
 #include <string>
 #include <fstream>
 #include <sstream>
@@ -629,7 +634,14 @@ class CGeometry {
                                       vector<su2double> &Xcoord_Airfoil, vector<su2double> &Ycoord_Airfoil,
                                       vector<su2double> &Zcoord_Airfoil, vector<su2double> &Variable_Airfoil,
                                       bool original_surface, CConfig *config);
-
+
+	 /*!
+	 * \brief A virtual member.
+	 * \param[in] config - Definition of the particular problem.
+	 */
+	virtual su2double ComputeThrustNozzle(su2double XCoord, su2double *Sol, unsigned long nVar, CConfig *config) ;
+
+
   /*!
 	 * \brief A virtual member.
 	 * \param[in] config - Definition of the particular problem.
@@ -1008,6 +1020,17 @@ class CPhysicalGeometry : public CGeometry {
    */
   void Read_CGNS_Format_Parallel(CConfig *config, string val_mesh_filename, unsigned short val_iZone, unsigned short val_nZone);
 
+	/*!
+	   * \brief Reads the geometry of the grid and adjust the boundary
+	   *        conditions with the configuration file in parallel (for parmetis).
+	   * \param[in] config - Definition of the particular problem.
+	   * \param[in] val_mesh_filename - Name of the file with the grid information.
+	   * \param[in] val_format - Format of the file with the grid information.
+	   * \param[in] val_iZone - Domain to be read from the grid file.
+	   * \param[in] val_nZone - Total number of domains in the grid file.
+	   */
+	  void Read_Inria_Format_Parallel(CConfig *config, string val_mesh_filename, unsigned short val_iZone, unsigned short val_nZone);
+
 	/*! 
 	 * \brief Find repeated nodes between two elements to identify the common face.
 	 * \param[in] first_elem - Identification of the first element.

Common/include/grid_adaptation_structure.hpp

@@ -288,6 +288,11 @@ class CGridAdaptation {
 	 */		
 	void SetIndicator_FlowAdj(CGeometry *geometry, CConfig *config);
 
+	void AMG_WriteFw(CGeometry *geometry, CConfig *config);
+	void AMG_WriteWgtFw(CGeometry *geometry, CConfig *config);
+	void SetAMG_Outputs(CGeometry *geometry, CConfig *config);
+	void SetAMG_Fw(CConfig *config, CPhysicalGeometry *geo_adapt, string mesh_flowfilename);
+
 	/*! 
 	 * \brief Read the flow solution from the restart file.
 	 * \param[in] geometry - Geometrical definition of the problem.

Common/include/grid_movement_structure.hpp

@@ -1236,6 +1236,25 @@ class CSurfaceMovement : public CGridMovement {
    */
   void SetScale(CGeometry *boundary, CConfig *config, unsigned short iDV, bool ResetDef);
 
+
+
+	void uMap3(su2double *knots, su2double *coefs, su2double u, su2double *x, su2double *y,
+		su2double *dxdu, su2double *dydu, int k, int c);
+
+	int bsp_find(su2double xFind, su2double *xVec, int size);
+
+ 	void	bSplineGeo3(su2double *knots, su2double *coefs, su2double *x, su2double *y,
+		su2double *dydx, int nx, int k, int c);
+
+  /*!
+   * \brief Set a displacement for surface movement.
+   * \param[in] boundary - Geometry of the boundary.
+   * \param[in] config - Definition of the particular problem.
+   * \param[in] iDV - Index of the design variable.
+   * \param[in] ResetDef - Reset the deformation before starting a new one.
+   */
+  void SetBspline(CGeometry *boundary, CConfig *config, unsigned short iDV, bool ResetDef);
+
 	/*! 
 	 * \brief Copy the boundary coordinates to each vertex.
 	 * \param[in] geometry - Geometrical definition of the problem.

Common/include/option_structure.hpp

@@ -758,7 +758,9 @@ enum BC_TYPE {
   LOAD_DIR_BOUNDARY = 35,		/*!< \brief Boundary Load definition. */
   LOAD_SINE_BOUNDARY = 36,		/*!< \brief Sine-waveBoundary Load definition. */
   NRBC_BOUNDARY= 37,   /*!< \brief NRBC Boundary definition. */
+	THRUST_BOUNDARY = 38,         /*!< \brief Thrust boundary definition. */
   SEND_RECEIVE = 99,		/*!< \brief Boundary send-receive definition. */
+	WALL_TEMP = 40,      /*!< \brief No slip isothermal wall boundary condition. */
 };
 
 
@@ -913,7 +915,8 @@ enum ENUM_OBJECTIVE {
   AVG_TOTAL_PRESSURE = 28, 	    /*!< \brief Total Pressure objective function definition. */
   AVG_OUTLET_PRESSURE = 29,      /*!< \brief Static Pressure objective function definition. */
   MASS_FLOW_RATE = 30,           /*!< \brief Mass Flow Rate objective function definition. */
-  OUTFLOW_GENERALIZED=31          /*!<\brief Objective function defined via chain rule on primitive variable gradients. */
+  OUTFLOW_GENERALIZED=31,          /*!<\brief Objective function defined via chain rule on primitive variable gradients. */
+	THRUST_NOZZLE = 32							  /*!< \brief Nozzle objective function definition. */
 };
 
 static const map<string, ENUM_OBJECTIVE> Objective_Map = CCreateMap<string, ENUM_OBJECTIVE>
@@ -932,6 +935,7 @@ static const map<string, ENUM_OBJECTIVE> Objective_Map = CCreateMap<string, ENUM
 ("FORCE_Y", FORCE_Y_COEFFICIENT)
 ("FORCE_Z", FORCE_Z_COEFFICIENT)
 ("THRUST", THRUST_COEFFICIENT)
+("THRUST_NOZZLE", THRUST_NOZZLE)
 ("TORQUE", TORQUE_COEFFICIENT)
 ("TOTAL_HEATFLUX", TOTAL_HEATFLUX)
 ("MAXIMUM_HEATFLUX", MAXIMUM_HEATFLUX)
@@ -993,7 +997,8 @@ enum ENUM_ADAPT {
   WAKE = 12,			/*!< \brief Do a grid refinement on the wake. */
   SMOOTHING = 14,		/*!< \brief Do a grid smoothing of the geometry. */
   SUPERSONIC_SHOCK = 15,	/*!< \brief Do a grid smoothing. */
-  PERIODIC = 17			/*!< \brief Add the periodic halo cells. */
+  PERIODIC = 17,			/*!< \brief Add the periodic halo cells. */
+  AMG_ADJ = 18			/*!< \brief Add the periodic halo cells. */
 };
 static const map<string, ENUM_ADAPT> Adapt_Map = CCreateMap<string, ENUM_ADAPT>
 ("NONE", NO_ADAPT)
@@ -1008,18 +1013,22 @@ static const map<string, ENUM_ADAPT> Adapt_Map = CCreateMap<string, ENUM_ADAPT>
 ("WAKE", WAKE)
 ("SMOOTHING", SMOOTHING)
 ("SUPERSONIC_SHOCK", SUPERSONIC_SHOCK)
-("PERIODIC", PERIODIC);
+("PERIODIC", PERIODIC)
+("AMG_ADJ", AMG_ADJ);
 
 /*!
  * \brief types of input file formats
  */
 enum ENUM_INPUT {
   SU2 = 1,                       /*!< \brief SU2 input format. */
-  CGNS = 2                     /*!< \brief CGNS input format for the computational grid. */
+  CGNS = 2,                     /*!< \brief CGNS input format for the computational grid. */
+	INRIA = 3                      /*!< \brief Inria input format (.meshb) for the computational grid. */
 };
 static const map<string, ENUM_INPUT> Input_Map = CCreateMap<string, ENUM_INPUT>
 ("SU2", SU2)
-("CGNS", CGNS);
+("CGNS", CGNS)
+//("INRIA", SU2); //HACKVIC
+("INRIA", INRIA);
 
 const int CGNS_STRING_SIZE = 33;/*!< \brief Length of strings used in the CGNS format. */
 
@@ -1105,7 +1114,8 @@ enum ENUM_PARAM {
   NACA_4DIGITS = 16,	         /*!< \brief The four digits NACA airfoil family as design variables. */
   AIRFOIL = 17,		           /*!< \brief Airfoil definition as design variables. */
   SURFACE_FILE = 18,		     /*!< Nodal coordinates set using a surface file. */
-  CUSTOM = 19                /*!< 'CUSTOM' for use in external python analysis. */
+  CUSTOM = 19,                /*!< 'CUSTOM' for use in external python analysis. */
+	BSPLINECOEF = 20               /*!< control points of a BSPLINE a design variables */
 };
 static const map<string, ENUM_PARAM> Param_Map = CCreateMap<string, ENUM_PARAM>
 ("FFD_SETTING", FFD_SETTING)
@@ -1127,7 +1137,8 @@ static const map<string, ENUM_PARAM> Param_Map = CCreateMap<string, ENUM_PARAM>
 ("PARABOLIC", PARABOLIC)
 ("AIRFOIL", AIRFOIL)
 ("SURFACE_FILE", SURFACE_FILE)
-("CUSTOM",CUSTOM);
+("CUSTOM",CUSTOM)
+("BSPLINECOEF", BSPLINECOEF);
 
 /*!
  * \brief types of solvers for solving linear systems
@@ -2001,6 +2012,7 @@ class COptionDVParam : public COptionBase{
         case FFD_CAMBER: nParamDV = 3; break;
         case FFD_THICKNESS: nParamDV = 3; break;
         case SURFACE_FILE: nParamDV = 0; break;
+				case BSPLINECOEF: nParamDV = 1; break;
         case CUSTOM: nParamDV = 1; break;
         default : {
           string newstring;

Common/lib/Makefile.in

@@ -92,9 +92,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codi.m4 \
-	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/metis.m4 \
-	$(top_srcdir)/m4/parmetis.m4 $(top_srcdir)/m4/tecio.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/inria.m4 \
+	$(top_srcdir)/m4/metis.m4 $(top_srcdir)/m4/parmetis.m4 \
+	$(top_srcdir)/m4/tecio.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -382,6 +382,8 @@ EXEEXT = @EXEEXT@
 GREP = @GREP@
 HDF5_CXX = @HDF5_CXX@
 HDF5_LD = @HDF5_LD@
+INRIA_CPPFLAGS = @INRIA_CPPFLAGS@
+INRIA_INCLUDE = @INRIA_INCLUDE@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@