Merge branch 'develop' into update_catch2

Author: pcarruscag

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/regression.yml

@@ -129,7 +129,7 @@ jobs:
         with:
           # -t <Tutorials-branch> -c <Testcases-branch>
           args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}}
-      - name: Cleanup 
+      - name: Cleanup
         uses: docker://ghcr.io/su2code/su2/test-su2:220614-1237
         with:
           entrypoint: /bin/rm
@@ -192,12 +192,31 @@ jobs:
           done
           find $BIN_FOLDER -type f -exec chmod a+x '{}' \;
           ls -lahR $BIN_FOLDER
+          echo "cloning branch"
+          branch="${{github.ref}}"
+          name="SU2"
+          SRC_FOLDER="$PWD/src"
+          mkdir -p $SRC_FOLDER 
+          cd $SRC_FOLDER 
+          git clone --recursive --depth=1 --shallow-submodules https://github.com/su2code/SU2 $name
+          cd $name
+          git config --add remote.origin.fetch '+refs/pull/*/merge:refs/remotes/origin/refs/pull/*/merge'
+          git config --add remote.origin.fetch '+refs/heads/*:refs/remotes/origin/refs/heads/*'
+          git fetch origin --depth=1 $branch:$branch
+          git checkout $branch
+          git submodule update
+          echo $PWD
+          ls -lahR
+          cd ..
+          echo "done cloning"
+          echo $PWD
+          ls -lahR
       - name: Run Unit Tests
         uses: docker://ghcr.io/su2code/su2/test-su2:220614-1237
         with:
           entrypoint: install/bin/${{matrix.testdriver}}
-      - name: Post Cleanup 
+      - name: Post Cleanup
         uses: docker://ghcr.io/su2code/su2/test-su2:220614-1237
         with:
           entrypoint: /bin/rm
-          args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
+          args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}

Common/include/CConfig.hpp

@@ -445,6 +445,7 @@ class CConfig {
 
   bool ReorientElements;       /*!< \brief Flag for enabling element reorientation. */
   string CustomObjFunc;        /*!< \brief User-defined objective function. */
+  string CustomOutputs;        /*!< \brief User-defined functions for outputs. */
   unsigned short nDV,                  /*!< \brief Number of design variables. */
   nObj, nObjW;                         /*! \brief Number of objective functions. */
   unsigned short* nDV_Value;           /*!< \brief Number of values for each design variable (might be different than 1 if we allow arbitrary movement). */
@@ -5224,6 +5225,11 @@ class CConfig {
    */
   const string& GetCustomObjFunc() const { return CustomObjFunc; }
 
+  /*!
+   * \brief Get the user expressions for custom outputs.
+   */
+  const string& GetCustomOutputs() const { return CustomOutputs; }
+
   /*!
    * \brief Get the kind of sensitivity smoothing technique.
    * \return Kind of sensitivity smoothing technique.

Common/include/containers/CFileReaderLUT.hpp

@@ -0,0 +1,83 @@
+/*!
+ * \file CFileReaderLUT.hpp
+ * \brief reading lookup table for tabulated fluid properties
+ * \author D. Mayer, T. Economon
+ * \version 7.3.1 "Blackbird"
+ *
+ * SU2 Project Website: https://su2code.github.io
+ *
+ * The SU2 Project is maintained by the SU2 Foundation
+ * (http://su2foundation.org)
+ *
+ * Copyright 2012-2022, SU2 Contributors (cf. AUTHORS.md)
+ *
+ * SU2 is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * SU2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include <fstream>
+#include <string>
+#include <vector>
+
+#include "../../Common/include/parallelization/mpi_structure.hpp"
+#include "../../../Common/include/linear_algebra/blas_structure.hpp"
+#include "../../../Common/include/toolboxes/CSquareMatrixCM.hpp"
+
+class CFileReaderLUT {
+ protected:
+  int rank;
+
+  std::string version_lut;
+  std::string version_reader;
+  unsigned long n_points;
+  unsigned long n_triangles;
+  unsigned long n_hull_points;
+  unsigned long n_variables;
+
+  /*! \brief Holds the variable names stored in the table file. 
+   * Order is in sync with tableFlamelet.
+   */
+  std::vector<std::string> names_var;
+
+  /*! \brief Holds all data stored in the table. 
+   * First index addresses the variable while second index addresses the point.
+   */
+  su2activematrix table_data;
+
+  su2matrix<unsigned long> triangles;
+
+  std::vector<unsigned long> hull;
+
+  std::string SkipToFlag(std::ifstream* file_stream, const std::string& flag);
+
+ public:
+  CFileReaderLUT(){};
+  
+  inline const std::string& GetVersionLUT() const { return version_lut; }
+  inline const std::string& GetVersionReader() const { return version_reader; }
+  inline unsigned long GetNPoints() const { return n_points; }
+  inline unsigned long GetNTriangles() const { return n_triangles; }
+  inline unsigned long GetNHullPoints() const { return n_hull_points; }
+  inline unsigned long GetNVariables() const { return n_variables; }
+
+  inline const std::vector<std::string>& GetNamesVar() const { return names_var; }
+
+  inline const su2activematrix& GetTableData() const { return table_data; }
+
+  inline const su2matrix<unsigned long>& GetTriangles() const { return triangles; };
+
+  inline const std::vector<unsigned long>& GetHull() const { return hull; };
+
+  void ReadRawDRG(const std::string& file_name);
+};