OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prefer std::vector<> over explicit malloc()s.

Browse Source
This commit is contained in:
Bård Skaflestad
2012-05-21 15:26:46 +02:00
parent 27bb7a4854
commit b5a5c74cf6
1 changed files with 24 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
opm/core/transport/reorder/reordersequence.cpp
View File

@@ -1,7 +1,5 @@
/* Copyright 2011 (c) Jostein R. Natvig <Jostein.R.Natvig at sintef.no> */ /* Copyright 2011 (c) Jostein R. Natvig <Jostein.R.Natvig at sintef.no> */
#include <cstdlib>
#ifdef MATLAB_MEX_FILE #ifdef MATLAB_MEX_FILE
#include "grid.h" #include "grid.h"
#include "reordersequence.h" #include "reordersequence.h"
@@ -14,6 +12,7 @@
#include <algorithm> #include <algorithm>
#include <cmath> #include <cmath>
#include <vector>
struct SortByAbsFlux struct SortByAbsFlux
{ {
@@ -133,25 +132,19 @@ compute_sequence(const struct UnstructuredGrid* grid ,
const std::size_t nf = grid->number_of_faces; const std::size_t nf = grid->number_of_faces;
const std::size_t sz = std::max(nf, 3 * nc); const std::size_t sz = std::max(nf, 3 * nc);
int* work = (int*) std::malloc( sz * sizeof *work); std::vector<int> work(sz);
int* ia = (int*) std::malloc((nc + 1) * sizeof *ia ); std::vector<int> ia (nc + 1);
int* ja = (int*) std::malloc( nf * sizeof *ja ); /* A bit too much... */ std::vector<int> ja (nf); // A bit too much.
if (work && ia && ja) { compute_reorder_sequence_graph(grid->number_of_cells,
compute_reorder_sequence_graph(grid->number_of_cells, grid->cell_faces,
grid->cell_faces, grid->cell_facepos,
grid->cell_facepos, grid->face_cells,
grid->face_cells, flux,
flux, sequence,
sequence, components,
components, ncomponents,
ncomponents, & ia[0], & ja[0], & work[0]);
ia, ja, work);
}
std::free(ja);
std::free(ia);
std::free(work);
} }
@@ -170,21 +163,17 @@ compute_sequence_graph(const struct UnstructuredGrid* grid ,
const std::size_t nf = grid->number_of_faces; const std::size_t nf = grid->number_of_faces;
const std::size_t sz = std::max(nf, 3 * nc); const std::size_t sz = std::max(nf, 3 * nc);
int* work = (int*) std::malloc(sz * sizeof *work); std::vector<int> work(sz);
if (work) { compute_reorder_sequence_graph(grid->number_of_cells,
compute_reorder_sequence_graph(grid->number_of_cells, grid->cell_faces,
grid->cell_faces, grid->cell_facepos,
grid->cell_facepos, grid->face_cells,
grid->face_cells, flux,
flux, sequence,
sequence, components,
components, ncomponents,
ncomponents, ia, ja, & work[0]);
ia, ja, work);
}
std::free(work);
} }