Commit fb82864a authored by Johannes Hommel's avatar Johannes Hommel Committed by Timo Koch
Browse files

[cleanup][test] Rename co2 tests

parent 8f8a670f
......@@ -55,7 +55,7 @@
#include <dumux/material/fluidstates/temperatureoverlay.hh>
// for co2, include the tables of the co2 test
#include <test/porousmediumflow/co2/implicit/heterogeneousco2tables.hh>
#include <test/porousmediumflow/co2/implicit/co2tables.hh>
int main()
{
......
......@@ -6,55 +6,54 @@ dune_symlink_to_source_files(FILES grids)
# but the default 2p2c implementation outputs porosity per vertex.
# Depending on the order of the elements, the porosity would differ in these cases.
dune_add_test(NAME test_co2_box
SOURCES test_co2_fv.cc
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=HeterogeneousBox
CMAKE_GUARD "( dune-alugrid_FOUND AND DUNE_GRID_EXPERIMENTAL_GRID_EXTENSIONS )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/co2box-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/co2_box-00019.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_co2_box test_co2_fv.input -Problem.Name co2_box"
--files ${CMAKE_SOURCE_DIR}/test/references/test_co2_box-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_co2_box-00019.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_co2_box params.input -Problem.Name test_co2_box"
--zeroThreshold {"porosity":1})
dune_add_test(NAME test_co2_tpfa
SOURCES test_co2_fv.cc
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=HeterogeneousCCTpfa
CMAKE_GUARD "( dune-alugrid_FOUND AND DUNE_GRID_EXPERIMENTAL_GRID_EXTENSIONS )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/co2cc-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/co2_tpfa-00018.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_co2_tpfa test_co2_fv.input -Problem.Name co2_tpfa")
--files ${CMAKE_SOURCE_DIR}/test/references/test_co2_tpfa-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_co2_tpfa-00018.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_co2_tpfa params.input -Problem.Name test_co2_tpfa")
# build target for the CO2 non-isothermal test problem
dune_add_test(NAME test_co2ni_box
SOURCES test_co2_fv.cc
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=HeterogeneousNIBox
ISOTHERMAL=0
CMAKE_GUARD "( dune-alugrid_FOUND AND DUNE_GRID_EXPERIMENTAL_GRID_EXTENSIONS )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/co2nibox-reference.vtu
--files ${CMAKE_SOURCE_DIR}/test/references/test_co2ni_box-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/co2ni_box-00019.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_co2ni_box test_co2ni_fv.input -Problem.Name co2ni_box"
--command "${CMAKE_CURRENT_BINARY_DIR}/test_co2ni_box paramsni.input -Problem.Name test_co2ni_box"
--zeroThreshold {"porosity":1})
dune_add_test(NAME test_co2ni_tpfa
SOURCES test_co2_fv.cc
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=HeterogeneousNICCTpfa
ISOTHERMAL=0
CMAKE_GUARD "( dune-alugrid_FOUND AND DUNE_GRID_EXPERIMENTAL_GRID_EXTENSIONS )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/co2nicc-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/co2ni_tpfa-00018.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_co2ni_tpfa test_co2ni_fv.input -Problem.Name co2ni_tpfa")
--files ${CMAKE_SOURCE_DIR}/test/references/test_co2ni_tpfa-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_co2ni_tpfa-00018.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_co2ni_tpfa paramsni.input -Problem.Name test_co2ni_tpfa")
#install sources
install(FILES
heterogeneousco2tables.hh
heterogeneousproblem.hh
heterogeneousproblemni.hh
heterogeneousspatialparameters.hh
test_co2_fv.cc
co2tables.hh
problem.hh
spatialparams.hh
main.cc
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/co2)
This diff is collapsed.
This diff is collapsed.
......@@ -49,7 +49,7 @@
#include <dumux/io/grid/gridmanager.hh>
// the problem definitions
#include "heterogeneousproblem.hh"
#include "problem.hh"
int main(int argc, char** argv) try
{
......
......@@ -39,8 +39,8 @@
#include <dumux/material/fluidsystems/brineco2.hh>
#include <dumux/discretization/box/scvftoscvboundarytypes.hh>
#include "heterogeneousspatialparameters.hh"
#include "heterogeneousco2tables.hh"
#include "spatialparams.hh"
#include "co2tables.hh"
// per default use isothermal model
#ifndef ISOTHERMAL
......
[TimeManager]
DtInitial = 33223.9# [s]
TEnd = 1e6# [s]
[Grid]
File = ./grids/heterogeneousSmall.dgf # relative path to the grid file
[FluidSystem]
NTemperature = 100 # [-] number of tabularization entries
NPressure = 100 # [-] number of tabularization entries
PressureLow = 1e5# [Pa] low end for tabularization of fluid properties
PressureHigh = 3e7# [Pa] high end for tabularization of fluid properties
TemperatureLow = 290.00 # [Pa] low end for tabularization of fluid properties
TemperatureHigh = 331.00 # [Pa] high end for tabularization of fluid properties
[Problem]
Name = heterogeneousbox # [-] the name of the output files
EnableGravity = TRUE
DepthBOR = 1200# [m] depth below ground surface
InjectionRate = 1e-4 # [kg/sq/s]
[Vtk]
AddVelocity = FALSE
[LinearSolver]
ResidualReduction = 1e-10
[TimeManager]
Restart = 65460.8
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