Commit df782521 authored by Andreas Lauser's avatar Andreas Lauser
Browse files

remove the "MpNc" prefix from the direcories of the new fluid framework

also rename the "fluidsystems" directory to "old_fluidsystems". Since
this is a separate SVN branch, nobody's feelings should be hurt by
this commit...

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7071 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 22875e23
......@@ -38,7 +38,7 @@
#include <dumux/common/valgrind.hh>
#include <dumux/common/exceptions.hh>
#include <dumux/material/MpNcfluidsystems/basefluidsystem.hh>
#include <dumux/material/fluidsystems/basefluidsystem.hh>
namespace Dumux
{
......
......@@ -55,11 +55,11 @@ AC_CONFIG_FILES([dumux.pc
dumux/material/fluidmatrixinteractions/2p/Makefile
dumux/material/fluidmatrixinteractions/Mp/Makefile
dumux/material/spatialparameters/Makefile
dumux/material/old_fluidsystems/Makefile
dumux/material/fluidstates/Makefile
dumux/material/fluidsystems/Makefile
dumux/material/MpNcfluidstates/Makefile
dumux/material/MpNcfluidsystems/Makefile
dumux/material/MpNcconstraintsolvers/Makefile
dumux/material/MpNceos/Makefile
dumux/material/constraintsolvers/Makefile
dumux/material/eos/Makefile
dumux/nonlinear/Makefile
m4/Makefile
test/Makefile
......
......@@ -41,7 +41,7 @@
#include <dumux/material/fluidsystems/liquidphase.hh>
#include <dumux/material/components/nullcomponent.hh>
#include <dumux/material/MpNcfluidsystems/1pfluidsystem.hh>
#include <dumux/material/fluidsystems/1pfluidsystem.hh>
namespace Dumux
{
......
......@@ -29,7 +29,7 @@
#include "1pproperties.hh"
#include <dumux/boxmodels/common/boxvolumevariables.hh>
#include <dumux/material/MpNcfluidstates/immisciblefluidstate.hh>
#include <dumux/material/fluidstates/immisciblefluidstate.hh>
namespace Dumux
{
......
......@@ -29,7 +29,7 @@
#include <dumux/boxmodels/common/boxvolumevariables.hh>
#include <dumux/material/MpNcfluidstates/compositionalfluidstate.hh>
#include <dumux/material/fluidstates/compositionalfluidstate.hh>
namespace Dumux
{
......
......@@ -41,8 +41,8 @@
#include <dumux/material/fluidsystems/liquidphase.hh>
#include <dumux/material/components/nullcomponent.hh>
#include <dumux/material/MpNcfluidsystems/2pimmisciblefluidsystem.hh>
#include <dumux/material/MpNcfluidstates/immisciblefluidstate.hh>
#include <dumux/material/fluidsystems/2pimmisciblefluidsystem.hh>
#include <dumux/material/fluidstates/immisciblefluidstate.hh>
namespace Dumux
{
......
......@@ -38,9 +38,9 @@
#include "2p2cproperties.hh"
#include "2p2cindices.hh"
#include <dumux/material/MpNcfluidstates/compositionalfluidstate.hh>
#include <dumux/material/MpNcconstraintsolvers/computefromreferencephase.hh>
#include <dumux/material/MpNcconstraintsolvers/misciblemultiphasecomposition.hh>
#include <dumux/material/fluidstates/compositionalfluidstate.hh>
#include <dumux/material/constraintsolvers/computefromreferencephase.hh>
#include <dumux/material/constraintsolvers/misciblemultiphasecomposition.hh>
namespace Dumux
{
......
......@@ -37,7 +37,7 @@
#include "mass/MpNcvtkwritermass.hh"
#include "energy/MpNcvtkwriterenergy.hh"
#include <dumux/material/MpNcconstraintsolvers/compositionfromfugacities.hh>
#include <dumux/material/constraintsolvers/compositionfromfugacities.hh>
/*!
......
......@@ -35,7 +35,7 @@
#include "MpNcvolumevariablesia.hh"
#include <dumux/boxmodels/common/boxvolumevariables.hh>
#include <dumux/material/MpNcconstraintsolvers/ncpflash.hh>
#include <dumux/material/constraintsolvers/ncpflash.hh>
namespace Dumux
{
......
......@@ -27,7 +27,7 @@
#ifndef DUMUX_MPNC_ENERGY_VOLUME_VARIABLES_HH
#define DUMUX_MPNC_ENERGY_VOLUME_VARIABLES_HH
#include <dumux/material/MpNcfluidstates/compositionalfluidstate.hh>
#include <dumux/material/fluidstates/compositionalfluidstate.hh>
namespace Dumux
{
......
......@@ -22,7 +22,7 @@
#define DUMUX_MPNC_LOCAL_RESIDUAL_MASS_HH
#include <dune/common/fvector.hh>
#include <dumux/material/MpNcconstraintsolvers/compositionfromfugacities.hh>
#include <dumux/material/constraintsolvers/compositionfromfugacities.hh>
#include "../diffusion/diffusion.hh"
......
......@@ -25,7 +25,7 @@
#ifndef DUMUX_MPNC_VOLUME_VARIABLES_MASS_HH
#define DUMUX_MPNC_VOLUME_VARIABLES_MASS_HH
#include <dumux/material/MpNcfluidstates/compositionalfluidstate.hh>
#include <dumux/material/fluidstates/compositionalfluidstate.hh>
namespace Dumux
{
......
......@@ -38,7 +38,7 @@
#include "richardsnewtoncontroller.hh"
#include <dumux/material/components/nullcomponent.hh>
#include <dumux/material/MpNcfluidsystems/2pimmisciblefluidsystem.hh>
#include <dumux/material/fluidsystems/2pimmisciblefluidsystem.hh>
namespace Dumux
{
......
......@@ -28,7 +28,7 @@
#include "richardsproperties.hh"
#include <dumux/material/MpNcfluidstates/immisciblefluidstate.hh>
#include <dumux/material/fluidstates/immisciblefluidstate.hh>
namespace Dumux
{
......
......@@ -28,7 +28,7 @@
#include <dumux/decoupled/common/onemodelproblem.hh>
#include <dumux/decoupled/2p/variableclass2p.hh>
#include <dumux/material/fluidsystems/2p_system.hh>
#include <dumux/material/old_fluidsystems/2p_system.hh>
#include <dumux/decoupled/2p/2pproperties.hh>
namespace Dumux
......
......@@ -29,7 +29,7 @@
#include <dumux/decoupled/common/impet.hh>
#include <dumux/decoupled/common/impetproblem.hh>
#include <dumux/decoupled/2p/variableclass2p.hh>
#include <dumux/material/fluidsystems/2p_system.hh>
#include <dumux/material/old_fluidsystems/2p_system.hh>
#include <dumux/decoupled/2p/2pproperties.hh>
......
......@@ -28,7 +28,7 @@
#include <dumux/decoupled/common/onemodelproblem.hh>
#include <dumux/decoupled/2p/variableclass2p.hh>
#include <dumux/material/fluidsystems/2p_system.hh>
#include <dumux/material/old_fluidsystems/2p_system.hh>
#include <dumux/decoupled/2p/2pproperties.hh>
......
SUBDIRS = \
MpNcconstraintsolvers \
MpNceos \
MpNcfluidstates \
MpNcfluidsystems \
constraintsolvers \
eos \
fluidstates \
fluidsystems \
binarycoefficients \
components \
fluidmatrixinteractions \
fluidsystems \
old_fluidsystems \
spatialparameters
materialdir = $(includedir)/dumux/material
......
include $(top_srcdir)/am/global-rules
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