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

Merge pull request #227 from akva2/remove_impes

Browse Source 
Remove impes solvers
This commit is contained in:
Atgeirr Flø Rasmussen 2017-11-16 13:37:39 +01:00 committed by GitHub
commit 9131d48aa2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 200 additions and 372 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
CMakeLists_files.cmake
View File

@ -1,6 +1,3 @@
# -*- mode: cmake; tab-width: 2; indent-tabs-mode: t; truncate-lines: t; compile-command: "cmake -Wdev" -*-
# vim: set filetype=cmake autoindent tabstop=2 shiftwidth=2 noexpandtab softtabstop=2 nowrap:
# This file sets up five lists:
# MAIN_SOURCE_FILES List of compilation units which will be included in
# the library. If it isn't on this list, it won't be
@ -32,7 +29,7 @@ list (APPEND TEST_SOURCE_FILES
tests/common/boundaryconditions_test.cpp
tests/common/matrix_test.cpp
tests/common/test_gravitypressure.cpp
)
)
list(APPEND MAIN_SOURCE_FILES
opm/porsol/blackoil/fluid/BlackoilPVT.cpp
@ -56,7 +53,7 @@ list(APPEND MAIN_SOURCE_FILES
opm/elasticity/matrixops.cpp
opm/elasticity/meshcolorizer.cpp
opm/elasticity/mpc.cpp
)
)
# originally generated with the command:
# find tests -name '*.xml' -a ! -wholename '*/not-unit/*' -printf '\t%p\n' | sort
@ -87,7 +84,7 @@ list (APPEND TEST_DATA_FILES
tests/input_data/reference_solutions/upscale_elasticity_mortar_EightCells.txt
tests/input_data/reference_solutions/upscale_elasticity_mpc_EightCells.txt
tests/input_data/reference_solutions/upscale_elasticity_mortar_EightCells.txt
)
)
# originally generated with the command:
# find examples -name '*.c*' -a ! -name 'twophase2_test.cpp' -printf '\t%p\n' | sort
@ -105,8 +102,6 @@ list (APPEND EXAMPLE_SOURCE_FILES
examples/mimetic_aniso_solver_test.cpp
examples/mimetic_periodic_test.cpp
examples/mimetic_solver_test.cpp
examples/sim_blackoil_impes.cpp
examples/sim_co2_impes.cpp
examples/sim_steadystate_explicit.cpp
examples/sim_steadystate_implicit.cpp
examples/steadystate_test_implicit.cpp
@ -120,11 +115,11 @@ list (APPEND EXAMPLE_SOURCE_FILES
examples/upscale_steadystate_implicit.cpp
examples/upscale_elasticity.cpp
tests/compareUpscaling.cpp
)
)
list (APPEND ADDITIONAL_SOURCE_FILES
benchmarks/upscale_relperm_benchmark.cpp
)
)
# originally generated with the command:
# find attic -name '*.c*' -printf '\t%p\n' | sort
@ -133,7 +128,7 @@ list (APPEND ATTIC_FILES
attic/aniso_steadystate_test.cpp
attic/implicit_steadystate_test.cpp
attic/steadystate_test_explicit.cpp
)
)
# programs listed here will not only be compiled, but also marked for
# installation
@ -143,8 +138,6 @@ list (APPEND PROGRAM_SOURCE_FILES
examples/cpregularize.cpp
examples/exp_variogram.cpp
examples/grdecldips.cpp
examples/sim_blackoil_impes.cpp
examples/sim_co2_impes.cpp
examples/steadystate_test_implicit.cpp
examples/upscale_avg.cpp
examples/upscale_cap.cpp
@ -155,7 +148,7 @@ list (APPEND PROGRAM_SOURCE_FILES
examples/upscale_singlephase.cpp
examples/upscale_steadystate_implicit.cpp
examples/upscale_elasticity.cpp
)
)
# originally generated with the command:
# find opm -name '*.h*' -a ! -name '*-pch.hpp' -printf '\t%p\n' | sort
@ -254,4 +247,4 @@ list (APPEND PUBLIC_HEADER_FILES
opm/elasticity/mpc.hh
opm/elasticity/shapefunctions.hpp
opm/elasticity/uzawa_solver.hpp
)
)

81
examples/sim_blackoil_impes.cpp
View File

