OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-22 09:16:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix whitespace at eol

Browse Source 
and some brace placements
This commit is contained in:
Arne Morten Kvarving 2023-03-24 14:56:23 +01:00
parent 3ea6f714db
commit 5f28175603
7 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ebos/eclgenericoutputblackoilmodule.cc
View File

@ -169,7 +169,7 @@ EclGenericOutputBlackoilModule(const EclipseState& eclState,
, enableSaltPrecipitation_(enableSaltPrecipitation)
, enableExtbo_(enableExtbo)
, enableMICP_(enableMICP)
, local_data_valid_(false)
, local_data_valid_(false)
{
const auto& fp = eclState_.fieldProps();

2
ebos/eclgenericoutputblackoilmodule.hh
View File

@ -260,7 +260,7 @@ public:
void validateLocalData(){
local_data_valid_ = true;
}
// Virtual destructor for safer inheritance.
virtual ~EclGenericOutputBlackoilModule();

20
ebos/ecloutputblackoilmodule.hh
View File

@ -545,7 +545,7 @@ public:
this->viscosity_[gasPhaseIdx][globalDofIdx]
= FluidSystem::viscosity(fsInitial, gasPhaseIdx, intQuants.pvtRegionIndex());
}
// Adding Well RFT data
const auto cartesianIdx = elemCtx.simulator().vanguard().cartesianIndex(globalDofIdx);
@ -592,7 +592,7 @@ public:
for (unsigned dofIdx = 0; dofIdx < elemCtx.numPrimaryDof(/*timeIdx=*/0); ++dofIdx) {
unsigned globalDofIdx = elemCtx.globalSpaceIndex(dofIdx, /*timeIdx=*/0);
if (!problem.model().linearizer().getFlowsInfo().empty()) {
if (!problem.model().linearizer().getFlowsInfo().empty()) {
const auto& flowsInf = problem.model().linearizer().getFlowsInfo();
auto flowsInfos = flowsInf[globalDofIdx];
for (auto& flowsInfo : flowsInfos) {
@ -856,8 +856,7 @@ public:
}
}
}
/*!
* \brief Capture connection fluxes, particularly to account for inter-region flows.
*
@ -1003,12 +1002,14 @@ public:
}
}
void updateFluidInPlace(const ElementContext& elemCtx){
void updateFluidInPlace(const ElementContext& elemCtx)
{
for (unsigned dofIdx = 0; dofIdx < elemCtx.numPrimaryDof(/*timeIdx=*/0); ++dofIdx) {
updateFluidInPlace_(elemCtx, dofIdx);
}
}
void updateFluidInPlace(unsigned globalDofIdx,const IntensiveQuantities& intQuants, double totVolume){
void updateFluidInPlace(unsigned globalDofIdx,const IntensiveQuantities& intQuants, double totVolume)
{
this->updateFluidInPlace_(globalDofIdx, intQuants, totVolume);
}
private:
@ -1022,13 +1023,14 @@ private:
return candidate == parallelWells.end() || *candidate != value;
}
void updateFluidInPlace_(const ElementContext& elemCtx, unsigned dofIdx){
void updateFluidInPlace_(const ElementContext& elemCtx, unsigned dofIdx)
{
const auto& intQuants = elemCtx.intensiveQuantities(dofIdx, /*timeIdx=*/0);
unsigned globalDofIdx = elemCtx.globalSpaceIndex(dofIdx, /*timeIdx=*/0);
const auto totVolume = elemCtx.simulator().model().dofTotalVolume(globalDofIdx);
this->updateFluidInPlace_(globalDofIdx, intQuants, totVolume);
}
void updateFluidInPlace_(unsigned globalDofIdx,const IntensiveQuantities& intQuants, double totVolume)
{
OPM_TIMEBLOCK_LOCAL(updateFluidInPlace);
@ -1295,7 +1297,7 @@ private:
}
const Simulator& simulator_;
};
};
} // namespace Opm

16
ebos/eclproblem.hh
View File

@ -855,7 +855,7 @@ public:
this->readRockParameters_(simulator.vanguard().cellCenterDepths());
readMaterialParameters_();
readThermalParameters_();
// Re-ordering in case of ALUGrid
std::function<unsigned int(unsigned int)> gridToEquilGrid;
#if USE_ALUGRID
@ -1454,7 +1454,7 @@ public:
*/
std::shared_ptr<const EclMaterialLawManager> materialLawManager() const
{ return materialLawManager_; }
template <class FluidState>
void updateRelperms(
std::array<Evaluation,numPhases> &mobility,
@ -1797,8 +1797,8 @@ public:
const auto& model = this->model();
// we use a lower tolerance for the compensation too
// assure the added drift from the last step does not
// cause convergence issues on the current step
// assure the added drift from the last step does not
// cause convergence issues on the current step
Scalar maxCompensation = model.newtonMethod().tolerance()/10;
Scalar poro = this->porosity(globalDofIdx, timeIdx);
Scalar dt = simulator.timeStepSize();
@ -2068,11 +2068,11 @@ public:
serializer(tracerModel_);
serializer(*materialLawManager_);
serializer(*eclWriter_);
}
}
private:
Implementation& asImp_()
{ return *static_cast<Implementation *>(this); }
void updateExplicitQuantitites_()
{
OPM_TIMEBLOCK(updateExplicitQuantities);
@ -2216,7 +2216,7 @@ private:
return false;
}
bool updateMaxOilSaturation_(unsigned compressedDofIdx, const IntensiveQuantities& iq)
bool updateMaxOilSaturation_(unsigned compressedDofIdx, const IntensiveQuantities& iq)
{
OPM_TIMEBLOCK_LOCAL(updateMaxOilSaturation);
const auto& fs = iq.fluidState();
@ -2704,7 +2704,7 @@ private:
- gasSaturationData[dofIdx]);
//////
// set phase pressures
// set phase pressures
//////
Scalar pressure = pressureData[dofIdx]; // oil pressure (or gas pressure for water-gas system or water pressure for single phase)

