diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp index 99ebe88379..204531a0dc 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp +++ b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp @@ -640,7 +640,7 @@ std::map> auto it = completions.find( gridName ); if ( it == completions.end() ) { - completions.insert( std::pair>( gridName, {completion} ) ); + completions.insert( std::pair>( gridName, { completion } ) ); } else { @@ -716,19 +716,19 @@ void RicWellPathExportCompletionDataFeatureImpl::exportWelspecsToFile( RimEclips RifTextDataTableFormatter formatter( stream ); formatter.setColumnSpacing( 2 ); - std::vector header = {RifTextDataTableColumn( "Well" ), - RifTextDataTableColumn( "Grp" ), - RifTextDataTableColumn( "I" ), - RifTextDataTableColumn( "J" ), - RifTextDataTableColumn( "RefDepth" ), - RifTextDataTableColumn( "Type" ), - RifTextDataTableColumn( "DrainRad" ), - RifTextDataTableColumn( "GasInEq" ), - RifTextDataTableColumn( "AutoShut" ), - RifTextDataTableColumn( "XFlow" ), - RifTextDataTableColumn( "FluidPVT" ), - RifTextDataTableColumn( "HydSDens" ), - RifTextDataTableColumn( "FluidInPlReg" )}; + std::vector header = { RifTextDataTableColumn( "Well" ), + RifTextDataTableColumn( "Grp" ), + RifTextDataTableColumn( "I" ), + RifTextDataTableColumn( "J" ), + RifTextDataTableColumn( "RefDepth" ), + RifTextDataTableColumn( "Type" ), + RifTextDataTableColumn( "DrainRad" ), + RifTextDataTableColumn( "GasInEq" ), + RifTextDataTableColumn( "AutoShut" ), + RifTextDataTableColumn( "XFlow" ), + RifTextDataTableColumn( "FluidPVT" ), + RifTextDataTableColumn( "HydSDens" ), + RifTextDataTableColumn( "FluidInPlReg" ) }; formatter.keyword( "WELSPECS" ); formatter.header( header ); @@ -783,20 +783,20 @@ void RicWellPathExportCompletionDataFeatureImpl::exportWelspeclToFile( RifTextDataTableFormatter formatter( stream ); formatter.setColumnSpacing( 2 ); - std::vector header = {RifTextDataTableColumn( "Well" ), - RifTextDataTableColumn( "Grp" ), - RifTextDataTableColumn( "LGR" ), - RifTextDataTableColumn( "I" ), - RifTextDataTableColumn( "J" ), - RifTextDataTableColumn( "RefDepth" ), - RifTextDataTableColumn( "Type" ), - RifTextDataTableColumn( "DrainRad" ), - RifTextDataTableColumn( "GasInEq" ), - RifTextDataTableColumn( "AutoShut" ), - RifTextDataTableColumn( "XFlow" ), - RifTextDataTableColumn( "FluidPVT" ), - RifTextDataTableColumn( "HydSDens" ), - RifTextDataTableColumn( "FluidInPlReg" )}; + std::vector header = { RifTextDataTableColumn( "Well" ), + RifTextDataTableColumn( "Grp" ), + RifTextDataTableColumn( "LGR" ), + RifTextDataTableColumn( "I" ), + RifTextDataTableColumn( "J" ), + RifTextDataTableColumn( "RefDepth" ), + RifTextDataTableColumn( "Type" ), + RifTextDataTableColumn( "DrainRad" ), + RifTextDataTableColumn( "GasInEq" ), + RifTextDataTableColumn( "AutoShut" ), + RifTextDataTableColumn( "XFlow" ), + RifTextDataTableColumn( "FluidPVT" ), + RifTextDataTableColumn( "HydSDens" ), + RifTextDataTableColumn( "FluidInPlReg" ) }; formatter.keyword( "WELSPECL" ); formatter.header( header ); @@ -960,44 +960,46 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompdatTableUsingFormatte if ( gridName.isEmpty() ) { - header = {RifTextDataTableColumn( "Well" ), - RifTextDataTableColumn( "I" ), - RifTextDataTableColumn( "J" ), - RifTextDataTableColumn( "K1" ), - RifTextDataTableColumn( "K2" ), - RifTextDataTableColumn( "Status" ), - RifTextDataTableColumn( "SAT" ), - RifTextDataTableColumn( "TR", - RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), - RifTextDataTableColumn( "DIAM" ), - RifTextDataTableColumn( "KH", - RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), - RifTextDataTableColumn( "S" ), - RifTextDataTableColumn( "Df", - RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), - RifTextDataTableColumn( "DIR" )}; + header = + { RifTextDataTableColumn( "Well" ), + RifTextDataTableColumn( "I" ), + RifTextDataTableColumn( "J" ), + RifTextDataTableColumn( "K1" ), + RifTextDataTableColumn( "K2" ), + RifTextDataTableColumn( "Status" ), + RifTextDataTableColumn( "SAT" ), + RifTextDataTableColumn( "TR", + RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), + RifTextDataTableColumn( "DIAM" ), + RifTextDataTableColumn( "KH", + RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), + RifTextDataTableColumn( "S" ), + RifTextDataTableColumn( "Df", + RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), + RifTextDataTableColumn( "DIR" ) }; formatter.keyword( "COMPDAT" ); } else { - header = {RifTextDataTableColumn( "Well" ), - RifTextDataTableColumn( "LgrName" ), - RifTextDataTableColumn( "I" ), - RifTextDataTableColumn( "J" ), - RifTextDataTableColumn( "K1" ), - RifTextDataTableColumn( "K2" ), - RifTextDataTableColumn( "Status" ), - RifTextDataTableColumn( "SAT" ), - RifTextDataTableColumn( "TR", - RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), - RifTextDataTableColumn( "DIAM" ), - RifTextDataTableColumn( "KH", - RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), - RifTextDataTableColumn( "S" ), - RifTextDataTableColumn( "Df", - RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), - RifTextDataTableColumn( "DIR" )}; + header = + { RifTextDataTableColumn( "Well" ), + RifTextDataTableColumn( "LgrName" ), + RifTextDataTableColumn( "I" ), + RifTextDataTableColumn( "J" ), + RifTextDataTableColumn( "K1" ), + RifTextDataTableColumn( "K2" ), + RifTextDataTableColumn( "Status" ), + RifTextDataTableColumn( "SAT" ), + RifTextDataTableColumn( "TR", + RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), + RifTextDataTableColumn( "DIAM" ), + RifTextDataTableColumn( "KH", + RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), + RifTextDataTableColumn( "S" ), + RifTextDataTableColumn( "Df", + RifTextDataTableDoubleFormatting( RifTextDataTableDoubleFormat::RIF_SCIENTIFIC ) ), + RifTextDataTableColumn( "DIR" ) }; formatter.keyword( "COMPDATL" ); } @@ -1175,8 +1177,7 @@ std::vector RicWellPathExportCompletionDataFeatureImpl::gener !interval->isActiveOnDate( settings.caseToApply->timeStepDates()[settings.timeStep] ) ) continue; - using namespace std; - pair, vector> perforationPointsAndMD = + std::pair, std::vector> perforationPointsAndMD = wellPath->wellPathGeometry()->clippedPointSubset( interval->startMD(), interval->endMD() ); std::vector intersectedCells = @@ -1273,7 +1274,7 @@ void RicWellPathExportCompletionDataFeatureImpl::appendCompletionData( { completionData->insert( std::pair>( completion.completionDataGridCell().globalCellIndex(), - std::vector{completion} ) ); + std::vector{ completion } ) ); } } } diff --git a/ApplicationCode/Commands/HoloLensCommands/farmhash/farmhash.cc b/ApplicationCode/Commands/HoloLensCommands/farmhash/farmhash.cc index f2b99ffc6a..f5c86647bc 100644 --- a/ApplicationCode/Commands/HoloLensCommands/farmhash/farmhash.cc +++ b/ApplicationCode/Commands/HoloLensCommands/farmhash/farmhash.cc @@ -411,7 +411,6 @@ template <> uint128_t DebugTweak(uint128_t x) { } // namespace NAMESPACE_FOR_HASH_FUNCTIONS -using namespace std; using namespace NAMESPACE_FOR_HASH_FUNCTIONS; namespace farmhashna { #undef Fetch @@ -480,7 +479,7 @@ STATIC_INLINE uint64_t HashLen17to32(const char *s, size_t len) { // Return a 16-byte hash for 48 bytes. Quick and dirty. // Callers do best to use "random-looking" values for a and b. -STATIC_INLINE pair WeakHashLen32WithSeeds( +STATIC_INLINE std::pair WeakHashLen32WithSeeds( uint64_t w, uint64_t x, uint64_t y, uint64_t z, uint64_t a, uint64_t b) { a += w; b = Rotate(b + a + z, 21); @@ -488,11 +487,11 @@ STATIC_INLINE pair WeakHashLen32WithSeeds( a += x; a += y; b += Rotate(a, 44); - return make_pair(a + z, b + c); + return std::make_pair(a + z, b + c); } // Return a 16-byte hash for s[0] ... s[31], a, and b. Quick and dirty. -STATIC_INLINE pair WeakHashLen32WithSeeds( +STATIC_INLINE std::pair WeakHashLen32WithSeeds( const char* s, uint64_t a, uint64_t b) { return WeakHashLen32WithSeeds(Fetch(s), Fetch(s + 8), @@ -536,8 +535,8 @@ uint64_t Hash64(const char *s, size_t len) { uint64_t x = seed; uint64_t y = seed * k1 + 113; uint64_t z = ShiftMix(y * k2 + 113) * k2; - pair v = make_pair(0, 0); - pair w = make_pair(0, 0); + std::pair v = std::make_pair(0, 0); + std::pair w = std::make_pair(0, 0); x = x * k2 + Fetch(s); // Set end so that after the loop we have 1 to 64 bytes left to process. @@ -609,8 +608,8 @@ uint64_t Hash64WithSeeds(const char *s, size_t len, uint64_t x = seed0; uint64_t y = seed1 * k2 + 113; uint64_t z = farmhashna::ShiftMix(y * k2) * k2; - pair v = make_pair(seed0, seed1); - pair w = make_pair(0, 0); + std::pair v = std::make_pair(seed0, seed1); + std::pair w = std::make_pair(0, 0); uint64_t u = x - z; x *= k2; uint64_t mul = k2 + (u & 0x82); @@ -1743,7 +1742,7 @@ STATIC_INLINE uint64_t HashLen0to16(const char *s, size_t len) { // Return a 16-byte hash for 48 bytes. Quick and dirty. // Callers do best to use "random-looking" values for a and b. -STATIC_INLINE pair WeakHashLen32WithSeeds( +STATIC_INLINE std::pair WeakHashLen32WithSeeds( uint64_t w, uint64_t x, uint64_t y, uint64_t z, uint64_t a, uint64_t b) { a += w; b = Rotate(b + a + z, 21); @@ -1751,11 +1750,11 @@ STATIC_INLINE pair WeakHashLen32WithSeeds( a += x; a += y; b += Rotate(a, 44); - return make_pair(a + z, b + c); + return std::make_pair(a + z, b + c); } // Return a 16-byte hash for s[0] ... s[31], a, and b. Quick and dirty. -STATIC_INLINE pair WeakHashLen32WithSeeds( +STATIC_INLINE std::pair WeakHashLen32WithSeeds( const char* s, uint64_t a, uint64_t b) { return WeakHashLen32WithSeeds(Fetch(s), Fetch(s + 8), @@ -1806,7 +1805,7 @@ uint128_t CityHash128WithSeed(const char *s, size_t len, uint128_t seed) { // We expect len >= 128 to be the common case. Keep 56 bytes of state: // v, w, x, y, and z. - pair v, w; + std::pair v, w; uint64_t x = Uint128Low64(seed); uint64_t y = Uint128High64(seed); uint64_t z = len * k1; @@ -11837,4 +11836,4 @@ int main() { __builtin_unreachable(); } -#endif // FARMHASHSELFTEST +#endif // FARMHASHSELFTEST \ No newline at end of file