some bikeshedding to make the new code more consistent with the existing one

i.e., where to put spaces, where to put new lines and using identation
width 4.
This commit is contained in:
Andreas Lauser
2015-01-21 15:48:01 +01:00
parent a8b093e372
commit 440a2f9496
2 changed files with 7 additions and 7 deletions

View File

@@ -165,14 +165,14 @@ public:
if (intersection.boundary())
continue;
const auto& inside = intersection.inside();
const auto& inside = intersection.inside();
const auto& outside = intersection.outside();
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2,4)
int insideElemIdx = elementMapper.index( *inside );
int outsideElemIdx = elementMapper.index( *outside);
int insideElemIdx = elementMapper.index(*inside);
int outsideElemIdx = elementMapper.index(*outside);
#else
int insideElemIdx = elementMapper.map( *inside );
int outsideElemIdx = elementMapper.map( *outside);
int insideElemIdx = elementMapper.map(*inside);
int outsideElemIdx = elementMapper.map(*outside);
#endif
// we only need to calculate a face's transmissibility

View File

@@ -149,8 +149,8 @@ public:
// make sure that the well is either an injector or a
// producer for the current episode. (it is not allowed to
// be neither or to be both...)
assert( (deckWell->isInjector(episodeIdx)?1:0) +
(deckWell->isProducer(episodeIdx)?1:0) == 1);
assert((deckWell->isInjector(episodeIdx)?1:0) +
(deckWell->isProducer(episodeIdx)?1:0) == 1);
if (deckWell->isInjector(episodeIdx)) {
well->setWellType(Well::Injector);