Merge branch 'feature_mz_adjoint_for_turbo' of https://github.com/su2…

…code/SU2 into feature_mz_adjoint_for_turbo
su2code · Aug 29, 2024 · 4327942 · 4327942
2 parents bb0831d + e68f844
commit 4327942
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml
@@ -88,8 +88,6 @@ jobs:
           #  flags: '--buildtype=debug -Denable-directdiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror'
     runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
     steps:
-      - name: Reduce ASLR entropy for tsan
-        run: sudo sysctl -w vm.mmap_rnd_bits=28
       - name: Cache Object Files
         uses: actions/cache@v4
         with:
@@ -130,8 +128,6 @@ jobs:
             flags: '--buildtype=debugoptimized -Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled --warnlevel=3 --werror'
     runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
     steps:
-      - name: Reduce ASLR entropy for asan
-        run: sudo sysctl -w vm.mmap_rnd_bits=28
       - name: Cache Object Files
         uses: actions/cache@v4
         with:
@@ -229,8 +225,6 @@ jobs:
       matrix:
         testscript: ['hybrid_regression.py', 'hybrid_regression_AD.py']
     steps:
-      - name: Reduce ASLR entropy for tsan
-        run: sudo sysctl -w vm.mmap_rnd_bits=28
       - name: Pre Cleanup
         uses: docker://ghcr.io/su2code/su2/test-su2-tsan:240320-1536
         with:
@@ -276,8 +270,6 @@ jobs:
       matrix:
         testscript: ['serial_regression.py', 'serial_regression_AD.py']
     steps:
-      - name: Reduce ASLR entropy for asan
-        run: sudo sysctl -w vm.mmap_rnd_bits=28
       - name: Pre Cleanup
         uses: docker://ghcr.io/su2code/su2/test-su2-asan:240320-1536
         with:

diff --git a/Common/src/CConfig.cpp b/Common/src/CConfig.cpp
@@ -3934,6 +3934,13 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i
         SU2_MPI::Error("The use of FLUID_MIXTURE requires the INC_DENSITY_MODEL option to be VARIABLE",
                        CURRENT_FUNCTION);
       }
+      /*--- Check whether the Kind scalar model used is correct, in the case of FLUID_MIXTURE the kind scalar model must
+       be SPECIES_TRANSPORT. Otherwise, if the scalar model is NONE, the species transport equations will not be solved.
+       --- */
+      if (Kind_Species_Model != SPECIES_MODEL::SPECIES_TRANSPORT) {
+        SU2_MPI::Error("The use of FLUID_MIXTURE requires the KIND_SCALAR_MODEL option to be SPECIES_TRANSPORT",
+                       CURRENT_FUNCTION);
+      }
 
       switch (Kind_ViscosityModel) {
         case VISCOSITYMODEL::CONSTANT: