From 26df65d00c3c0b549137703f0b938079d303dd56 Mon Sep 17 00:00:00 2001 From: Paul <paul.dechamps@student.uliege.be> Date: Thu, 21 Jul 2022 21:31:31 +0200 Subject: [PATCH] Pulled adri --- CMakeCache.txt | 38 -------------------------------------- CMakeLists.txt | 1 + ext/amfe | 2 +- vii/src/wViscSolver.cpp | 1 + vii/tests/bli2.py | 2 +- 5 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 CMakeCache.txt diff --git a/CMakeCache.txt b/CMakeCache.txt deleted file mode 100644 index dc789f0..0000000 --- a/CMakeCache.txt +++ /dev/null @@ -1,38 +0,0 @@ -# This is the CMakeCache file. -# For build in directory: /Users/paulzer/lab/dartflo -# It was generated by CMake: /usr/local/Cellar/cmake/3.22.3/bin/cmake -# You can edit this file to change values found and used by cmake. -# If you do not want to change any of the values, simply exit the editor. -# If you do want to change a value, simply edit, save, and exit the editor. -# The syntax for the file is as follows: -# KEY:TYPE=VALUE -# KEY is the name of a variable in the cache. -# TYPE is a hint to GUIs for the type of VALUE, DO NOT EDIT TYPE!. -# VALUE is the current value for the KEY. - -######################## -# EXTERNAL cache entries -######################## - - -######################## -# INTERNAL cache entries -######################## - -//This is the directory where this CMakeCache.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=/Users/paulzer/lab/dartflo -//Major version of cmake used to create the current loaded cache -CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3 -//Minor version of cmake used to create the current loaded cache -CMAKE_CACHE_MINOR_VERSION:INTERNAL=22 -//Patch version of cmake used to create the current loaded cache -CMAKE_CACHE_PATCH_VERSION:INTERNAL=3 -//Path to CMake executable. -CMAKE_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.22.3/bin/cmake -//Path to cpack program executable. -CMAKE_CPACK_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.22.3/bin/cpack -//Path to ctest program executable. -CMAKE_CTEST_COMMAND:INTERNAL=/usr/local/Cellar/cmake/3.22.3/bin/ctest -//Path to CMake installation. -CMAKE_ROOT:INTERNAL=/usr/local/Cellar/cmake/3.22.3/share/cmake - diff --git a/CMakeLists.txt b/CMakeLists.txt index ec130f6..f7e8db5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,6 +114,7 @@ ENDIF() # -- Sub directories ADD_SUBDIRECTORY( ext ) ADD_SUBDIRECTORY( dart ) +ADD_SUBDIRECTORY( vii ) # -- FINAL MESSAGE(STATUS "PROJECT: ${CMAKE_PROJECT_NAME}") diff --git a/ext/amfe b/ext/amfe index fab1af1..e6eafbe 160000 --- a/ext/amfe +++ b/ext/amfe @@ -1 +1 @@ -Subproject commit fab1af115a6197d8d31f9746d33436fd99ce5851 +Subproject commit e6eafbe78604a7a27c7ee21f098f4c1e3704b0dc diff --git a/vii/src/wViscSolver.cpp b/vii/src/wViscSolver.cpp index c2e92b3..d485d35 100644 --- a/vii/src/wViscSolver.cpp +++ b/vii/src/wViscSolver.cpp @@ -210,6 +210,7 @@ int ViscSolver::Run(unsigned int const couplIter) // Solve equations tms["1-TimeSolver"].start(); pointExitCode = tSolver->Integration(iPoint, Sections[iSec][iRegion]); + // Sections[iSec][iRegion]->U[iPoint * Sections[iSec][iRegion]->GetnVar()+2] = 9.; tms["1-TimeSolver"].stop(); // Unsucessfull convergence output diff --git a/vii/tests/bli2.py b/vii/tests/bli2.py index c46a10a..cf3b476 100644 --- a/vii/tests/bli2.py +++ b/vii/tests/bli2.py @@ -57,7 +57,7 @@ def main(): # define flow variables Re = 1e7 - alpha = 5.*math.pi/180 + alpha = 2.*math.pi/180 M_inf = 0. CFL0 = 1 -- GitLab