Skip to content

Commit fae5869

Browse files
multitalentloesmultitalentloes
committed
add more rebasing stuff
1 parent 967affe commit fae5869

2 files changed

Lines changed: 0 additions & 136 deletions

File tree

‎opm/material/fluidmatrixinteractions/EclDefaultMaterial.hpp‎

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -136,18 +136,8 @@ class EclDefaultMaterial : public TraitsT
136136
*/
137137
template <class ContainerT, class FluidState, class ...Args>
138138
OPM_HOST_DEVICE static void capillaryPressures(ContainerT& values,
139-
<<<<<<< HEAD
140-
<<<<<<< HEAD
141139
const Params& params,
142140
const FluidState& state)
143-
=======
144-
const Params& params,
145-
const FluidState& state)
146-
>>>>>>> 2ae970437 (First version)
147-
=======
148-
const Params& params,
149-
const FluidState& state)
150-
>>>>>>> 3c3d9553a (improve robustness and formatting)
151141
{
152142
OPM_TIMEFUNCTION_LOCAL(Subsystem::SatProps);
153143
using Evaluation = typename std::remove_reference<decltype(values[0])>::type;
@@ -273,15 +263,7 @@ class EclDefaultMaterial : public TraitsT
273263
*/
274264
template <class FluidState, class Evaluation, class ...Args>
275265
OPM_HOST_DEVICE static Evaluation pcgn(const Params& params,
276-
<<<<<<< HEAD
277-
<<<<<<< HEAD
278-
const FluidState& fs)
279-
=======
280-
const FluidState& fs)
281-
>>>>>>> 2ae970437 (First version)
282-
=======
283266
const FluidState& fs)
284-
>>>>>>> 3c3d9553a (improve robustness and formatting)
285267
{
286268
OPM_TIMEFUNCTION_LOCAL(Subsystem::SatProps);
287269
// Maximum attainable oil saturation is 1-SWL.
@@ -300,15 +282,7 @@ class EclDefaultMaterial : public TraitsT
300282
*/
301283
template <class FluidState, class Evaluation, class ...Args>
302284
OPM_HOST_DEVICE static Evaluation pcnw(const Params& params,
303-
<<<<<<< HEAD
304-
<<<<<<< HEAD
305285
const FluidState& fs)
306-
=======
307-
const FluidState& fs)
308-
>>>>>>> 2ae970437 (First version)
309-
=======
310-
const FluidState& fs)
311-
>>>>>>> 3c3d9553a (improve robustness and formatting)
312286
{
313287
OPM_TIMEFUNCTION_LOCAL(Subsystem::SatProps);
314288
const auto Sw = decay<Evaluation>(fs.saturation(waterPhaseIdx));
@@ -373,18 +347,8 @@ class EclDefaultMaterial : public TraitsT
373347
*/
374348
template <class ContainerT, class FluidState, class ...Args>
375349
OPM_HOST_DEVICE static void relativePermeabilities(ContainerT& values,
376-
<<<<<<< HEAD
377-
<<<<<<< HEAD
378-
const Params& params,
379-
const FluidState& fluidState)
380-
=======
381-
const Params& params,
382-
const FluidState& fluidState)
383-
>>>>>>> 2ae970437 (First version)
384-
=======
385350
const Params& params,
386351
const FluidState& fluidState)
387-
>>>>>>> 3c3d9553a (improve robustness and formatting)
388352
{
389353
OPM_TIMEFUNCTION_LOCAL(Subsystem::SatProps);
390354
using Evaluation = typename std::remove_reference<decltype(values[0])>::type;
@@ -399,15 +363,7 @@ class EclDefaultMaterial : public TraitsT
399363
*/
400364
template <class FluidState, class Evaluation, class ...Args>
401365
OPM_HOST_DEVICE static Evaluation krg(const Params& params,
402-
<<<<<<< HEAD
403-
<<<<<<< HEAD
404366
const FluidState& fluidState)
405-
=======
406-
const FluidState& fluidState)
407-
>>>>>>> 2ae970437 (First version)
408-
=======
409-
const FluidState& fluidState)
410-
>>>>>>> 3c3d9553a (improve robustness and formatting)
411367
{
412368
OPM_TIMEFUNCTION_LOCAL(Subsystem::SatProps);
413369
// Maximum attainable oil saturation is 1-SWL.
@@ -420,15 +376,7 @@ class EclDefaultMaterial : public TraitsT
420376
*/
421377
template <class FluidState, class Evaluation, class ...Args>
422378
OPM_HOST_DEVICE static Evaluation krw(const Params& params,
423-
<<<<<<< HEAD
424-
<<<<<<< HEAD
425-
const FluidState& fluidState)
426-
=======
427-
const FluidState& fluidState)
428-
>>>>>>> 2ae970437 (First version)
429-
=======
430379
const FluidState& fluidState)
431-
>>>>>>> 3c3d9553a (improve robustness and formatting)
432380
{
433381
OPM_TIMEFUNCTION_LOCAL(Subsystem::SatProps);
434382
const Evaluation sw = decay<Evaluation>(fluidState.saturation(waterPhaseIdx));
@@ -440,15 +388,7 @@ class EclDefaultMaterial : public TraitsT
440388
*/
441389
template <class FluidState, class Evaluation, class ...Args>
442390
OPM_HOST_DEVICE static Evaluation krn(const Params& params,
443-
<<<<<<< HEAD
444-
<<<<<<< HEAD
445-
const FluidState& fluidState)
446-
=======
447-
const FluidState& fluidState)
448-
>>>>>>> 2ae970437 (First version)
449-
=======
450391
const FluidState& fluidState)
451-
>>>>>>> 3c3d9553a (improve robustness and formatting)
452392
{
453393
OPM_TIMEFUNCTION_LOCAL(Subsystem::SatProps);
454394
const Scalar Swco = params.Swl();
@@ -487,15 +427,7 @@ class EclDefaultMaterial : public TraitsT
487427
*/
488428
template <class Evaluation, class FluidState, class ...Args>
489429
OPM_HOST_DEVICE static Evaluation relpermOilInOilGasSystem(const Params& params,
490-
<<<<<<< HEAD
491-
<<<<<<< HEAD
492430
const FluidState& fluidState)
493-
=======
494-
const FluidState& fluidState)
495-
>>>>>>> 2ae970437 (First version)
496-
=======
497-
const FluidState& fluidState)
498-
>>>>>>> 3c3d9553a (improve robustness and formatting)
499431
{
500432
OPM_TIMEFUNCTION_LOCAL(Subsystem::SatProps);
501433
const Evaluation sw =
@@ -513,15 +445,7 @@ class EclDefaultMaterial : public TraitsT
513445
*/
514446
template <class Evaluation, class FluidState, class ...Args>
515447
OPM_HOST_DEVICE static Evaluation relpermOilInOilWaterSystem(const Params& params,
516-
<<<<<<< HEAD
517-
<<<<<<< HEAD
518-
const FluidState& fluidState)
519-
=======
520-
const FluidState& fluidState)
521-
>>>>>>> 2ae970437 (First version)
522-
=======
523448
const FluidState& fluidState)
524-
>>>>>>> 3c3d9553a (improve robustness and formatting)
525449
{
526450
OPM_TIMEFUNCTION_LOCAL(Subsystem::SatProps);
527451
const Evaluation sw =

‎opm/material/fluidmatrixinteractions/EclEpsTwoPhaseLaw.hpp‎

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -374,18 +374,8 @@ class EclEpsTwoPhaseLaw : public EffLawT::Traits
374374
private:
375375
template <class Evaluation, class PointsContainer>
376376
OPM_HOST_DEVICE static Evaluation scaledToUnscaledSatTwoPoint_(const Evaluation& scaledSat,
377-
<<<<<<< HEAD
378-
<<<<<<< HEAD
379377
const PointsContainer& unscaledSats,
380378
const PointsContainer& scaledSats)
381-
=======
382-
const PointsContainer& unscaledSats,
383-
const PointsContainer& scaledSats)
384-
>>>>>>> 2ae970437 (First version)
385-
=======
386-
const PointsContainer& unscaledSats,
387-
const PointsContainer& scaledSats)
388-
>>>>>>> 3c3d9553a (improve robustness and formatting)
389379
{
390380
return
391381
unscaledSats[0]
@@ -395,18 +385,8 @@ class EclEpsTwoPhaseLaw : public EffLawT::Traits
395385

396386
template <class Evaluation, class PointsContainer>
397387
OPM_HOST_DEVICE static Evaluation unscaledToScaledSatTwoPoint_(const Evaluation& unscaledSat,
398-
<<<<<<< HEAD
399-
<<<<<<< HEAD
400-
const PointsContainer& unscaledSats,
401-
const PointsContainer& scaledSats)
402-
=======
403-
const PointsContainer& unscaledSats,
404-
const PointsContainer& scaledSats)
405-
>>>>>>> 2ae970437 (First version)
406-
=======
407388
const PointsContainer& unscaledSats,
408389
const PointsContainer& scaledSats)
409-
>>>>>>> 3c3d9553a (improve robustness and formatting)
410390
{
411391
return
412392
scaledSats[0]
@@ -416,18 +396,8 @@ class EclEpsTwoPhaseLaw : public EffLawT::Traits
416396

417397
template <class Evaluation, class PointsContainer>
418398
OPM_HOST_DEVICE static Evaluation scaledToUnscaledSatThreePoint_(const Evaluation& scaledSat,
419-
<<<<<<< HEAD
420-
<<<<<<< HEAD
421-
const PointsContainer& unscaledSats,
422-
const PointsContainer& scaledSats)
423-
=======
424-
const PointsContainer& unscaledSats,
425-
const PointsContainer& scaledSats)
426-
>>>>>>> 2ae970437 (First version)
427-
=======
428399
const PointsContainer& unscaledSats,
429400
const PointsContainer& scaledSats)
430-
>>>>>>> 3c3d9553a (improve robustness and formatting)
431401
{
432402
using UnscaledSat = std::remove_cv_t<std::remove_reference_t<decltype(unscaledSats[0])>>;
433403

@@ -466,18 +436,8 @@ class EclEpsTwoPhaseLaw : public EffLawT::Traits
466436

467437
template <class Evaluation, class PointsContainer>
468438
OPM_HOST_DEVICE static Evaluation unscaledToScaledSatThreePoint_(const Evaluation& unscaledSat,
469-
<<<<<<< HEAD
470-
<<<<<<< HEAD
471439
const PointsContainer& unscaledSats,
472440
const PointsContainer& scaledSats)
473-
=======
474-
const PointsContainer& unscaledSats,
475-
const PointsContainer& scaledSats)
476-
>>>>>>> 2ae970437 (First version)
477-
=======
478-
const PointsContainer& unscaledSats,
479-
const PointsContainer& scaledSats)
480-
>>>>>>> 3c3d9553a (improve robustness and formatting)
481441
{
482442
using ScaledSat = std::remove_cv_t<std::remove_reference_t<decltype(scaledSats[0])>>;
483443

@@ -565,18 +525,8 @@ class EclEpsTwoPhaseLaw : public EffLawT::Traits
565525
*/
566526
template <class Evaluation>
567527
OPM_HOST_DEVICE static Evaluation unscaledToScaledKrw_(const Evaluation& SwScaled,
568-
<<<<<<< HEAD
569-
<<<<<<< HEAD
570-
const Params& params,
571-
const Evaluation& unscaledKrw)
572-
=======
573-
const Params& params,
574-
const Evaluation& unscaledKrw)
575-
>>>>>>> 2ae970437 (First version)
576-
=======
577528
const Params& params,
578529
const Evaluation& unscaledKrw)
579-
>>>>>>> 3c3d9553a (improve robustness and formatting)
580530
{
581531
const auto& cfg = params.config();
582532

@@ -648,18 +598,8 @@ class EclEpsTwoPhaseLaw : public EffLawT::Traits
648598
*/
649599
template <class Evaluation>
650600
OPM_HOST_DEVICE static Evaluation unscaledToScaledKrn_(const Evaluation& SwScaled,
651-
<<<<<<< HEAD
652-
<<<<<<< HEAD
653-
const Params& params,
654-
const Evaluation& unscaledKrn)
655-
=======
656-
const Params& params,
657-
const Evaluation& unscaledKrn)
658-
>>>>>>> 2ae970437 (First version)
659-
=======
660601
const Params& params,
661602
const Evaluation& unscaledKrn)
662-
>>>>>>> 3c3d9553a (improve robustness and formatting)
663603
{
664604
const auto& cfg = params.config();
665605

0 commit comments

Comments
 (0)