renaming ChiFlash to PTFlash
This commit is contained in:
parent
0f8df5cca1
commit
35321b9825
@ -21,7 +21,7 @@
|
||||
*/
|
||||
/*!
|
||||
* \file
|
||||
* \copydoc Opm::ChiFlash
|
||||
* \copydoc Opm::PTFlash
|
||||
*/
|
||||
#ifndef OPM_CHI_FLASH_HPP
|
||||
#define OPM_CHI_FLASH_HPP
|
||||
@ -56,7 +56,7 @@ namespace Opm {
|
||||
*
|
||||
*/
|
||||
template <class Scalar, class FluidSystem>
|
||||
class ChiFlash
|
||||
class PTFlash
|
||||
{
|
||||
enum { numPhases = FluidSystem::numPhases };
|
||||
enum { numComponents = FluidSystem::numComponents };
|
||||
@ -1343,7 +1343,7 @@ protected:
|
||||
// throw std::runtime_error("Successive substitution composition update did not converge within maxIterations");
|
||||
}
|
||||
|
||||
};//end ChiFlash
|
||||
};//end PTFlash
|
||||
|
||||
} // namespace Opm
|
||||
|
@ -23,11 +23,11 @@
|
||||
/*!
|
||||
* \file
|
||||
*
|
||||
* \brief This is test for the ChiFlash flash solver.
|
||||
* \brief This is test for the PTFlash flash solver.
|
||||
*/
|
||||
#include "config.h"
|
||||
|
||||
#include <opm/material/constraintsolvers/ChiFlash.hpp>
|
||||
#include <opm/material/constraintsolvers/PTFlash.hpp>
|
||||
#include <opm/material/fluidsystems/Co2BrineFluidSystem.hh>
|
||||
#include <opm/material/densead/Evaluation.hpp>
|
||||
#include <opm/material/constraintsolvers/ComputeFromReferencePhase.hpp>
|
||||
@ -128,7 +128,7 @@ void testCo2BrineFlash()
|
||||
fs.setLvalue(Ltmp);
|
||||
|
||||
const int spatialIdx = 0;
|
||||
using Flash = Opm::ChiFlash<double, FluidSystem>;
|
||||
using Flash = Opm::PTFlash<double, FluidSystem>;
|
||||
// TODO: here the zInit does not have the proper derivatives
|
||||
Flash::solve(fs, zInit, spatialIdx, flash_verbosity, flash_twophase_method, flash_tolerance);
|
||||
|
@ -23,11 +23,11 @@
|
||||
/*!
|
||||
* \file
|
||||
*
|
||||
* \brief This is test for the ChiFlash flash solver.
|
||||
* \brief This is test for the PTFlash flash solver.
|
||||
*/
|
||||
#include "config.h"
|
||||
|
||||
#include <opm/material/constraintsolvers/ChiFlash.hpp>
|
||||
#include <opm/material/constraintsolvers/PTFlash.hpp>
|
||||
#include <opm/material/fluidsystems/ThreeComponentFluidSystem.hh>
|
||||
|
||||
#include <opm/material/densead/Evaluation.hpp>
|
||||
@ -37,7 +37,7 @@
|
||||
|
||||
#include <dune/common/parallel/mpihelper.hh>
|
||||
|
||||
void testChiFlash()
|
||||
void testPTFlash()
|
||||
{
|
||||
using Scalar = double;
|
||||
using FluidSystem = Opm::ThreeComponentFluidSystem<Scalar>;
|
||||
@ -124,7 +124,7 @@ void testChiFlash()
|
||||
fluid_state.setLvalue(Ltmp);
|
||||
|
||||
const int spatialIdx = 0;
|
||||
using Flash = Opm::ChiFlash<double, FluidSystem>;
|
||||
using Flash = Opm::PTFlash<double, FluidSystem>;
|
||||
Flash::solve(fluid_state, z, spatialIdx, flash_verbosity, flash_twophase_method, flash_tolerance);
|
||||
|
||||
}
|
||||
@ -133,7 +133,7 @@ int main(int argc, char **argv)
|
||||
{
|
||||
Dune::MPIHelper::instance(argc, argv);
|
||||
|
||||
testChiFlash();
|
||||
testPTFlash();
|
||||
|
||||
return 0;
|
||||
}
|
Loading…
Reference in New Issue
Block a user