12
ebos/eclwriter.hh
View File

@ -250,7 +250,7 @@ public:
std::map<std::string, std::vector<double>> regionData;
Inplace inplace;
{
OPM_TIMEBLOCK(outputFipLogAndFipresvLog);
OPM_TIMEBLOCK(outputFipLogAndFipresvLog);
inplace = eclOutputModule_->outputFipLog(miscSummaryData, regionData, isSubStep, simulator_.gridView().comm());
eclOutputModule_->outputFipresvLog(miscSummaryData, regionData, isSubStep, simulator_.gridView().comm());
}
@ -284,7 +284,7 @@ public:
miscSummaryData["MSUMNEWT"] = this->simulation_report_.success.total_newton_iterations;
}
{
OPM_TIMEBLOCK(evalSummary);
OPM_TIMEBLOCK(evalSummary);
this->evalSummary(reportStepNum, curTime,
this->collectToIORank_.isParallel() ?
this->collectToIORank_.globalWBPData() :
@ -304,7 +304,7 @@ public:
summaryState(), udqState());
}
{
OPM_TIMEBLOCK(outputXXX);
OPM_TIMEBLOCK(outputXXX);
eclOutputModule_->outputProdLog(reportStepNum, isSubStep, forceDisableProdOutput);
eclOutputModule_->outputInjLog(reportStepNum, isSubStep, forceDisableInjOutput);
eclOutputModule_->outputCumLog(reportStepNum, isSubStep, forceDisableCumOutput);
@ -533,7 +533,7 @@ private:
ElementContext elemCtx(simulator_);
OPM_BEGIN_PARALLEL_TRY_CATCH();
{
OPM_TIMEBLOCK(prepareCellBasedData);
OPM_TIMEBLOCK(prepareCellBasedData);
for (const auto& elem : elements(gridView)) {
elemCtx.updatePrimaryStencil(elem);
elemCtx.updatePrimaryIntensiveQuantities(/*timeIdx=*/0);
@ -542,7 +542,7 @@ private:
}
}
if(!simulator_.model().linearizer().getFlowsInfo().empty()){
OPM_TIMEBLOCK(prepareFlowsData);
OPM_TIMEBLOCK(prepareFlowsData);
for (const auto& elem : elements(gridView)) {
elemCtx.updatePrimaryStencil(elem);
elemCtx.updatePrimaryIntensiveQuantities(/*timeIdx=*/0);
@ -550,7 +550,7 @@ private:
}
}
{
OPM_TIMEBLOCK(prepareBlockData);
OPM_TIMEBLOCK(prepareBlockData);
for (const auto& elem : elements(gridView)) {
elemCtx.updatePrimaryStencil(elem);
elemCtx.updatePrimaryIntensiveQuantities(/*timeIdx=*/0);

8
ebos/equil/initstateequil.cc
View File

@ -27,7 +27,7 @@
namespace Opm {
namespace EQUIL {
namespace DeckDependent {
namespace DeckDependent {
#if HAVE_DUNE_FEM
using GridView = Dune::Fem::GridPart2GridViewImpl<
Dune::Fem::AdaptiveLeafGridPart<
@ -57,7 +57,7 @@ template InitialStateComputer<BlackOilFluidSystem<double>,
const GridView&,
const Dune::CartesianIndexMapper<Dune::CpGrid>&,
const double,
const bool);
const bool);
#if HAVE_DUNE_ALUGRID
#if HAVE_MPI
using ALUGridComm = Dune::ALUGridMPIComm;
@ -105,6 +105,6 @@ namespace Details {
template std::pair<double,double> cellZMinMax(const Dune::cpgrid::Entity<0>& element);
}
}
} // namespace EQUIL
// namespace Opm
} // namespace Opm

4
ebos/equil/initstateequil_impl.hh
View File

@ -1821,7 +1821,7 @@ cellLoop(const CellRange& cells,
this->rs_[cell] = Rs;
this->rv_[cell] = Rv;
}
if (watActive && gasActive) {
this->rvw_[cell] = Rvw;
}
@ -1938,7 +1938,7 @@ equilibrateHorizontal(const CellRange& cells,
Rv = eqreg.evaporationCalculator()
(cz, pressures.gas, temp, saturations.oil);
Rvw = eqreg.waterEvaporationCalculator()
(cz, pressures.gas, temp, saturations.water);
});