Commit 18e4c734 authored by David Moxey's avatar David Moxey

Fix potential issue with VWI solver if IncNS solver not enabled

parent 473bce57
...@@ -7,7 +7,7 @@ IF (NOT NEKTAR_BUILD_SOLVERS) ...@@ -7,7 +7,7 @@ IF (NOT NEKTAR_BUILD_SOLVERS)
ENDIF() ENDIF()
IF( NEKTAR_SOLVER_ADR ) IF( NEKTAR_SOLVER_ADR )
SET(ADRSolverSource ADD_SOLVER_EXECUTABLE(ADRSolver SOURCES
./ADRSolver.cpp ./ADRSolver.cpp
./EquationSystems/Helmholtz.cpp ./EquationSystems/Helmholtz.cpp
./EquationSystems/Laplace.cpp ./EquationSystems/Laplace.cpp
...@@ -22,8 +22,6 @@ IF( NEKTAR_SOLVER_ADR ) ...@@ -22,8 +22,6 @@ IF( NEKTAR_SOLVER_ADR )
./EquationSystems/UnsteadyViscousBurgers.cpp ./EquationSystems/UnsteadyViscousBurgers.cpp
./EquationSystems/EigenValuesAdvection.cpp) ./EquationSystems/EigenValuesAdvection.cpp)
ADD_SOLVER_EXECUTABLE(ADRSolver SOURCES ${ADRSolverSource})
# 1D discontinuous advection (weak DG/flux reconstruction) # 1D discontinuous advection (weak DG/flux reconstruction)
ADD_NEKTAR_TEST(Advection1D_FRDG_GLL_LAGRANGE_SEM LENGTHY) ADD_NEKTAR_TEST(Advection1D_FRDG_GLL_LAGRANGE_SEM LENGTHY)
ADD_NEKTAR_TEST(Advection1D_FRDG_GAUSS_LAGRANGE) ADD_NEKTAR_TEST(Advection1D_FRDG_GAUSS_LAGRANGE)
......
CMAKE_DEPENDENT_OPTION(NEKTAR_SOLVER_VORTEXWAVE CMAKE_DEPENDENT_OPTION(NEKTAR_SOLVER_VORTEXWAVE
"Build the Vortex-Wave interaction solver." ON "Build the Vortex-Wave interaction solver." ON
"NEKTAR_BUILD_SOLVERS" OFF) "NEKTAR_BUILD_SOLVERS;NEKTAR_SOLVER_INCNAVIERSTOKES" OFF)
IF (NOT NEKTAR_BUILD_SOLVERS) IF (NOT NEKTAR_BUILD_SOLVERS OR NOT NEKTAR_SOLVER_INCNAVIERSTOKES)
SET(NEKTAR_SOLVER_VORTEXWAVE OFF CACHE INTERNAL "") SET(NEKTAR_SOLVER_VORTEXWAVE OFF CACHE INTERNAL "")
ENDIF() ENDIF()
...@@ -19,7 +19,6 @@ IF( NEKTAR_SOLVER_VORTEXWAVE ) ...@@ -19,7 +19,6 @@ IF( NEKTAR_SOLVER_VORTEXWAVE )
../ADRSolver/EquationSystems/SteadyAdvectionDiffusion.cpp ../ADRSolver/EquationSystems/SteadyAdvectionDiffusion.cpp
../ADRSolver/EquationSystems/SteadyAdvectionDiffusionReaction.cpp ../ADRSolver/EquationSystems/SteadyAdvectionDiffusionReaction.cpp
./CalcL2ToLinfPressure.cpp ./CalcL2ToLinfPressure.cpp
./VortexWaveInteraction.h
./VortexWaveInteraction.cpp ./VortexWaveInteraction.cpp
$<TARGET_OBJECTS:IncNavierStokesSolver-obj> $<TARGET_OBJECTS:IncNavierStokesSolver-obj>
) )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment