diff --git a/dune/dorie/interface/coupled_simulation.hh b/dune/dorie/interface/coupled_simulation.hh index 6ae29f23971c04df0223772bb0d706c243fabb33..365855e1430ece7665fe0f2ce7e58c8caca007c4 100644 --- a/dune/dorie/interface/coupled_simulation.hh +++ b/dune/dorie/interface/coupled_simulation.hh @@ -14,7 +14,7 @@ private: using RichardsSimulationTraits = Dune::Dorie::RichardsSimulationTraits; using TransportSimulationTraits = Dune::Dorie::TransportSimulationTraits< BaseTraits, - typename RichardsSimulationTraits::GFWaterFlux, + typename RichardsSimulationTraits::GFWaterFluxReconstruction, typename RichardsSimulationTraits::GFSaturation >; public: @@ -41,7 +41,7 @@ private: using GridMapper = typename Traits::GridMapper; using GFSaturationPtr = std::shared_ptr; - using GFWaterFluxPtr = std::shared_ptr; + using GFWaterFluxPtr = std::shared_ptr; using TimeField = typename Traits::TimeField; using TimeInterval = typename Traits::TimeInterval; diff --git a/dune/dorie/interface/richards_simulation.hh b/dune/dorie/interface/richards_simulation.hh index d8c4af52a1f2a667705198352dd06d69f73802ba..bfcb3af9e6e8b55f4e208d0371a2b7f111ce7042 100644 --- a/dune/dorie/interface/richards_simulation.hh +++ b/dune/dorie/interface/richards_simulation.hh @@ -360,7 +360,7 @@ public: return satdgf; } - std::shared_ptr get_waterflux() + std::shared_ptr get_waterflux() { update_adapters(); assert(waterfrgf); diff --git a/test/test-transport-layered.mini.in b/test/test-transport-layered.mini.in index 98363c86ad6deb32d0e654a601da3420ff1d2cdd..189f1a5d257ff5e36982abe7ad865998d263b3f8 100644 --- a/test/test-transport-layered.mini.in +++ b/test/test-transport-layered.mini.in @@ -6,10 +6,10 @@ _test_command = run _asset_path = "${CMAKE_CURRENT_LIST_DIR}" grid.gridType = rectangular -grid.initialLevel = 0 -grid.cells = 50 50 - -adaptivity.useAdaptivity = false +grid.initialLevel = 2 +grid.cells = 20 20 +grid.mappingFile = "{_asset_path}/maps/cell_ids.h5" +grid.mappingFileDataset = grid_test_2d #### Richards parameters #### @@ -40,4 +40,4 @@ time.end = 2E5 time.maxTimestep = 1E4 time.startTimestep = 1E2 -numerics.timestepMethod = alex2, explicit_euler | expand timescheme \ No newline at end of file +numerics.timestepMethod = implicit_euler, explicit_euler | expand timescheme \ No newline at end of file diff --git a/test/test-transport-miller.mini.in b/test/test-transport-miller.mini.in index 7cbb71dec8de22bb9ed4a74efd5baa4d1c8c0e60..ae0433f1d97f4b364770b0021cb22c4cde114893 100644 --- a/test/test-transport-miller.mini.in +++ b/test/test-transport-miller.mini.in @@ -39,4 +39,4 @@ transport.time.end = 2E5 transport.time.maxTimestep = 1E4 transport.time.startTimestep = 1E2 -transport.numerics.timestepMethod = alex2, explicit_euler | expand timescheme \ No newline at end of file +transport.numerics.timestepMethod = implicit_euler, explicit_euler | expand timescheme \ No newline at end of file diff --git a/test/test-transport-muphi.mini.in b/test/test-transport-muphi.mini.in index 9a4c032d8e1e4c449514d501df412f1d1a641a80..fadc569f591c2daa794c5ecb74266c0150680575 100644 --- a/test/test-transport-muphi.mini.in +++ b/test/test-transport-muphi.mini.in @@ -44,4 +44,4 @@ time.end = 2E5 time.maxTimestep = 1E4 time.startTimestep = 1E2 -numerics.timestepMethod = alex2, explicit_euler | expand timescheme \ No newline at end of file +numerics.timestepMethod = implicit_euler, explicit_euler | expand timescheme \ No newline at end of file diff --git a/test/test-transport-sand.mini.in b/test/test-transport-sand.mini.in index 75b4124df1721ba6a78ee5895f2132e1c7039c8f..2557a19db03b50aec4f3ba0e4697bb2f835905ab 100644 --- a/test/test-transport-sand.mini.in +++ b/test/test-transport-sand.mini.in @@ -40,4 +40,4 @@ time.end = 2E5 time.maxTimestep = 1E4 time.startTimestep = 1E2 -numerics.timestepMethod = alex2, explicit_euler | expand timescheme \ No newline at end of file +numerics.timestepMethod = implicit_euler, explicit_euler | expand timescheme \ No newline at end of file diff --git a/test/test-transport-silt.mini.in b/test/test-transport-silt.mini.in index ea82f1227f5e6c37a5ec3b8772708ebd3458c4bb..54e5a4daffe134b3926b9eb804bd37cccc4e8f0e 100644 --- a/test/test-transport-silt.mini.in +++ b/test/test-transport-silt.mini.in @@ -40,4 +40,4 @@ time.end = 2E5 time.maxTimestep = 1E4 time.startTimestep = 1E2 -numerics.timestepMethod = alex2, explicit_euler | expand timescheme \ No newline at end of file +numerics.timestepMethod = implicit_euler, explicit_euler | expand timescheme \ No newline at end of file