Updating and fixing conflicts.

Author: economon

.github/workflows/regression.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: 
-        config_set: [BaseMPI, ReverseMPI, ForwardMPI, BaseNoMPI, ReverseNoMPI, ForwardNoMPI]
+        config_set: [BaseMPI, ReverseMPI, ForwardMPI, BaseNoMPI, ReverseNoMPI, ForwardNoMPI, BaseOMP]
         include:
           - config_set: BaseMPI
             flags: '-Denable-pywrapper=true -Denable-tests=true --werror'
@@ -30,6 +30,8 @@ jobs:
             flags: '-Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-pywrapper=true -Denable-tests=true --werror'
           - config_set: ForwardNoMPI
             flags: '-Denable-directdiff=true -Denable-normal=false -Dwith-mpi=disabled  -Denable-tests=true --werror'
+          - config_set: BaseOMP
+            flags: '-Dwith-omp=true -Denable-mixedprec=true -Denable-tecio=false --werror'
     runs-on: ubuntu-latest
     steps:
       - name: Cache Object Files
@@ -54,7 +56,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix: 
-        testscript: ['tutorials.py', 'parallel_regression.py', 'parallel_regression_AD.py', 'serial_regression.py', 'serial_regression_AD.py']
+        testscript: ['tutorials.py', 'parallel_regression.py', 'parallel_regression_AD.py', 'serial_regression.py', 'serial_regression_AD.py', 'hybrid_regression.py']
         include:
           - testscript: 'tutorials.py'
             tag: MPI
@@ -66,31 +68,22 @@ jobs:
             tag: NoMPI
           - testscript: 'serial_regression_AD.py'
             tag: NoMPI
+          - testscript: 'hybrid_regression.py'
+            tag: OMP
     steps:
-      - name: Download Base
-        uses: actions/download-artifact@v1
-        with:
-          name: ${{format('Base{0}', matrix.tag)}}
-      - name: Download Reverse
-        uses: actions/download-artifact@v1
-        with:
-          name: ${{format('Reverse{0}', matrix.tag)}}
-      - name: Download Forward
-        uses: actions/download-artifact@v1
-        with:
-          name: ${{format('Forward{0}', matrix.tag)}}
+      - name: Download All artifact
+        uses: actions/download-artifact@v2
       - name: Move Binaries
         run: |
           mkdir -p install/bin
-          cp -r ${{format('Base{0}', matrix.tag)}}/. install/bin/
-          cp -r ${{format('Reverse{0}', matrix.tag)}}/. install/bin/
-          cp -r ${{format('Forward{0}', matrix.tag)}}/. install/bin/
-          chmod a+x install/bin/*               
+          if [ -d "${{format('Base{0}', matrix.tag)}}" ];    then cp -r ${{format('Base{0}', matrix.tag)}}/.    install/bin/; fi
+          if [ -d "${{format('Reverse{0}', matrix.tag)}}" ]; then cp -r ${{format('Reverse{0}', matrix.tag)}}/. install/bin/; fi
+          if [ -d "${{format('Forward{0}', matrix.tag)}}" ]; then cp -r ${{format('Forward{0}', matrix.tag)}}/. install/bin/; fi
+          chmod a+x install/bin/*
       - name: Run Tests in Container
         uses: docker://su2code/test-su2:20200303
         with:
           args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}}
-  
   unit_tests:
     runs-on: ubuntu-latest
     name: Unit Tests
@@ -125,7 +118,7 @@ jobs:
           cp -r ${{format('Base{0}', matrix.tag)}}/. install/bin/
           cp -r ${{format('Reverse{0}', matrix.tag)}}/. install/bin/
           cp -r ${{format('Forward{0}', matrix.tag)}}/. install/bin/
-          chmod a+x install/bin/*  
+          chmod a+x install/bin/*
       - name: Run Unit Tests
         uses: docker://su2code/test-su2:20191031
         with:

.travis.yml

@@ -37,11 +37,15 @@ env:
         - CONFIGURE_COMMAND="./meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true"
           TEST_SCRIPT=parallel_regression.py
 
+        # Hybrid-parallel build and test
+        - CONFIGURE_COMMAND="./meson.py build --prefix=$TRAVIS_BUILD_DIR -Dwith-omp=true -Denable-mixedprec=true -Denable-tecio=false"
+          TEST_SCRIPT=hybrid_regression.py
+
         # Serial build and test for AD
         - CONFIGURE_COMMAND="./meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Dwith-mpi=disabled -Denable-autodiff=true -Denable-directdiff=true"
           TEST_SCRIPT=serial_regression_AD.py
 
-        # Parallel build and test for AD:
+        # Parallel build and test for AD
         - CONFIGURE_COMMAND="./meson.py build --prefix=$TRAVIS_BUILD_DIR -Denable-pywrapper=true -Denable-autodiff=true"
           TEST_SCRIPT=parallel_regression_AD.py
 
@@ -51,7 +55,7 @@ before_install:
     - sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 10
     # Install the necessary packages using apt-get with sudo
     - sudo apt-get update -qq
-    - sudo apt-get install -qq build-essential python3-numpy python3-scipy libopenmpi-dev openmpi-bin swig python3-mpi4py  
+    - sudo apt-get install -qq build-essential python3-numpy python3-scipy libopenmpi-dev openmpi-bin swig python3-mpi4py
     # to avoid interference with MPI
     - test -n $CC  && unset CC
     - test -n $CXX && unset CXX

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 7.0.4 "Blackbird"
+ * \version 7.0.5 "Blackbird"
  *
  * The current SU2 release has been coordinated by the
  * SU2 International Developers Society <www.su2devsociety.org>
@@ -33,7 +33,7 @@
  */
 
 /*! 
- * \mainpage SU2 version 7.0.4 "Blackbird"
+ * \mainpage SU2 version 7.0.5 "Blackbird"
  * SU2 suite is an open-source collection of C++ based software tools
  * to perform PDE analysis and PDE constrained optimization problems.  The toolset is designed with 
  * computational fluid dynamics and aerodynamic shape optimization in mind, but is extensible to

Common/include/CConfig.hpp

@@ -3,7 +3,7 @@
  * \brief All the information about the definition of the physical problem.
  *        The subroutines and functions are in the <i>CConfig.cpp</i> file.
  * \author F. Palacios, T. Economon, B. Tracey
- * \version 7.0.4 "Blackbird"
+ * \version 7.0.5 "Blackbird"
  *
  * SU2 Project Website: https://su2code.github.io
  *
@@ -44,7 +44,6 @@
 #include <assert.h>
 
 #include "./option_structure.hpp"
-#include "./datatype_structure.hpp"
 
 #ifdef HAVE_CGNS
 #include "cgnslib.h"
@@ -1282,7 +1281,7 @@ class CConfig {
    * \brief Constructor of the class which takes an istream buffer containing the config options.
    */
   CConfig(istream &case_buffer, unsigned short val_software, bool verb_high);
