OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-19 05:53:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Clean up implementation.

Browse Source 
Specifically: Remove an unused header (stdio.h), replace <stdlib.h> by
its C++ counterpart (<cstlib>), and reference malloc() and free() from
the std:: namespace.
This commit is contained in:
Bård Skaflestad 2012-05-21 15:01:53 +02:00
parent 2006f3e3f8
commit 2e02731ed8
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
/* Copyright 2011 (c) Jostein R. Natvig <Jostein.R.Natvig at sintef.no> */
#include <stdio.h>
#include <stdlib.h>
#include <cstdlib>
#ifdef MATLAB_MEX_FILE
#include "grid.h"
#include "reordersequence.h"
@ -102,9 +102,9 @@ compute_reorder_sequence(int nc, int nf, int *cellfaces, int *faceptr, int *face
sz = 3*nc;
}
work = (int*) malloc( sz * sizeof *work);
ia = (int*) malloc((nc+1) * sizeof *ia);
ja = (int*) malloc( nf * sizeof *ja); /* A bit too much... */
work = (int*) std::malloc( sz * sizeof *work);
ia = (int*) std::malloc((nc+1) * sizeof *ia);
ja = (int*) std::malloc( nf * sizeof *ja); /* A bit too much... */
make_upwind_graph(nc, cellfaces, faceptr, face2cell,
@ -112,9 +112,9 @@ compute_reorder_sequence(int nc, int nf, int *cellfaces, int *faceptr, int *face
tarjan (nc, ia, ja, sequence, components, ncomponents, work);
free(ja);
free(ia);
free(work);
std::free(ja);
std::free(ia);
std::free(work);
}
@ -130,7 +130,7 @@ compute_reorder_sequence_graph(int nc, int nf, int *cellfaces, int *faceptr, int
sz = 3*nc;
}
work = (int*) malloc( sz * sizeof *work);
work = (int*) std::malloc( sz * sizeof *work);
make_upwind_graph(nc, cellfaces, faceptr, face2cell,
@ -138,7 +138,7 @@ compute_reorder_sequence_graph(int nc, int nf, int *cellfaces, int *faceptr, int
tarjan (nc, ia, ja, sequence, components, ncomponents, work);
free(work);
std::free(work);
}