OilfieldToolsNet/opm-upscaling
4
0
Fork 0
mirror of https://github.com/OPM/opm-upscaling.git synced 2025-02-25 18:45:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

changed: use std::to_string instead of boost::lexical_cast

Browse Source
This commit is contained in:
Arne Morten Kvarving
2020-02-11 11:54:44 +01:00
parent d94314d6b0
commit 2c324b606c
8 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/SimulatorTester.hpp
View File

@@ -88,9 +88,9 @@ namespace Opm
this->res_prop_,
this->flow_solver_.getSolution(),
saturation,
"testsolution-" + boost::lexical_cast<std::string>(i));
"testsolution-" + std::to_string(i));
writeField(saturation, "saturation-" + boost::lexical_cast<std::string>(i));
writeField(saturation, "saturation-" + std::to_string(i));
// Comparing old to new.
int num_cells = saturation.size();

6
examples/known_answer_test.cpp
View File

@@ -72,9 +72,6 @@
#include <iomanip>
#include <iostream>
#include <boost/lexical_cast.hpp>
// ------------ Specifying the solution ------------
@@ -236,8 +233,7 @@ void test_flowsolver(const GI& g, const RI& r, double tol, int kind)
Dune::VTKWriter<typename GI::GridType::LeafGridView> vtkwriter(g.grid().leafGridView());
vtkwriter.addCellData(cell_velocity_flat, "velocity", GI::GridType::dimension);
vtkwriter.addCellData(cell_pressure, "pressure");
vtkwriter.write("testsolution-" + boost::lexical_cast<std::string>(0),
Dune::VTK::ascii);
vtkwriter.write("testsolution-" + std::to_string(0), Dune::VTK::ascii);
}

3
examples/mimetic_solver_test.cpp
View File

@@ -134,8 +134,7 @@ void test_flowsolver(const GI& g, const RI& r)
Dune::VTKWriter<typename GI::GridType::LeafGridView> vtkwriter(g.grid().leafGridView());
vtkwriter.addCellData(cell_velocity_flat, "velocity", dim);
vtkwriter.addCellData(cell_pressure, "pressure");
vtkwriter.write("testsolution-" + boost::lexical_cast<std::string>(0),
Dune::VTK::ascii);
vtkwriter.write("testsolution-" + std::to_string(0), Dune::VTK::ascii);
#else
solver.printSystem("system");
typedef typename FlowSolver::SolutionType FlowSolution;

2
opm/porsol/common/ImplicitTransportDefs.hpp
View File

@@ -29,8 +29,6 @@
#include <string>
#include <vector>
#include <boost/lexical_cast.hpp>
namespace Opm {
template <class Vector>
class MaxNormStl {

1
opm/porsol/common/SimulatorBase.hpp
View File

@@ -62,7 +62,6 @@
#include <opm/common/utility/platform_dependent/disable_warnings.h>
#include <boost/lexical_cast.hpp>
#include <dune/grid/yaspgrid.hh>
#include <opm/common/utility/platform_dependent/reenable_warnings.h>

3
opm/porsol/mimetic/IncompFlowSolverHybrid.hpp
View File

@@ -46,7 +46,6 @@
#include <opm/common/utility/platform_dependent/disable_warnings.h>
#include <unordered_map>
#include <boost/lexical_cast.hpp>
#include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh>
@@ -670,7 +669,7 @@ namespace Opm {
assembleDynamic(r, sat, bc, src);
// static int count = 0;
// ++count;
// printSystem(std::string("linsys_mimetic-") + boost::lexical_cast<std::string>(count));
// printSystem(std::string("linsys_mimetic-") + std::to_string(count));
switch (linsolver_type) {
case 0: // ILU0 preconditioned CG
solveLinearSystem(residual_tolerance, linsolver_verbosity, linsolver_maxit);

13
opm/upscaling/SteadyStateUpscalerImplicit_impl.hpp
View File

@@ -37,7 +37,6 @@
#define OPM_STEADYSTATEUPSCALERIMPLICIT_IMPL_HEADER
#include <boost/lexical_cast.hpp>
#include <opm/porsol/common/MatrixInverse.hpp>
#include <opm/porsol/common/SimulatorUtilities.hpp>
#include <opm/porsol/common/ReservoirPropertyFixedMobility.hpp>
@@ -267,16 +266,16 @@ namespace Opm
this->flow_solver_.getSolution(),
saturation,
std::string("output-steadystate")
+ '-' + boost::lexical_cast<std::string>(count)
+ '-' + boost::lexical_cast<std::string>(flow_direction)
+ '-' + boost::lexical_cast<std::string>(it_count));
+ '-' + std::to_string(count)
+ '-' + std::to_string(flow_direction)
+ '-' + std::to_string(it_count));
}
if (output_ecl_) {
const char* fd = "xyz";
std::string basename = std::string("ecldump-steadystate")
+ '-' + boost::lexical_cast<std::string>(boundary_saturation)
+ '-' + boost::lexical_cast<std::string>(fd[flow_direction])
+ '-' + boost::lexical_cast<std::string>(pressure_drop);
+ '-' + std::to_string(boundary_saturation)
+ '-' + std::to_string(fd[flow_direction])
+ '-' + std::to_string(pressure_drop);
waterSatToBothSat(saturation, ecl_sat);
getCellPressure(ecl_press, this->ginterf_, this->flow_solver_.getSolution());
data::Solution solution;

7
opm/upscaling/SteadyStateUpscaler_impl.hpp
View File

@@ -37,7 +37,6 @@
#define OPM_STEADYSTATEUPSCALER_IMPL_HEADER
#include <boost/lexical_cast.hpp>
#include <opm/porsol/common/MatrixInverse.hpp>
#include <opm/porsol/common/SimulatorUtilities.hpp>
#include <opm/porsol/common/ReservoirPropertyFixedMobility.hpp>
@@ -207,9 +206,9 @@ namespace Opm
this->flow_solver_.getSolution(),
saturation,
std::string("output-steadystate")
+ '-' + boost::lexical_cast<std::string>(count)
+ '-' + boost::lexical_cast<std::string>(flow_direction)
+ '-' + boost::lexical_cast<std::string>(iter));
+ '-' + std::to_string(count)
+ '-' + std::to_string(flow_direction)
+ '-' + std::to_string(iter));
}
// Comparing old to new.