@ -1,81 +0,0 @@
/*
Copyright 2010 SINTEF ICT, Applied Mathematics.
This file is part of the Open Porous Media project (OPM).
OPM 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 3 of the License, or
(at your option) any later version.
OPM 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 OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <opm/common/utility/platform_dependent/disable_warnings.h>
#include <dune/common/version.hh>
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
#include <dune/common/parallel/mpihelper.hh>
#else
#include <dune/common/mpihelper.hh>
#endif
#include <opm/common/utility/platform_dependent/reenable_warnings.h>
#include <opm/core/utility/StopWatch.hpp>
#include <dune/grid/CpGrid.hpp>
#include <opm/porsol/blackoil/BlackoilFluid.hpp>
#include <opm/porsol/blackoil/BlackoilSimulator.hpp>
#include <opm/porsol/blackoil/BlackoilWells.hpp>
#include <opm/porsol/blackoil/ComponentTransport.hpp>
#include <opm/porsol/blackoil/fluid/BlackoilPVT.hpp>
#include <opm/porsol/common/Rock.hpp>
#include <opm/porsol/common/SimulatorUtilities.hpp>
#include <opm/porsol/mimetic/TpfaCompressible.hpp>
#include <iostream>
typedef Dune::CpGrid Grid;
typedef Opm::Rock<Grid::dimension> Rock;
typedef Opm::BlackoilFluid Fluid;
typedef Opm::BlackoilWells Wells;
typedef Opm::BasicBoundaryConditions<true, false> FBC;
typedef Opm::TpfaCompressible<Grid, Rock, Fluid, Wells, FBC> FlowSolver;
typedef Opm::ExplicitCompositionalTransport<Grid, Rock, Fluid, Wells> TransportSolver;
typedef Opm::BlackoilSimulator<Grid, Rock, Fluid, Wells, FlowSolver, TransportSolver> Simulator;
int main(int argc, char** argv)
try
{
Opm::ParameterGroup param(argc, argv);
Dune::MPIHelper::instance(argc,argv);
// Initialize.
Simulator sim;
sim.init(param);
// Run simulation.
Opm::time::StopWatch clock;
clock.start();
sim.simulate();
clock.stop();
std::cout << "\n\nSimulation clock time (secs): "
<< clock.secsSinceStart() << std::endl;
}
catch (const std::exception &e) {
std::cerr << "Program threw an exception: " << e.what() << "\n";
throw;
}

84
examples/sim_co2_impes.cpp
View File

@ -1,84 +0,0 @@
/*
Copyright 2010 SINTEF ICT, Applied Mathematics.
This file is part of the Open Porous Media project (OPM).
OPM 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 3 of the License, or
(at your option) any later version.
OPM 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 OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <opm/common/utility/platform_dependent/disable_warnings.h>
#include <dune/common/version.hh>
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
#include <dune/common/parallel/mpihelper.hh>
#else
#include <dune/common/mpihelper.hh>
#endif
#include <opm/common/utility/platform_dependent/reenable_warnings.h>
#include <opm/porsol/common/SimulatorUtilities.hpp>
#include <opm/porsol/common/Rock.hpp>
#include <opm/porsol/blackoil/co2fluid/BlackoilCo2PVT.hpp>
#include <opm/porsol/blackoil/BlackoilSimulator.hpp>
#include <opm/porsol/blackoil/BlackoilFluid.hpp>
#include <opm/porsol/blackoil/BlackoilWells.hpp>
#include <opm/porsol/mimetic/TpfaCompressible.hpp>
#include <opm/porsol/blackoil/ComponentTransport.hpp>
#include <opm/core/utility/StopWatch.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <dune/grid/CpGrid.hpp>
#include <iostream>
typedef Dune::CpGrid Grid;
typedef Opm::Rock<Grid::dimension> Rock;
typedef Opm::BlackoilFluid Fluid;
typedef Opm::BlackoilWells Wells;
typedef Opm::BasicBoundaryConditions<true, false> FBC;
typedef Opm::TpfaCompressible<Grid, Rock, Fluid, Wells, FBC> FlowSolver;
typedef Opm::ExplicitCompositionalTransport<Grid, Rock, Fluid, Wells> TransportSolver;
typedef Opm::BlackoilSimulator<Grid, Rock, Fluid, Wells, FlowSolver, TransportSolver> Simulator;
int main(int argc, char** argv)
try
{
Opm::ParameterGroup param(argc, argv);
Dune::MPIHelper::instance(argc,argv);
// Initialize.
Simulator sim;
sim.init(param);
// Run simulation.
Opm::time::StopWatch clock;
clock.start();
sim.simulate();
clock.stop();
std::cout << "\n\nSimulation clock time (secs): " << clock.secsSinceStart() << std::endl;
}
catch (const std::exception &e) {
std::cerr << "Program threw an exception: " << e.what() << "\n";
throw;
}