DamarisWriter: avoid Opm:: prefix for symbols inside Opm namespace

This commit is contained in:
Arne Morten Kvarving 2024-01-31 09:06:37 +01:00
parent adc8b968e4
commit 4f366ddb9f

View File

@ -94,9 +94,9 @@ class DamarisWriter : public EclGenericWriter<GetPropType<TypeTag, Properties::G
using ElementMapper = GetPropType<TypeTag, Properties::ElementMapper>; using ElementMapper = GetPropType<TypeTag, Properties::ElementMapper>;
using BaseType = EclGenericWriter<Grid,EquilGrid,GridView,ElementMapper,Scalar>; using BaseType = EclGenericWriter<Grid,EquilGrid,GridView,ElementMapper,Scalar>;
using DamarisVarInt = Opm::DamarisOutput::DamarisVar<int> ; using DamarisVarInt = DamarisOutput::DamarisVar<int>;
using DamarisVarChar = Opm::DamarisOutput::DamarisVar<char> ; using DamarisVarChar = DamarisOutput::DamarisVar<char>;
using DamarisVarDbl = Opm::DamarisOutput::DamarisVar<double> ; using DamarisVarDbl = DamarisOutput::DamarisVar<double>;
public: public:
static void registerParameters() static void registerParameters()
@ -320,14 +320,14 @@ private:
dam_err_ = DamarisOutput::setPosition("GLOBAL_CELL_INDEX", rank_, elements_rank_offsets[rank_]); dam_err_ = DamarisOutput::setPosition("GLOBAL_CELL_INDEX", rank_, elements_rank_offsets[rank_]);
// Set the size of the MPI variable // Set the size of the MPI variable
DamarisVarInt mpi_rank_var(1, {std::string("n_elements_local")}, std::string("MPI_RANK"), rank_) ; DamarisVarInt mpi_rank_var(1, {"n_elements_local"}, "MPI_RANK", rank_) ;
mpi_rank_var.setDamarisPosition({static_cast<int64_t>(elements_rank_offsets[rank_])}); mpi_rank_var.setDamarisPosition({static_cast<int64_t>(elements_rank_offsets[rank_])});
} }
void writeDamarisGridOutput() void writeDamarisGridOutput()
{ {
const auto& gridView = simulator_.gridView(); const auto& gridView = simulator_.gridView();
Opm::GridDataOutput::SimMeshDataAccessor geomData(gridView, Dune::Partitions::interior) ; GridDataOutput::SimMeshDataAccessor geomData(gridView, Dune::Partitions::interior) ;
try { try {
const bool hasPolyCells = geomData.polyhedralCellPresent() ; const bool hasPolyCells = geomData.polyhedralCellPresent() ;
@ -384,7 +384,7 @@ private:
// Copy the mesh data from the Durne grid // Copy the mesh data from the Durne grid
long i = 0 ; long i = 0 ;
Opm::GridDataOutput::ConnectivityVertexOrder vtkorder = Opm::GridDataOutput::VTK ; GridDataOutput::ConnectivityVertexOrder vtkorder = GridDataOutput::VTK ;
i = geomData.writeConnectivity(var_connectivity, vtkorder) ; i = geomData.writeConnectivity(var_connectivity, vtkorder) ;
if ( i != geomData.getNCorners()) if ( i != geomData.getNCorners())