Commit fa398126 authored by Katharina Heck's avatar Katharina Heck

Merge branch 'freeflow/gridvariablesupdate_fix' into 'master'

[assembly] update the GridVriables at the end of each timestep

Closes #650

See merge request !1484
parents bde9f86a 15b4523f
......@@ -10,7 +10,7 @@ dune_add_test(NAME test_ff_rans_lauferpipe_kepsilon_twolayers
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans_lauferpipe_kepsilon_twolayers-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_kepsilon_twolayers-00052.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_kepsilon_twolayers-00070.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_kepsilon params.input
-Problem.Name test_ff_rans_lauferpipe_kepsilon_twolayers")
......@@ -21,7 +21,7 @@ dune_add_test(NAME test_ff_rans_lauferpipe_kepsilon_wallfunction
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans_lauferpipe_kepsilon_wallfunction-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_kepsilon_wallfunction-00029.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_kepsilon_wallfunction-00034.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_kepsilon params_wallfunction.input
-Problem.Name test_ff_rans_lauferpipe_kepsilon_wallfunction")
......@@ -32,7 +32,7 @@ dune_add_test(NAME test_ff_rans_lauferpipe_lowrekepsilon
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans_lauferpipe_lowrekepsilon-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_lowrekepsilon-00066.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_lowrekepsilon-00053.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_lowrekepsilon params.input
-Problem.Name test_ff_rans_lauferpipe_lowrekepsilon")
target_compile_definitions(test_ff_rans_lauferpipe_lowrekepsilon PUBLIC "LOWREKEPSILON=1")
......@@ -44,7 +44,7 @@ dune_add_test(NAME test_ff_rans_lauferpipe_komega
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans_lauferpipe_komega-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_komega-00055.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_komega-00049.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_komega params.input
-Problem.Name test_ff_rans_lauferpipe_komega")
target_compile_definitions(test_ff_rans_lauferpipe_komega PUBLIC "KOMEGA=1")
......@@ -56,7 +56,7 @@ dune_add_test(NAME test_ff_rans_lauferpipe_oneeq
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans_lauferpipe_oneeq-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_oneeq-00046.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_oneeq-00044.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_oneeq params.input
-Problem.Name test_ff_rans_lauferpipe_oneeq")
target_compile_definitions(test_ff_rans_lauferpipe_oneeq PUBLIC "ONEEQ=1")
......@@ -68,7 +68,7 @@ dune_add_test(NAME test_ff_rans_lauferpipe_zeroeq
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans_lauferpipe_zeroeq-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_zeroeq-00044.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_zeroeq-00035.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_zeroeq params.input
-Problem.Name test_ff_rans_lauferpipe_zeroeq")
......
......@@ -167,6 +167,7 @@ int main(int argc, char** argv) try
// update wall properties
problem->updateDynamicWallProperties(x);
assembler->updateGridVariables(x);
// advance to the time loop to the next step
timeLoop->advanceTimeStep();
......
......@@ -16,7 +16,7 @@ dune_add_test(NAME test_ff_rans2cni_kepsilon_twolayer
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans2cni_kepsilon_twolayer-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_kepsilon_twolayer-00033.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_kepsilon_twolayer-00031.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_kepsilon params_nonisothermal.input
-Problem.Name test_ff_rans2cni_kepsilon_twolayer")
......@@ -44,7 +44,7 @@ dune_add_test(NAME test_ff_rans2cni_komega
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans2cni_komega-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_komega-00032.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_komega-00031.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_komega params_nonisothermal.input
-Problem.Name test_ff_rans2cni_komega
-Newton.TargetSteps 12")
......@@ -63,7 +63,7 @@ dune_add_test(NAME test_ff_rans2cni_lowrekepsilon
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans2cni_lowrekepsilon-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_lowrekepsilon-00032.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_lowrekepsilon-00030.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_lowrekepsilon params_nonisothermal.input
-Problem.Name test_ff_rans2cni_lowrekepsilon")
target_compile_definitions(test_ff_rans2cni_lowrekepsilon PUBLIC "LOWREKEPSILON=1" "NONISOTHERMAL=1")
......@@ -93,7 +93,7 @@ dune_add_test(NAME test_ff_rans2c_zeroeq
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans2c_zeroeq.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2c_zeroeq-00031.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2c_zeroeq-00029.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2c_zeroeq params.input
-Problem.Name test_ff_rans2c_zeroeq")
......@@ -103,8 +103,8 @@ dune_add_test(NAME test_ff_rans2cni_zeroeq
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans2cni_zeroeq.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_zeroeq-00032.vtu
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans2cni_zeroeq-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_zeroeq-00030.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_zeroeq params_nonisothermal.input
-Problem.Name test_ff_rans2cni_zeroeq")
target_compile_definitions(test_ff_rans2cni_zeroeq PUBLIC "NONISOTHERMAL=1")
......@@ -166,6 +166,7 @@ int main(int argc, char** argv) try
// update wall properties
problem->updateDynamicWallProperties(x);
assembler->updateGridVariables(x);
// write vtk output
vtkWriter.write(timeLoop->time());
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
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