From 3f172bb3dd65e8f4b8b793eb716268c4d8615070 Mon Sep 17 00:00:00 2001 From: Luca Fedeli Date: Fri, 25 Feb 2022 00:03:28 +0100 Subject: Remove (almost) all residual "dangerous" c-style casts in WarpX (#2889) * remove almost all c-style casts in WarpX * add comment * Fix `getMultiFabPointers`: `const` cast Co-authored-by: Axel Huebl --- Source/Python/WarpXWrappers.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'Source/Python/WarpXWrappers.cpp') diff --git a/Source/Python/WarpXWrappers.cpp b/Source/Python/WarpXWrappers.cpp index 8f49057e4..cb88e3a89 100644 --- a/Source/Python/WarpXWrappers.cpp +++ b/Source/Python/WarpXWrappers.cpp @@ -38,7 +38,7 @@ namespace { - amrex::Real** getMultiFabPointers(const amrex::MultiFab& mf, int *num_boxes, int *ncomps, int **ngrowvect, int **shapes) + amrex::Real** getMultiFabPointers (amrex::MultiFab& mf, int *num_boxes, int *ncomps, int **ngrowvect, int **shapes) { *ncomps = mf.nComp(); *num_boxes = mf.local_size(); @@ -57,7 +57,7 @@ namespace #endif for ( amrex::MFIter mfi(mf, false); mfi.isValid(); ++mfi ) { int i = mfi.LocalIndex(); - data[i] = (amrex::Real*) mf[mfi].dataPtr(); + data[i] = mf[mfi].dataPtr(); for (int j = 0; j < AMREX_SPACEDIM; ++j) { (*shapes)[shapesize*i+j] = mf[mfi].box().length(j); } @@ -65,7 +65,7 @@ namespace } return data; } - int* getMultiFabLoVects(const amrex::MultiFab& mf, int *num_boxes, int **ngrowvect) + int* getMultiFabLoVects (const amrex::MultiFab& mf, int *num_boxes, int **ngrowvect) { int shapesize = AMREX_SPACEDIM; *ngrowvect = static_cast(malloc(sizeof(int)*shapesize)); @@ -73,7 +73,7 @@ namespace (*ngrowvect)[j] = mf.nGrow(j); } *num_boxes = mf.local_size(); - int *loVects = (int*) malloc((*num_boxes)*AMREX_SPACEDIM * sizeof(int)); + auto loVects = static_cast(malloc((*num_boxes)*AMREX_SPACEDIM * sizeof(int))); int i = 0; for ( amrex::MFIter mfi(mf, false); mfi.isValid(); ++mfi, ++i ) { @@ -90,7 +90,7 @@ namespace { if (mf == nullptr) return nullptr; const amrex::IntVect nodal_flag( mf->ixType().toIntVect() ); - int *nodal_flag_data = (int*) malloc(AMREX_SPACEDIM * sizeof(int)); + auto *nodal_flag_data = static_cast(malloc(AMREX_SPACEDIM * sizeof(int))); constexpr int NODE = amrex::IndexType::NODE; @@ -451,9 +451,9 @@ namespace // *num_tiles = myspc.numLocalTilesAtLevel(lev); *num_tiles = i; - *particles_per_tile = (int*) malloc(*num_tiles*sizeof(int)); + *particles_per_tile = static_cast(malloc(*num_tiles*sizeof(int))); - amrex::ParticleReal** data = (amrex::ParticleReal**) malloc(*num_tiles*sizeof(typename WarpXParticleContainer::ParticleType*)); + auto data = static_cast(malloc(*num_tiles*sizeof(typename WarpXParticleContainer::ParticleType*))); i = 0; for (WarpXParIter pti(myspc, lev); pti.isValid(); ++pti, ++i) { auto& aos = pti.GetArrayOfStructs(); @@ -478,9 +478,9 @@ namespace // *num_tiles = myspc.numLocalTilesAtLevel(lev); *num_tiles = i; - *particles_per_tile = (int*) malloc(*num_tiles*sizeof(int)); + *particles_per_tile = static_cast(malloc(*num_tiles*sizeof(int))); - amrex::ParticleReal** data = (amrex::ParticleReal**) malloc(*num_tiles*sizeof(amrex::ParticleReal*)); + auto data = static_cast(malloc(*num_tiles*sizeof(amrex::ParticleReal*))); i = 0; for (WarpXParIter pti(myspc, lev); pti.isValid(); ++pti, ++i) { auto& soa = pti.GetStructOfArrays(); @@ -546,9 +546,9 @@ namespace // *num_tiles = myspc.numLocalTilesAtLevel(lev); *num_tiles = i; - *particles_per_tile = (int*) malloc(*num_tiles*sizeof(int)); + *particles_per_tile = static_cast(malloc(*num_tiles*sizeof(int))); - int** data = (int**) malloc(*num_tiles*sizeof(int*)); + auto data = static_cast(malloc(*num_tiles*sizeof(int*))); i = 0; for (amrex::ParIter<0,0,PIdx::nattribs, 0, amrex::PinnedArenaAllocator> pti(particle_buffer, lev); pti.isValid(); ++pti, ++i) { auto& soa = pti.GetStructOfArrays(); @@ -573,9 +573,9 @@ namespace // *num_tiles = myspc.numLocalTilesAtLevel(lev); *num_tiles = i; - *particles_per_tile = (int*) malloc(*num_tiles*sizeof(int)); + *particles_per_tile = static_cast(malloc(*num_tiles*sizeof(int))); - amrex::ParticleReal** data = (amrex::ParticleReal**) malloc(*num_tiles*sizeof(amrex::ParticleReal*)); + auto data = static_cast(malloc(*num_tiles*sizeof(amrex::ParticleReal*))); i = 0; for (amrex::ParIter<0,0,PIdx::nattribs, 0, amrex::PinnedArenaAllocator> pti(particle_buffer, lev); pti.isValid(); ++pti, ++i) { auto& soa = pti.GetStructOfArrays(); @@ -598,9 +598,9 @@ namespace // *num_tiles = myspc.numLocalTilesAtLevel(lev); *num_tiles = i; - *particles_per_tile = (int*) malloc(*num_tiles*sizeof(int)); + *particles_per_tile = static_cast(malloc(*num_tiles*sizeof(int))); - amrex::ParticleReal** data = (amrex::ParticleReal**) malloc(*num_tiles*sizeof(typename WarpXParticleContainer::ParticleType*)); + auto data = static_cast(malloc(*num_tiles*sizeof(typename WarpXParticleContainer::ParticleType*))); i = 0; for (amrex::ParIter<0,0,PIdx::nattribs, 0, amrex::PinnedArenaAllocator> pti(particle_buffer, lev); pti.isValid(); ++pti, ++i) { auto& aos = pti.GetArrayOfStructs(); -- cgit v1.2.3