Merge branch 'develop'

.travis.yml

@@ -26,18 +26,18 @@ env:
  - CONFIGURE_COMMAND="./preconfigure.py --enable-mpi --with-cc=mpicc --with-cxx=mpicxx --prefix=$TRAVIS_BUILD_DIR"
  TEST_SCRIPT=parallel_regression.py
  # Serial build and test for AD
- - CONFIGURE_COMMAND="./preconfigure.py --prefix=$TRAVIS_BUILD_DIR --enable-autodiff"
+ - CONFIGURE_COMMAND="./preconfigure.py --prefix=$TRAVIS_BUILD_DIR --enable-autodiff --enable-direct-diff"
  TEST_SCRIPT=serial_regression_AD.py
  # Parallel build and test for AD
- - CONFIGURE_COMMAND="./preconfigure.py --enable-mpi --with-cc=mpicc --with-cxx=mpicxx --prefix=$TRAVIS_BUILD_DIR --enable-autodiff"
+ - CONFIGURE_COMMAND="./preconfigure.py --enable-mpi --with-cc=mpicc --with-cxx=mpicxx --prefix=$TRAVIS_BUILD_DIR --enable-autodiff --enable-direct-diff"
  TEST_SCRIPT=parallel_regression_AD.py
 
 
 
 before_install:
  # install the necessary packages
  - sudo apt-get update -qq
- - sudo apt-get install -qq python-numpy mpich2
+ - sudo apt-get install -qq python-numpy python-scipy mpich2
 
 install:
  - echo $TRAVIS_BUILD_DIR

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.0 "Cardinal"
+ * \version 4.1.1 "Cardinal"
  *
  * SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
  * Dr. Thomas D. Economon ([email protected]).
@@ -13,7 +13,7 @@
  * Prof. Alberto Guardone's group at Polytechnic University of Milan.
  * Prof. Rafael Palacios' group at Imperial College London.
  *
- * Copyright (C) 2012-2015 SU2, the open-source CFD code.
+ * Copyright (C) 2012-2016 SU2, the open-source CFD code.
  *
  * SU2 is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

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.0 "Cardinal"
+ * \version 4.1.1 "Cardinal"
  *
  * SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
  * Dr. Thomas D. Economon ([email protected]).
@@ -13,7 +13,7 @@
  * Prof. Alberto Guardone's group at Polytechnic University of Milan.
  * Prof. Rafael Palacios' group at Imperial College London.
  *
- * Copyright (C) 2012-2015 SU2, the open-source CFD code.
+ * Copyright (C) 2012-2016 SU2, the open-source CFD code.
  *
  * SU2 is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -59,7 +59,7 @@ inline unsigned short CConfig::GetRef_NonDim(void) { return Ref_NonDim; }
 
 inline void CConfig::SetKind_SU2(unsigned short val_kind_su2) { Kind_SU2 = val_kind_su2 ; }
 
-inline bool CConfig::GetAdjoint(void) { return Adjoint; }
+inline bool CConfig::GetContinuous_Adjoint(void) { return ContinuousAdjoint; }
 
 inline bool CConfig::GetViscous(void) { return Viscous; }
 
@@ -71,18 +71,26 @@ inline su2double CConfig::GetTimeSpectral_Period(void) { return TimeSpectral_Per
 
 inline void CConfig::SetExtIter(unsigned long val_iter) { ExtIter = val_iter; }
 
+inline void CConfig::SetFSIIter(unsigned long val_iter) { FSIIter = val_iter; }
+
 inline void CConfig::SetIntIter(unsigned long val_iter) { IntIter = val_iter; }
 
 inline unsigned long CConfig::GetExtIter(void) { return ExtIter; }
 
+inline unsigned long CConfig::GetFSIIter(void) { return FSIIter; }
+
 inline unsigned long CConfig::GetIntIter(void) { return IntIter; }
 
 inline unsigned long CConfig::GetUnst_nIntIter(void) { return Unst_nIntIter; }
 
+inline unsigned long CConfig::GetDyn_nIntIter(void) { return Dyn_nIntIter; }
+
 inline long CConfig::GetUnst_RestartIter(void) { return Unst_RestartIter; }
 
 inline long CConfig::GetUnst_AdjointIter(void) { return Unst_AdjointIter; }
 
+inline long CConfig::GetDyn_RestartIter(void) { return Dyn_RestartIter; }
+
 inline string CConfig::GetPlaneTag(unsigned short index) { return PlaneTag[index]; }
 
 inline su2double CConfig::GetEA_IntLimit(unsigned short index) { return EA_IntLimit[index]; }
@@ -123,12 +131,21 @@ inline su2double CConfig::GetThermalDiffusivity(void) { return Thermal_Diffusivi
 
 inline su2double CConfig::GetElasticyMod(void) { return ElasticyMod; }
 
+inline su2double CConfig::GetBulk_Modulus_Struct(void) { return Bulk_Modulus_Struct; }
+
 inline unsigned short CConfig::GetElas2D_Formulation(void) { return Kind_2DElasForm; }
 
 inline su2double CConfig::GetPoissonRatio(void) { return PoissonRatio; }
 
+
 inline su2double CConfig::GetMaterialDensity(void) { return MaterialDensity; }
 
+inline unsigned short CConfig::GetMaterialCompressibility(void) { return Kind_Material_Compress; }
+
+inline unsigned short CConfig::GetMaterialModel(void) { return Kind_Material; }
+
+inline unsigned short CConfig::GetGeometricConditions(void) { return Kind_Struct_Solver; }
+
 inline su2double CConfig::GetRefLengthMoment(void) { return RefLengthMoment; }
 
 inline su2double CConfig::GetRefElemLength(void) { return RefElemLength; }
@@ -392,6 +409,8 @@ inline string CConfig::GetTagFFDBox(unsigned short val_ffd) { return TagFFDBox[v
 
 inline unsigned short CConfig::GetnDV(void) { return nDV; }
 
+inline unsigned short CConfig::GetnDV_Value(unsigned short iDV) { return nDV_Value[iDV]; }
+
 inline unsigned short CConfig::GetnFFDBox(void) { return nFFDBox; }
 
 inline unsigned short CConfig::GetFFD_Continuity(void) { return FFD_Continuity; }
@@ -631,6 +650,10 @@ inline unsigned short CConfig::GetKind_TimeIntScheme_Poisson(void) { return Kind
 
 inline unsigned short CConfig::GetKind_TimeIntScheme_FEA(void) { return Kind_TimeIntScheme_FEA; }
 
+inline unsigned short CConfig::GetKind_SpaceIteScheme_FEA(void) { return Kind_SpaceIteScheme_FEA; }
+
+inline unsigned short CConfig::GetKind_TransferMethod(void) { return Kind_TransferMethod; }
+
 inline unsigned short CConfig::GetKind_ConvNumScheme_Flow(void) { return Kind_ConvNumScheme_Flow; }
 
 inline unsigned short CConfig::GetKind_ConvNumScheme_AdjLevelSet(void) { return Kind_ConvNumScheme_AdjLevelSet; }
@@ -857,6 +880,8 @@ inline string CConfig::GetSolution_FlowFileName(void) { return Solution_FlowFile
 
 inline string CConfig::GetSolution_AdjFileName(void) { return Solution_AdjFileName; }
 
+inline string CConfig::GetSolution_FEMFileName(void) { return Solution_FEMFileName; }
+
 inline string CConfig::GetFlow_FileName(void) { return Flow_FileName; }
 
 inline string CConfig::GetStructure_FileName(void) { return Structure_FileName; }
@@ -881,6 +906,8 @@ inline string CConfig::GetRestart_HeatFileName(void) { return Restart_HeatFileNa
 
 inline string CConfig::GetRestart_AdjFileName(void) { return Restart_AdjFileName; }
 
+inline string CConfig::GetRestart_FEMFileName(void) { return Restart_FEMFileName; }
+
 inline string CConfig::GetAdj_FileName(void) { return Adj_FileName; }
 
 inline string CConfig::GetObjFunc_Grad_FileName(void) { return ObjFunc_Grad_FileName; }
@@ -917,9 +944,9 @@ inline su2double CConfig::GetTotal_UnstTime(void) { return Total_UnstTime; }
 
 inline bool CConfig::GetEngine_Intake(void) { return Engine_Intake; }
 
-inline su2double CConfig::GetDV_Value(unsigned short val_dv) { return DV_Value[val_dv]; }
+inline su2double CConfig::GetDV_Value(unsigned short val_dv, unsigned short val_value) { return DV_Value[val_dv][val_value]; }
 
-inline void CConfig::SetDV_Value(unsigned short val_dv, su2double val) { DV_Value[val_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; }
 
@@ -1111,8 +1138,14 @@ inline su2double CConfig::GetAitkenStatRelax(void) { return AitkenStatRelax; }
 
 inline su2double CConfig::GetAitkenDynMaxInit(void) { return AitkenDynMaxInit; }
 
+inline su2double CConfig::GetAitkenDynMinInit(void) { return AitkenDynMinInit; }
+
 inline bool CConfig::GetDeadLoad(void) { return DeadLoad; }
 
+inline bool CConfig::GetMatchingMesh(void) { return MatchingMesh; }
+
+inline bool CConfig::GetSteadyRestart(void) { return SteadyRestart; }
+
 inline unsigned short CConfig::GetDynamic_Analysis(void) { return Dynamic_Analysis; }
 
 inline su2double CConfig::GetDelta_DynTime(void) { return Delta_DynTime; }
@@ -1127,24 +1160,48 @@ inline su2double CConfig::GetNewmark_alpha(void) { return Newmark_alpha; }
 
 inline su2double CConfig::GetNewmark_delta(void) { return Newmark_delta; }
 
-inline bool CConfig::GetGradual_Load(void) { return Gradual_Load; }
+inline unsigned short CConfig::GetnIntCoeffs(void) { return nIntCoeffs; }
+
+inline su2double CConfig::Get_Int_Coeffs(unsigned short val_coeff) { return Int_Coeffs[val_coeff]; }
+
+inline bool CConfig::GetSigmoid_Load(void) { return Sigmoid_Load; }
 
 inline bool CConfig::GetRamp_Load(void) { return Ramp_Load; }
 
 inline su2double CConfig::GetRamp_Time(void) { return Ramp_Time; }
 
+inline su2double CConfig::GetSigmoid_Time(void) { return Sigmoid_Time; }
+
+inline su2double CConfig::GetSigmoid_K(void) { return Sigmoid_K; }
+
 inline su2double CConfig::GetStatic_Time(void) { return Static_Time; }
 
 inline unsigned short CConfig::GetPredictorOrder(void) { return Pred_Order; }
 
+inline bool CConfig::GetIncrementalLoad(void) { return IncrementalLoad; }
+
+inline unsigned long CConfig::GetNumberIncrements(void) { return IncLoad_Nincrements; }
+
+inline su2double CConfig::GetIncLoad_Criteria(unsigned short val_var) { return IncLoad_Criteria[val_var]; }
+
 inline bool CConfig::GetFSI_Simulation(void) { return FSI_Problem; }
 
+inline unsigned short CConfig::GetKindInterpolation(void) { return Kind_Interpolation; }
+
 inline unsigned short CConfig::GetRelaxation_Method_FSI(void) { return Kind_BGS_RelaxMethod; }
 
 inline su2double CConfig::GetOrderMagResidualFSI(void) { return OrderMagResidualFSI; }
 
 inline su2double CConfig::GetMinLogResidualFSI(void) { return MinLogResidualFSI; }
 
+inline su2double CConfig::GetResidual_FEM_UTOL(void) { return Res_FEM_UTOL; }
+
+inline su2double CConfig::GetResidual_FEM_RTOL(void) { return Res_FEM_RTOL; }
+
+inline su2double CConfig::GetResidual_FEM_ETOL(void) { return Res_FEM_ETOL; }
+
 inline unsigned short CConfig::GetDirectDiff(){ return DirectDiff;}
 
 inline bool CConfig::GetDiscrete_Adjoint() {return DiscreteAdjoint;}
+
+inline bool CConfig::GetAD_Mode(void) {return AD_Mode;}

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.0 "Cardinal"
+ * \version 4.1.1 "Cardinal"
  *
  * SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
  * Dr. Thomas D. Economon ([email protected]).
@@ -14,7 +14,7 @@
  * Prof. Alberto Guardone's group at Polytechnic University of Milan.
  * Prof. Rafael Palacios' group at Imperial College London.
  *
- * Copyright (C) 2012-2015 SU2, the open-source CFD code.
+ * Copyright (C) 2012-2016 SU2, the open-source CFD code.
  *
  * SU2 is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -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.0 "Cardinal"
+ * \version 4.1.1 "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.0 "Cardinal"
+ * \version 4.1.1 "Cardinal"
  *
  * SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
  * Dr. Thomas D. Economon ([email protected]).
@@ -13,7 +13,7 @@
  * Prof. Alberto Guardone's group at Polytechnic University of Milan.
  * Prof. Rafael Palacios' group at Imperial College London.
  *
- * Copyright (C) 2012-2015 SU2, the open-source CFD code.
+ * Copyright (C) 2012-2016 SU2, the open-source CFD code.
  *
  * SU2 is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

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.0 "Cardinal"
+ * \version 4.1.1 "Cardinal"
  *
  * SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
  * Dr. Thomas D. Economon ([email protected]).
@@ -13,7 +13,7 @@
  * Prof. Alberto Guardone's group at Polytechnic University of Milan.
  * Prof. Rafael Palacios' group at Imperial College London.
  *
- * Copyright (C) 2012-2015 SU2, the open-source CFD code.
+ * Copyright (C) 2012-2016 SU2, the open-source CFD code.
  *
  * SU2 is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

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.0 "Cardinal"
+ * \version 4.1.1 "Cardinal"
  *
  * SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
  * Dr. Thomas D. Economon ([email protected]).
@@ -13,7 +13,7 @@
  * Prof. Alberto Guardone's group at Polytechnic University of Milan.
  * Prof. Rafael Palacios' group at Imperial College London.
  *
- * Copyright (C) 2012-2015 SU2, the open-source CFD code.
+ * Copyright (C) 2012-2016 SU2, the open-source CFD code.
  *
  * SU2 is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

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.0 "Cardinal"
+ * \version 4.1.1 "Cardinal"
  *
  * SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
  * Dr. Thomas D. Economon ([email protected]).
@@ -13,7 +13,7 @@
  * Prof. Alberto Guardone's group at Polytechnic University of Milan.
  * Prof. Rafael Palacios' group at Imperial College London.
  *
- * Copyright (C) 2012-2015 SU2, the open-source CFD code.
+ * Copyright (C) 2012-2016 SU2, the open-source CFD code.
  *
  * SU2 is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

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.0 "Cardinal"
+ * \version 4.1.1 "Cardinal"
  *
  * SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
  * Dr. Thomas D. Economon ([email protected]).
@@ -13,7 +13,7 @@
  * Prof. Alberto Guardone's group at Polytechnic University of Milan.
  * Prof. Rafael Palacios' group at Imperial College London.
  *
- * Copyright (C) 2012-2015 SU2, the open-source CFD code.
+ * Copyright (C) 2012-2016 SU2, the open-source CFD code.
  *
  * SU2 is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

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.0 "Cardinal"
+ * \version 4.1.1 "Cardinal"
  *
  * SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
  * Dr. Thomas D. Economon ([email protected]).
@@ -13,7 +13,7 @@
  * Prof. Alberto Guardone's group at Polytechnic University of Milan.
  * Prof. Rafael Palacios' group at Imperial College London.
  *
- * Copyright (C) 2012-2015 SU2, the open-source CFD code.
+ * Copyright (C) 2012-2016 SU2, the open-source CFD code.
  *
  * SU2 is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -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.0 "Cardinal"
+ * \version 4.1.1 "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.0 "Cardinal"
+ * \version 4.1.1 "Cardinal"
  *
  * SU2 Lead Developers: Dr. Francisco Palacios ([email protected]).
  * Dr. Thomas D. Economon ([email protected]).
@@ -13,7 +13,7 @@
  * Prof. Alberto Guardone's group at Polytechnic University of Milan.
  * Prof. Rafael Palacios' group at Imperial College London.
  *
- * Copyright (C) 2012-2015 SU2, the open-source CFD code.
+ * Copyright (C) 2012-2016 SU2, the open-source CFD code.
  *
  * SU2 is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public