-  
+
   /*!
    * \brief Constructor of the class which reads the input file and uses default options from another config.
    */
@@ -1302,7 +1301,7 @@ class CConfig {
    * \brief Destructor of the class.
    */
   ~CConfig(void);
-  
+
   /*!
   * \brief Initialize common fields of the config structure.
   */
@@ -8009,8 +8008,8 @@ class CConfig {
   /*!
    * \brief Set the config file parsing.
    */
-  void SetConfig_Parsing(istream &config_buffer);  
-  
+  void SetConfig_Parsing(istream &config_buffer);
+
   /*!
    * \brief Set the config file parsing.
    */
@@ -8340,26 +8339,6 @@ class CConfig {
    */
   unsigned long GetNonphysical_Reconstr(void) const { return Nonphys_Reconstr; }
 
-  /*!
-   * \brief Given arrays x[1..n] and y[1..n] containing a tabulated function, i.e., yi = f(xi), with
-   x1 < x2 < . . . < xN , and given values yp1 and ypn for the first derivative of the interpolating
-   function at points 1 and n, respectively, this routine returns an array y2[1..n] that contains
-   the second derivatives of the interpolating function at the tabulated points xi. If yp1 and/or
-   ypn are equal to 1 × 1030 or larger, the routine is signaled to set the corresponding boundary
-   condition for a natural spline, with zero second derivative on that boundary.
-   Numerical Recipes: The Art of Scientific Computing, Third Edition in C++.
-   */
-  void SetSpline(vector<su2double> &x, vector<su2double> &y, unsigned long n, su2double yp1, su2double ypn, vector<su2double> &y2);
-
-  /*!
-   * \brief Given the arrays xa[1..n] and ya[1..n], which tabulate a function (with the xai’s in order),
-   and given the array y2a[1..n], which is the output from spline above, and given a value of
-   x, this routine returns a cubic-spline interpolated value y.
-   Numerical Recipes: The Art of Scientific Computing, Third Edition in C++.
-   * \return The interpolated value of for x.
-   */
-  su2double GetSpline(vector<su2double> &xa, vector<su2double> &ya, vector<su2double> &y2a, unsigned long n, su2double x);
-
   /*!
    * \brief Start the timer for profiling subroutines.
    * \param[in] val_start_time - the value of the start time.

Common/include/CMultiGridQueue.hpp

@@ -3,7 +3,7 @@
  * \brief Header of the multigrid queue class for the FVM solver.
  *        The subroutines and functions are in the <i>CMultiGridQueue.cpp</i> file.
  * \author F. Palacios
- * \version 7.0.4 "Blackbird"
+ * \version 7.0.5 "Blackbird"
  *
  * SU2 Project Website: https://su2code.github.io
  *
@@ -41,10 +41,11 @@ using namespace std;
  */
 class CMultiGridQueue {
 private:
-  vector<CFastFindAndEraseQueue<> > QueueCV; /*!< \brief Queue structure to choose the next control volume in the agglomeration process. */
-  vector<short> Priority;                    /*!< \brief The priority is based on the number of pre-agglomerated neighbors. */
-  vector<char> RightCV;                      /*!< \brief In the lowest priority there are some CV that can not be agglomerated, this is the way to identify them. */
-  const unsigned long nPoint = 0;            /*!< \brief Total number of points. */
+  using QueueType = CFastFindAndEraseQueue<>;
+  vector<QueueType> QueueCV;        /*!< \brief Queue structure to choose the next control volume in the agglomeration process. */
+  vector<short> Priority;           /*!< \brief The priority is based on the number of pre-agglomerated neighbors. */
+  vector<char> RightCV;             /*!< \brief In the lowest priority there are some CV that can not be agglomerated, this is the way to identify them. */
+  const unsigned long nPoint = 0;   /*!< \brief Total number of points. */
 
   /*!
    * \brief Throw error with error message that the point is not in the priority list.