Commit 8e44397b authored by Kilian Weishaupt's avatar Kilian Weishaupt
Browse files

[2pLiquidVapor][misc] Various fixes

*Clean-up
*Add cc test
parent 3cee1795
#install headers
install(FILES
fluxvariables.hh
indices.hh
localresidual.hh
model.hh
newtoncontroller.hh
properties.hh
propertydefaults.hh
volumevariables.hh
......
......@@ -126,8 +126,8 @@ public:
onBoundary);
flux = 0;
asImp_()->computeMyAdvectiveFlux(flux, fluxVars); //Method is called "computeMyAdvectiveFlux"
// to prevent overwrite by nilocalresidual.hh
asImp_()->computeAdvectiveMassFlux(flux, fluxVars); //Method is called "computeAdvectiveMassFlux"
// to prevent overwrite by nilocalresidual.hh
asImp_()->computeDiffusiveFlux(flux, fluxVars);
}
......@@ -139,7 +139,7 @@ public:
* \param fluxVars The flux variables at the current SCV
*/
void computeMyAdvectiveFlux(PrimaryVariables &flux, const FluxVariables &fluxVars) const
void computeAdvectiveMassFlux(PrimaryVariables &flux, const FluxVariables &fluxVars) const
{
Scalar massUpwindWeight = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, MassUpwindWeight);
......
......@@ -7,3 +7,10 @@ add_dumux_test(test_boxsteaminjection test_boxsteaminjection test_boxsteaminject
--files ${CMAKE_SOURCE_DIR}/test/references/1ptestbox-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/1ptestbox-00001.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_box1p")
add_dumux_test(test_ccsteaminjection test_ccsteaminjection test_ccsteaminjection.cc
python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
--script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/1ptestbox-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/1ptestbox-00001.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_box1p")
###############################################################
# Parameter file for 2pni_hot_well.
# Everything behind a '#' is a comment.
# Type "./test_2pni --help" for more information.
###############################################################
###############################################################
# Mandatory arguments
###############################################################
[TimeManager]
DtInitial = 10 # 250[s]
TEnd = 1036800 # [s] equals 12 days
MaxTimeStepSize = 500 #
[Grid]
File = ./grids/pieceofcake_preheat_fine.dgf
[Problem]
Name = field
WriteAllTimeSteps = 1
PreheatZone = none #choose preheat zone: full, half, stripe or none
MassRate = 0.05
[Newton]
MaxSteps = 10
[SpatialParams]
temp=10 # groundwater temperature [°C]
Porosity = 0.4
Permeability = 1e-11 #intrinsic permeabilty [m^2]
KHorToKVert = 1
Well = default # choose the well to simulate: Br38 / I6 / EK2
###############################################################
# Simulation restart
#
# DuMux simulations can be restarted from *.drs files
# Set Restart to the value of a specific file,
# e.g.: 'Restart = 27184.1' for the restart file
# name_time=27184.1_rank=0.drs
# Please comment in the two lines below, if restart is desired.
###############################################################
# [TimeManager]
# Restart = ...
......@@ -28,7 +28,7 @@
#include <dumux/porousmediumflow/2pliquidvapor/implicit/model.hh>
#include <dumux/porousmediumflow/implicit/problem.hh>
#include "conceptspatialparams.hh"
#include "steaminjectionspatialparams.hh"
#include <dumux/material/components/tabulatedcomponent.hh>
#include <dumux/material/components/h2o.hh>
......
###############################################################
# Parameter file for test_2p.
# Everything behind a '#' is a comment.
# Type "./test_2p --help" for more information.
###############################################################
###############################################################
# Mandatory arguments
###############################################################
[TimeManager]
DtInitial = 250 # [s]
TEnd = 129600 # [s]
......@@ -16,37 +6,5 @@ TEnd = 129600 # [s]
UpperRight = 5 7
Cells = 50 70
[Problem]
Name = test_boxsteaminjection # name passed to the output routines
[SpatialParams]
KHorToKVert = 3
Well = Br38 # choose the well to simulate: Br38 / I6 / EK2 /default
Porosity = 0.4
Permeability = 1e-11 # default permeability of no well is chosen
[ Newton ]
#MaxIterations = 1000
#AbsTolerance = 9e-1
#EnableAbsoluteCriterion = 1
EnableShiftCriterion = 1
MaxRelativeShift = 1e-06
UseLineSearch = 0
MaxSteps = 15
#SatisfyAbsAndRel = 0
WriteConvergence = 0
###############################################################
# Simulation restart
#
# DuMux simulations can be restarted from *.drs files
# Set Restart to the value of a specific file,
# e.g.: 'Restart = 27184.1' for the restart file
# name_time=27184.1_rank=0.drs
# Please comment in the two lines below, if restart is desired.
###############################################################
# [TimeManager]
# Restart = ...
......@@ -19,10 +19,10 @@
/*!
* \file
*
* \brief Injection of superheated water
* \brief Validation of the 2p1cni model
*/
#include "config.h"
#include "conceptsuperheatedproblem.hh"
#include "steaminjectionproblem.hh"
#include <dumux/common/start.hh>
/*!
......@@ -61,6 +61,6 @@ void usage(const char *progName, const std::string &errorMsg)
////////////////////////
int main(int argc, char** argv)
{
typedef TTAG(InjectionBoxProblem) TypeTag;
typedef TTAG(InjectionCCProblem) TypeTag;
return Dumux::start<TypeTag>(argc, argv, usage);
}
[TimeManager]
DtInitial = 250 # [s]
TEnd = 129600 # [s]
[Grid]
UpperRight = 5 7
Cells = 50 70
[Problem]
Name = test_ccsteaminjection # name passed to the output routines
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