Commit 01fe74fc authored by Alexander Jaust's avatar Alexander Jaust
Browse files

Restructure repository to in a more logical way:

* Code from `test/` goes to `examples/`. This includes the 2D test case and the dummy solver.
* `test/` still contains reference data and scripts to run tests.
* Renamed directories to have more consistent names.
* Removed references to "iterative" and "partitioned" as much as possible.
* Adds 3D example to tests and also removed legacy dependency of 3D case.

See merge request !48
parent 5a2b6108
Pipeline #21483 passed with stages
in 2 minutes and 42 seconds
......@@ -83,7 +83,7 @@ build-tests:master-2.4.0:
stage: test
script:
- cd build-cmake/
- CTEST_OUTPUT_ON_FAILURE=1 ctest --verbose -j1 -L ^partitioned$
- CTEST_OUTPUT_ON_FAILURE=1 ctest --verbose -j1
artifacts:
expire_in: 2 days
when: on_failure
......
......@@ -2,6 +2,7 @@
## Not released yet
- 2022-08-04: Restructure repository to have a more logical directory structure. Code examples live in `examples/`. These codes are also used as tests. Reference data resides in `test/`.
- 2022-08-04: Update CI to also run tests against DuMuX master. Theses tests may fail.
- 2022-08-04: Remove leftover references to monolithic coupling from code.
- 2022-08-02: Fix CMake macro that creates files links to preCICE configuration files.
......
# DuMuX-preCICE examples
- `ff-pm/` contains examples of coupled free flow (`ff`) and porous medium (`pm`) flow
- `legacy/` contains older examples that are not actively maintained and may not work.
......@@ -4,10 +4,10 @@ set -e -u
rm -rf precice-run/
./test_partitioned_dummysolver -preCICE.SolverName SolverOne -preCICE.ConfigFileName precice-dummy-solver-config.xml -preCICE.MeshName MeshOne > Solver_One.out 2>&1 &
./dumuxprecice_dummysolver -preCICE.SolverName SolverOne -preCICE.ConfigFileName precice-dummy-solver-config.xml -preCICE.MeshName MeshOne > Solver_One.out 2>&1 &
SOLVER_ONE_ID=$!
./test_partitioned_dummysolver -preCICE.SolverName SolverTwo -preCICE.ConfigFileName precice-dummy-solver-config.xml -preCICE.MeshName MeshTwo > Solver_Two.out 2>&1 &
./dumuxprecice_dummysolver -preCICE.SolverName SolverTwo -preCICE.ConfigFileName precice-dummy-solver-config.xml -preCICE.MeshName MeshTwo > Solver_Two.out 2>&1 &
SOLVER_TWO_ID=$!
wait ${SOLVER_ONE_ID}
......
add_executable(test_partitioned_dummysolver EXCLUDE_FROM_ALL main_dummysolver.cc)
add_executable(dumuxprecice_dummysolver EXCLUDE_FROM_ALL main_dummysolver.cc)
target_link_libraries(test_partitioned_dummysolver PRIVATE dumux-precice)
target_link_libraries(dumuxprecice_dummysolver PRIVATE dumux-precice)
dune_symlink_to_source_files(FILES precice-dummy-solver-config.xml)
dune_symlink_to_source_files(FILES Allrun.sh)
dumux_add_test(NAME test_partitioned_dummysolver
TARGET test_partitioned_dummysolver
LABELS dummy precice partitioned
dumux_add_test(NAME dumuxprecice_dummysolver
TARGET dumuxprecice_dummysolver
LABELS dummy precice
TIMEOUT 30
COMMAND Allrun.sh)
# 2D cases
add_subdirectory(flow-over-square-2d)
# 3D cases
add_subdirectory(ff-pm-3d)
\ No newline at end of file
add_subdirectory(flow-over-cube-3d)
\ No newline at end of file
add_executable(ff_flow_over_cube_3d EXCLUDE_FROM_ALL main_ff-reversed.cc)
add_executable(pm_flow_over_cube_3d EXCLUDE_FROM_ALL main_pm-reversed.cc)
target_link_libraries(ff_flow_over_cube_3d PRIVATE dumux-precice)
target_link_libraries(pm_flow_over_cube_3d PRIVATE dumux-precice)
# add a symlink for each input file
add_input_file_links()
# add a symlink for each preCICE configuration file
add_precice_file_links()
dune_symlink_to_source_files(FILES run-iterative-simulation-test.sh)
dune_symlink_to_source_files(FILES precice-config.xml)
# Dummy test is needed to build porous media solver. The default
# `dumux_add_test` (and the underlying `dune_add_test`) only accept
# one target executable.
dumux_add_test(NAME dummy_test_ff_pm_part_flow_over_square_2d
TARGET pm_flow_over_square_2d
LABELS freeflow stokes precice darcy partitioned
TIMEOUT 30
COMMAND ${CMAKE_SOURCE_DIR}/test/return-test-passed.sh
)
\ No newline at end of file
......@@ -90,6 +90,18 @@ public:
return alphaBJ_;
}
#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR > 4
/*!
* \brief Return the temperature within the domain in [K].
*
* This problem assumes a temperature of 10 degrees Celsius.
*/
Scalar temperature(const GlobalPosition &globalPos) const
{
return 273.15 + 10; // 10°C
}
#endif
private:
Scalar permeability_;
Scalar porosity_;
......
add_executable(ff_flow_over_cube_3d EXCLUDE_FROM_ALL main_ff-reversed.cc)
add_executable(pm_flow_over_cube_3d EXCLUDE_FROM_ALL main_pm-reversed.cc)
target_link_libraries(ff_flow_over_cube_3d PRIVATE dumux-precice)
target_link_libraries(pm_flow_over_cube_3d PRIVATE dumux-precice)
# add a symlink for each input file
add_input_file_links()
# add a symlink for each preCICE configuration file
add_precice_file_links()
# Dummy test is needed to build porous media solver. The default
# `dumux_add_test` (and the underlying `dune_add_test`) only accept
# one target executable.
dumux_add_test(NAME dummytarget_to_build_pm_flow_over_cube_3d
TARGET pm_flow_over_cube_3d
LABELS freeflow stokes precice darcy 3d
TIMEOUT 5
COMMAND ${CMAKE_SOURCE_DIR}/test/return-test-passed.sh
)
#dumux_add_test(NAME dummytarget_to_build_ff_flow_over_cube_3d
# TARGET ff_flow_over_cube_3d
# LABELS freeflow stokes precice darcy 3d
# TIMEOUT 5
# COMMAND ${CMAKE_SOURCE_DIR}/test/return-test-passed.sh
#)
dumux_add_test(NAME test_ff_pm_flow_over_cube_3d
TARGET ff_flow_over_cube_3d pm_flow_over_cube_3d
LABELS freeflow stokes precice darcy
TIMEOUT 30
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/test/run-test.py
CMD_ARGS
--solver-one ${CMAKE_CURRENT_BINARY_DIR}/ff_flow_over_cube_3d
--solver-two ${CMAKE_CURRENT_BINARY_DIR}/pm_flow_over_cube_3d
--files ${CMAKE_SOURCE_DIR}/test/reference-solutions/flow-over-cube-3d/test_stokes_first_si_stokes.vtu
${CMAKE_CURRENT_BINARY_DIR}/ff-pm-3d-precice-stokes-00005.vtu
${CMAKE_SOURCE_DIR}/test/reference-solutions/flow-over-cube-3d/test_stokes_first_si_darcy.vtu
${CMAKE_CURRENT_BINARY_DIR}/ff-pm-3d-precice-darcy-00005.vtu
--dumux-param-file ${CMAKE_CURRENT_BINARY_DIR}/params.input
--precice-config-file ${CMAKE_CURRENT_BINARY_DIR}/precice-config.xml
--precice-iteration-files ${CMAKE_SOURCE_DIR}/test/reference-solutions/flow-over-cube-3d/test_stokes_first_si_coupliter_stokes.log ${CMAKE_CURRENT_BINARY_DIR}/precice-FreeFlow-iterations.log
--case-name "flow-over-cube_3d"
--relative 5e-6
--zeroThreshold {"velocity_liq \(m/s\)":1e-14,"p":1e-12}
)
set_tests_properties(test_ff_pm_flow_over_cube_3d PROPERTIES
ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/test:$ENV{PYTHONPATH})
\ No newline at end of file
......@@ -143,12 +143,14 @@ public:
*/
// \{
#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR < 5
/*!
* \brief Return the temperature within the domain in [K].
*
* This problem assumes a temperature of 10 degrees Celsius.
*/
Scalar temperature() const { return 273.15 + 10; } // 10°C
#endif
/*!
* \brief Return the sources within the domain.
......@@ -314,7 +316,11 @@ public:
using std::sqrt;
const Scalar dPdX = -deltaP_ / (this->gridGeometry().bBoxMax()[0] -
this->gridGeometry().bBoxMin()[0]);
#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR > 4
static const Scalar mu = FluidSystem::viscosity(273.15 + 10, 1e5);
#else
static const Scalar mu = FluidSystem::viscosity(temperature(), 1e5);
#endif
static const Scalar alpha =
getParam<Scalar>("Darcy.SpatialParams.AlphaBeaversJoseph");
static const Scalar K =
......
......@@ -17,7 +17,7 @@ Grading1 = 1
[FreeFlow.Problem]
Name = ff-pm-3d-precice-stokes
EnableInertiaTerms = false
#Name = navier-stokes-iterative-3d
#Name = ff-pm-3d-precice-navierstokes
#EnableInertiaTerms = true
PressureDifference = 1e-1
......
......@@ -33,7 +33,8 @@
#include <dumux/discretization/cctpfa.hh>
#include <dumux/porousmediumflow/1p/model.hh>
#include "../../common/porousmediumflowproblemwithgravity.hh"
#include <dumux/porousmediumflow/problem.hh>
//#include "../../common/porousmediumflowproblemwithgravity.hh"
#include "1pspatialparams.hh"
......@@ -89,9 +90,9 @@ struct SpatialParams<TypeTag, TTag::DarcyOneP> {
* \brief The porous medium flow sub problem
*/
template<class TypeTag>
class DarcySubProblem : public PorousMediumFlowProblemWithGravity<TypeTag>
class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
{
using ParentType = PorousMediumFlowProblemWithGravity<TypeTag>;
using ParentType = PorousMediumFlowProblem<TypeTag>;
using GridView =
typename GetPropType<TypeTag, Properties::GridGeometry>::GridView;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
......
......@@ -40,12 +40,12 @@
<write-data name="Velocity" mesh="DarcyMesh"/>
</participant>
<m2n:sockets from="FreeFlow" to="Darcy" distribution-type="gather-scatter" network="lo" />
<m2n:sockets from="FreeFlow" to="Darcy" network="lo" />
<coupling-scheme:serial-implicit>
<max-time value="1"/>
<timestep-length value="1" />
<time-window-size value="1" />
<max-iterations value="100"/>
......@@ -64,13 +64,13 @@
<extrapolation-order value="0"/>
<post-processing:IQN-ILS>
<acceleration:IQN-ILS>
<data mesh="DarcyMesh" name="Velocity" />
<initial-relaxation value="0.1" />
<max-used-iterations value="40" />
<timesteps-reused value="10" />
<time-windows-reused value="10" />
<filter type="QR2" limit="1e-3" />
</post-processing:IQN-ILS>
</acceleration:IQN-ILS>
</coupling-scheme:serial-implicit>
......
......@@ -13,7 +13,7 @@ add_precice_file_links()
# one target executable.
dumux_add_test(NAME dummy_test_ff_pm_part_flow_over_square_2d
TARGET pm_flow_over_square_2d
LABELS freeflow stokes precice darcy partitioned
LABELS freeflow stokes precice darcy
TIMEOUT 30
COMMAND ${CMAKE_SOURCE_DIR}/test/return-test-passed.sh
)
......@@ -21,7 +21,7 @@ dumux_add_test(NAME dummy_test_ff_pm_part_flow_over_square_2d
dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_si_st_first
TARGET ff_flow_over_square_2d
TARGET pm_flow_over_square_2d
LABELS freeflow stokes precice darcy partitioned
LABELS freeflow stokes precice darcy
TIMEOUT 30
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/test/run-test.py
......@@ -29,9 +29,9 @@ dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_si_st_first
--solver-one ${CMAKE_CURRENT_BINARY_DIR}/ff_flow_over_square_2d
--solver-two ${CMAKE_CURRENT_BINARY_DIR}/pm_flow_over_square_2d
--files ${CMAKE_SOURCE_DIR}/test/reference-solutions/flow-over-square-2d/test_stokes_first_si_stokes.vtu
${CMAKE_CURRENT_BINARY_DIR}/stokes-iterative-00005.vtu
${CMAKE_CURRENT_BINARY_DIR}/ff-pm-2d-precice-stokes-00005.vtu
${CMAKE_SOURCE_DIR}/test/reference-solutions/flow-over-square-2d/test_stokes_first_si_darcy.vtu
${CMAKE_CURRENT_BINARY_DIR}/darcy-iterative-00005.vtu
${CMAKE_CURRENT_BINARY_DIR}/ff-pm-2d-precice-darcy-00005.vtu
--dumux-param-file ${CMAKE_CURRENT_BINARY_DIR}/params-stokesdarcy.input
--precice-config-file ${CMAKE_CURRENT_BINARY_DIR}/precice-config-si-free-flow-first.xml
--precice-iteration-files ${CMAKE_SOURCE_DIR}/test/reference-solutions/flow-over-square-2d/test_stokes_first_si_coupliter_stokes.log ${CMAKE_CURRENT_BINARY_DIR}/precice-FreeFlow-iterations.log
......@@ -45,7 +45,7 @@ set_tests_properties(test_ff_pm_part_flow_over_square_2d_si_st_first PROPERTIES
dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_si_st_second
TARGET pm_flow_over_square_2d
TARGET ff_flow_over_square_2d
LABELS freeflow darcy precice darcy partitioned
LABELS freeflow darcy precice darcy
TIMEOUT 30
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/test/run-test.py
......@@ -53,9 +53,9 @@ dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_si_st_second
--solver-one ${CMAKE_CURRENT_BINARY_DIR}/ff_flow_over_square_2d
--solver-two ${CMAKE_CURRENT_BINARY_DIR}/pm_flow_over_square_2d
--files ${CMAKE_SOURCE_DIR}/test/reference-solutions/flow-over-square-2d/test_stokes_second_si_stokes.vtu
${CMAKE_CURRENT_BINARY_DIR}/stokes-iterative-00006.vtu
${CMAKE_CURRENT_BINARY_DIR}/ff-pm-2d-precice-stokes-00006.vtu
${CMAKE_SOURCE_DIR}/test/reference-solutions/flow-over-square-2d/test_stokes_second_si_darcy.vtu
${CMAKE_CURRENT_BINARY_DIR}/darcy-iterative-00006.vtu
${CMAKE_CURRENT_BINARY_DIR}/ff-pm-2d-precice-darcy-00006.vtu
--dumux-param-file ${CMAKE_CURRENT_BINARY_DIR}/params-stokesdarcy.input
--precice-config-file ${CMAKE_CURRENT_BINARY_DIR}/precice-config-si-free-flow-second.xml
--precice-iteration-files ${CMAKE_SOURCE_DIR}/test/reference-solutions/flow-over-square-2d/test_stokes_second_si_coupliter_darcy.log ${CMAKE_CURRENT_BINARY_DIR}/precice-Darcy-iterations.log
......@@ -68,7 +68,7 @@ set_tests_properties(test_ff_pm_part_flow_over_square_2d_si_st_second PROPERTIES
dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_pi_st
TARGET ff_flow_over_square_2d pm_flow_over_square_2d
LABELS freeflow stokes precice darcy partitioned
LABELS freeflow stokes precice darcy
TIMEOUT 30
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/test/run-test.py
......@@ -76,9 +76,9 @@ dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_pi_st
--solver-one ${CMAKE_CURRENT_BINARY_DIR}/ff_flow_over_square_2d
--solver-two ${CMAKE_CURRENT_BINARY_DIR}/pm_flow_over_square_2d
--files ${CMAKE_SOURCE_DIR}/test/reference-solutions/flow-over-square-2d/test_stokes_pi_stokes.vtu
${CMAKE_CURRENT_BINARY_DIR}/stokes-iterative-00007.vtu
${CMAKE_CURRENT_BINARY_DIR}/ff-pm-2d-precice-stokes-00007.vtu
${CMAKE_SOURCE_DIR}/test/reference-solutions/flow-over-square-2d/test_stokes_pi_darcy.vtu
${CMAKE_CURRENT_BINARY_DIR}/darcy-iterative-00007.vtu
${CMAKE_CURRENT_BINARY_DIR}/ff-pm-2d-precice-darcy-00007.vtu
--dumux-param-file ${CMAKE_CURRENT_BINARY_DIR}/params-stokesdarcy.input
--precice-config-file ${CMAKE_CURRENT_BINARY_DIR}/precice-config-pi.xml
--precice-iteration-files ${CMAKE_SOURCE_DIR}/test/reference-solutions/flow-over-square-2d/test_stokes_pi_coupliter_stokes.log
......@@ -101,7 +101,7 @@ set_property(TEST test_ff_pm_part_flow_over_square_2d_pi_st APPEND PROPERTY DEPE
dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_si_ns_first
TARGET ff_flow_over_square_2d pm_flow_over_square_2d
LABELS freeflow navierstokes precice darcy partitioned
LABELS freeflow navierstokes precice darcy
TIMEOUT 60
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/test/run-test.py
......@@ -109,9 +109,9 @@ dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_si_ns_first
--solver-one ${CMAKE_CURRENT_BINARY_DIR}/ff_flow_over_square_2d
--solver-two ${CMAKE_CURRENT_BINARY_DIR}/pm_flow_over_square_2d
--files ${CMAKE_SOURCE_DIR}/test/reference-solutions/flow-over-square-2d/test_navierstokes_first_si_navierstokes.vtu
${CMAKE_CURRENT_BINARY_DIR}/navierstokes-iterative-00006.vtu
${CMAKE_CURRENT_BINARY_DIR}/ff-pm-2d-precice-navierstokes-00006.vtu
${CMAKE_SOURCE_DIR}/test/reference-solutions/flow-over-square-2d/test_navierstokes_first_si_darcy.vtu
${CMAKE_CURRENT_BINARY_DIR}/darcy-iterative-00006.vtu
${CMAKE_CURRENT_BINARY_DIR}/ff-pm-2d-precice-darcy-00006.vtu
--dumux-param-file ${CMAKE_CURRENT_BINARY_DIR}/params-navierstokesdarcy.input
--precice-config-file ${CMAKE_CURRENT_BINARY_DIR}/precice-config-si-free-flow-first.xml
--precice-iteration-files ${CMAKE_SOURCE_DIR}/test/reference-solutions/flow-over-square-2d/test_navierstokes_first_si_coupliter_navierstokes.log ${CMAKE_CURRENT_BINARY_DIR}/precice-FreeFlow-iterations.log
......@@ -124,7 +124,7 @@ set_tests_properties(test_ff_pm_part_flow_over_square_2d_si_ns_first PROPERTIES
dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_si_ns_second
TARGET ff_flow_over_square_2d pm_flow_over_square_2d
LABELS freeflow darcy precice darcy partitioned
LABELS freeflow darcy precice darcy
TIMEOUT 60
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/test/run-test.py
......@@ -132,9 +132,9 @@ dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_si_ns_second
--solver-one ${CMAKE_CURRENT_BINARY_DIR}/ff_flow_over_square_2d
--solver-two ${CMAKE_CURRENT_BINARY_DIR}/pm_flow_over_square_2d
--files ${CMAKE_SOURCE_DIR}/test/reference-solutions/flow-over-square-2d/test_navierstokes_second_si_navierstokes.vtu
${CMAKE_CURRENT_BINARY_DIR}/navierstokes-iterative-00007.vtu
${CMAKE_CURRENT_BINARY_DIR}/ff-pm-2d-precice-navierstokes-00007.vtu
${CMAKE_SOURCE_DIR}/test/reference-solutions/flow-over-square-2d/test_navierstokes_second_si_darcy.vtu
${CMAKE_CURRENT_BINARY_DIR}/darcy-iterative-00007.vtu
${CMAKE_CURRENT_BINARY_DIR}/ff-pm-2d-precice-darcy-00007.vtu
--dumux-param-file ${CMAKE_CURRENT_BINARY_DIR}/params-navierstokesdarcy.input
--precice-config-file ${CMAKE_CURRENT_BINARY_DIR}/precice-config-si-free-flow-second.xml
--precice-iteration-files ${CMAKE_SOURCE_DIR}/test/reference-solutions/flow-over-square-2d/test_navierstokes_second_si_coupliter_darcy.log ${CMAKE_CURRENT_BINARY_DIR}/precice-Darcy-iterations.log
......@@ -147,7 +147,7 @@ set_tests_properties(test_ff_pm_part_flow_over_square_2d_si_ns_second PROPERTIES
dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_pi_ns
TARGET ff_flow_over_square_2d pm_flow_over_square_2d
LABELS freeflow navierstokes precice darcy partitioned
LABELS freeflow navierstokes precice darcy
TIMEOUT 60
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/test/run-test.py
......@@ -155,9 +155,9 @@ dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_pi_ns
--solver-one ${CMAKE_CURRENT_BINARY_DIR}/ff_flow_over_square_2d
--solver-two ${CMAKE_CURRENT_BINARY_DIR}/pm_flow_over_square_2d
--files ${CMAKE_SOURCE_DIR}/test/reference-solutions/flow-over-square-2d/test_navierstokes_pi_navierstokes.vtu
${CMAKE_CURRENT_BINARY_DIR}/navierstokes-iterative-00011.vtu
${CMAKE_CURRENT_BINARY_DIR}/ff-pm-2d-precice-navierstokes-00011.vtu
${CMAKE_SOURCE_DIR}/test/reference-solutions/flow-over-square-2d/test_navierstokes_pi_darcy.vtu
${CMAKE_CURRENT_BINARY_DIR}/darcy-iterative-00011.vtu
${CMAKE_CURRENT_BINARY_DIR}/ff-pm-2d-precice-darcy-00011.vtu
--dumux-param-file ${CMAKE_CURRENT_BINARY_DIR}/params-navierstokesdarcy.input
--precice-config-file ${CMAKE_CURRENT_BINARY_DIR}/precice-config-pi.xml
--precice-iteration-files ${CMAKE_SOURCE_DIR}/test/reference-solutions/flow-over-square-2d/test_navierstokes_pi_coupliter_navierstokes.log
......
......@@ -117,26 +117,26 @@ clean_up_dir
##################
run_test_case params-stokesdarcy.input ./precice-config-si-stokes-first.xml
move_result_to_dir "test_stokes_first_si" "../../reference-solutions/partitioned/flow-over-square-2d/"
move_result_to_dir "test_stokes_first_si" "../../reference-solutions/flow-over-square-2d/"
run_test_case ./params-stokesdarcy.input ./precice-config-si-stokes-second.xml
move_result_to_dir "test_stokes_second_si" "../../reference-solutions/partitioned/flow-over-square-2d/"
move_result_to_dir "test_stokes_second_si" "../../reference-solutions/flow-over-square-2d/"
run_test_case ./params-stokesdarcy.input ./precice-config-pi.xml
move_result_to_dir "test_stokes_pi" "../../reference-solutions/partitioned/flow-over-square-2d/"
move_result_to_dir "test_stokes_pi" "../../reference-solutions/flow-over-square-2d/"
##################
# Navier-Stokes
##################
run_test_case ./params-navierstokesdarcy.input ./precice-config-si-stokes-first.xml
move_result_to_dir "test_navierstokes_first_si" "../../reference-solutions/partitioned/flow-over-square-2d/"
move_result_to_dir "test_navierstokes_first_si" "../../reference-solutions/flow-over-square-2d/"
run_test_case ./params-navierstokesdarcy.input ./precice-config-si-stokes-second.xml
move_result_to_dir "test_navierstokes_second_si" "../../reference-solutions/partitioned/flow-over-square-2d/"
move_result_to_dir "test_navierstokes_second_si" "../../reference-solutions/flow-over-square-2d/"
run_test_case ./params-navierstokesdarcy.input ./precice-config-pi.xml
move_result_to_dir "test_navierstokes_pi" "../../reference-solutions/partitioned/flow-over-square-2d/"
move_result_to_dir "test_navierstokes_pi" "../../reference-solutions/flow-over-square-2d/"
exit 0
\ No newline at end of file
......@@ -16,13 +16,13 @@ Cells = 40 40
Grading1 = 1
[FreeFlow.Problem]
Name = navierstokes-iterative
Name = ff-pm-2d-precice-navierstokes
EnableInertiaTerms = true
PressureDifference = 1e-4
[Darcy.Problem]
Name = darcy-iterative
Name = ff-pm-2d-precice-darcy
InitialP = 0.0e-9
[Darcy.SpatialParams]
......
......@@ -16,15 +16,15 @@ Cells = 40 40
Grading1 = 1
[FreeFlow.Problem]
Name = stokes-iterative
Name = ff-pm-2d-precice-stokes
EnableInertiaTerms = false
#Name = navier-stokes-iterative
#Name = ff-pm-2d-precice-navierstokes
#EnableInertiaTerms = true
PressureDifference = 1e-2
[Darcy.Problem]
Name = darcy-iterative
Name = ff-pm-2d-precice-darcy
InitialP = 0.0e-9
[Darcy.SpatialParams]
......
TimeWindow TotalIterations Iterations Convergence QNColumns DeletedQNColumns DroppedQNColumns
1 4 4 1 2 1 0
\ No newline at end of file
Supports Markdown
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