Commit 605585ee authored by Alexander Kissinger's avatar Alexander Kissinger
Browse files

The co2ni tests were moved to the co2 folder. The co2ni folder was deleted.

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14135 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent b5604a68
......@@ -98,7 +98,6 @@ AC_CONFIG_FILES([dumux.pc
test/implicit/3p/Makefile
test/implicit/3p3c/Makefile
test/implicit/co2/Makefile
test/implicit/co2ni/Makefile
test/implicit/mpnc/Makefile
test/implicit/richards/Makefile
test/common/Makefile
......
......@@ -6,6 +6,5 @@ add_subdirectory("2pdfm")
add_subdirectory("3p")
add_subdirectory("3p3c")
add_subdirectory("co2")
add_subdirectory("co2ni")
add_subdirectory("mpnc")
add_subdirectory("richards")
......@@ -7,7 +7,6 @@ SUBDIRS = \
3p \
3p3c \
co2 \
co2ni \
mpnc \
richards
......
......@@ -20,3 +20,20 @@ add_dumux_test(test_restartco2 test_ccco2 test_ccco2.cc
${CMAKE_CURRENT_BINARY_DIR}/heterogeneousbox-00020.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_boxco2
-ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_restartco2.input)
# build target for the CO2 non-isothermal test problem
add_dumux_test(test_boxco2ni test_boxco2ni test_boxco2ni.cc
${CMAKE_SOURCE_DIR}/bin/runTest.sh
${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
${CMAKE_SOURCE_DIR}/test/references/co2nibox-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/heterogeneousboxni-00020.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_boxco2ni)
add_dumux_test(test_ccco2ni test_ccco2ni test_ccco2ni.cc
${CMAKE_SOURCE_DIR}/bin/runTest.sh
${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
${CMAKE_SOURCE_DIR}/test/references/co2nicc-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/heterogeneousccni-00019.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ccco2ni)
check_PROGRAMS = test_boxco2 test_ccco2
check_PROGRAMS = test_boxco2 \
test_ccco2 \
test_boxco2ni \
test_ccco2ni
noinst_HEADERS := $(wildcard *.hh)
EXTRA_DIST = CMakeLists.txt $(wildcard *.input) $(wildcard grids/*.dgf) co2values.inc
test_boxco2_SOURCES = test_boxco2.cc
test_ccco2_SOURCES = test_ccco2.cc
test_boxco2ni_SOURCES = test_boxco2ni.cc
test_ccco2ni_SOURCES = test_ccco2ni.cc
include $(top_srcdir)/am/global-rules
......@@ -103,8 +103,6 @@ SET_BOOL_PROP(HeterogeneousProblem, UseMoles, false);
* The model is able to use either mole or mass fractions. The property useMoles can be set to either true or false in the
* problem file. Make sure that the according units are used in the problem setup. The default setting for useMoles is false.
*
* This problem uses the \ref OnePTwoCModel model.
*
* To run the simulation execute the following line in shell (works with the box and cell centered spatial discretization method):
* <tt>./test_ccco2 </tt> or <tt>./test_boxco2 </tt>
*/
......
......@@ -21,8 +21,8 @@
*
* \brief Definition of a problem, where CO2 is injected in a reservoir.
*/
#ifndef DUMUX_HETEROGENEOUS_NI_PROBLEM_NI_HH
#define DUMUX_HETEROGENEOUS_NI_PROBLEM_NI_HH
#ifndef DUMUX_HETEROGENEOUS_PROBLEM_NI_HH
#define DUMUX_HETEROGENEOUS_PROBLEM_NI_HH
#if HAVE_ALUGRID
#include <dune/grid/alugrid/2d/alugrid.hh>
......@@ -33,18 +33,15 @@
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
#endif
#include <dumux/implicit/2p2c/2p2cmodel.hh>
#include <dumux/implicit/co2/co2volumevariables.hh>
#include <dumux/implicit/co2/co2model.hh>
#include <dumux/material/fluidsystems/brineco2fluidsystem.hh>
#include <dumux/implicit/common/implicitporousmediaproblem.hh>
#include <dumux/implicit/box/intersectiontovertexbc.hh>
#include <test/implicit/co2/heterogeneousspatialparameters.hh>
#include "heterogeneousspatialparameters.hh"
#include "heterogeneousco2tables.hh"
#define ISOTHERMAL 0
namespace Dumux
{
......@@ -72,7 +69,7 @@ SET_TYPE_PROP(HeterogeneousNIProblem, Problem, Dumux::HeterogeneousNIProblem<Typ
SET_TYPE_PROP(HeterogeneousNIProblem, FluidSystem, Dumux::BrineCO2FluidSystem<TypeTag>);
// Set the CO2 table to be used; in this case not the the default table
SET_TYPE_PROP(HeterogeneousNIProblem, CO2Table, Dumux::Heterogeneous::CO2Tables);
SET_TYPE_PROP(HeterogeneousNIProblem, CO2Table, Dumux::HeterogeneousCO2Tables::CO2Tables);
// Set the salinity mass fraction of the brine in the reservoir
SET_SCALAR_PROP(HeterogeneousNIProblem, ProblemSalinity, 1e-1);
......@@ -142,8 +139,8 @@ class HeterogeneousNIProblem : public ImplicitPorousMediaProblem<TypeTag>
conti0EqIdx = Indices::conti0EqIdx,
contiCO2EqIdx = conti0EqIdx + CO2Idx,
#if !ISOTHERMAL
temperatureIdx = CO2Idx +1,
energyEqIdx = contiCO2EqIdx +1,
temperatureIdx = Indices::temperatureIdx,
energyEqIdx = Indices::energyEqIdx,
#endif
};
......@@ -178,7 +175,7 @@ public:
const GridView &gridView)
: ParentType(timeManager, GridCreator::grid().leafGridView()),
//Boundary Id Setup:
injectionTop_ (1),
injectionTop_(1),
injectionBottom_(2),
dirichletBoundary_(3),
noFlowBoundary_(4),
......@@ -507,7 +504,7 @@ private:
Scalar temp = temperature_(globalPos);
Scalar densityW = FluidSystem::Brine::liquidDensity(temp, 1e7);
Scalar pl = 1e5 - densityW*this->gravity()[dimWorld-1]*(depthBOR_ - globalPos[dimWorld-1]);
Scalar pl = 1e5 - densityW*this->gravity()[dim-1]*(depthBOR_ - globalPos[dim-1]);
Scalar moleFracLiquidCO2 = 0.00;
Scalar moleFracLiquidBrine = 1.0 - moleFracLiquidCO2;
......@@ -528,7 +525,7 @@ private:
Scalar temperature_(const GlobalPosition globalPos) const
{
Scalar T = 283.0 + (depthBOR_ - globalPos[dimWorld-1])*0.03;
Scalar T = 283.0 + (depthBOR_ - globalPos[dim-1])*0.03;
return T;
}
......
......@@ -19,7 +19,7 @@
/*!
* \file
*
* \brief Test for the 2p2c box model.
* \brief Test for the CO2 non-isothermal box model.
*/
#include "config.h"
#include "heterogeneousproblemni.hh"
......
......@@ -19,7 +19,7 @@
/*!
* \file
*
* \brief Test for the 2p2c CC model.
* \brief Test for the CO2 non-isothermal CC model.
*/
#include "config.h"
#include "heterogeneousproblemni.hh"
......
# build target for the CO2 non-isothermal test problem
add_dumux_test(test_boxco2ni test_boxco2ni test_boxco2ni.cc
${CMAKE_SOURCE_DIR}/bin/runTest.sh
${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
${CMAKE_SOURCE_DIR}/test/references/co2nibox-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/heterogeneousboxni-00020.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_boxco2ni)
add_dumux_test(test_ccco2ni test_ccco2ni test_ccco2ni.cc
${CMAKE_SOURCE_DIR}/bin/runTest.sh
${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
${CMAKE_SOURCE_DIR}/test/references/co2nicc-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/heterogeneousccni-00019.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ccco2ni)
check_PROGRAMS = test_boxco2ni test_ccco2ni
noinst_HEADERS := $(wildcard *.hh)
EXTRA_DIST = CMakeLists.txt $(wildcard *.input) $(wildcard grids/*.dgf) co2values.inc
test_boxco2ni_SOURCES = test_boxco2ni.cc
test_ccco2ni_SOURCES = test_ccco2ni.cc
include $(top_srcdir)/am/global-rules
This diff is collapsed.
This diff is collapsed.
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*****************************************************************************
* See the file COPYING for full copying permissions. *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
/**
* \file
*
* \brief Provides the class with the tabulated values of CO2 density
* and enthalpy
*/
#ifndef DUMUX_HETEROGENEOUS_NI_CO2TABLES_HH
#define DUMUX_HETEROGENEOUS_NI_CO2TABLES_HH
#include <cassert>
#include <dumux/material/components/co2tablereader.hh>
namespace Dumux
{
namespace Heterogeneous
{
// the real work is done by some external program which provides
// ready-to-use tables.
#include "co2values.inc"
}
}
#endif
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