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

Merge pull request #902 from joakim-hove/rename-memcmp-double

Browse Source 
Renamed memcmp_double -> opm_memcmp_double
This commit is contained in:
Atgeirr Flø Rasmussen committed 2015-10-14 09:32:45 +02:00
2 parents 08eea02316 68e12e9250
commit a8e042aeb6
5 files changed
+26 -26
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

opm/core/grid/grid.c
+7 -7
View File
@@ -19,7 +19,7 @@
#include "config.h"
#include <opm/core/grid.h>
#include <opm/core/utility/memcmp_double.h>
#include <opm/core/utility/opm_memcmp_double.h>
#include <assert.h>
#include <errno.h>
@@ -585,22 +585,22 @@ grid_equal(const struct UnstructuredGrid * grid1 , const struct UnstructuredGrid
// Floating point comparisons.
{
if (memcmp_double( grid1->node_coordinates , grid2->node_coordinates , grid1->dimensions * grid1->number_of_nodes) != 0)
if (opm_memcmp_double( grid1->node_coordinates , grid2->node_coordinates , grid1->dimensions * grid1->number_of_nodes) != 0)
return false;
if (memcmp_double( grid1->face_centroids , grid2->face_centroids , grid1->dimensions * grid1->number_of_faces) != 0)
if (opm_memcmp_double( grid1->face_centroids , grid2->face_centroids , grid1->dimensions * grid1->number_of_faces) != 0)
return false;
if (memcmp_double( grid1->face_areas , grid2->face_areas , grid1->number_of_faces) != 0)
if (opm_memcmp_double( grid1->face_areas , grid2->face_areas , grid1->number_of_faces) != 0)
return false;
if (memcmp_double( grid1->face_normals , grid2->face_normals , grid1->dimensions * grid1->number_of_faces) != 0)
if (opm_memcmp_double( grid1->face_normals , grid2->face_normals , grid1->dimensions * grid1->number_of_faces) != 0)
return false;
if (memcmp_double( grid1->cell_centroids , grid2->cell_centroids , grid1->dimensions * grid1->number_of_cells) != 0)
if (opm_memcmp_double( grid1->cell_centroids , grid2->cell_centroids , grid1->dimensions * grid1->number_of_cells) != 0)
return false;
if (memcmp_double( grid1->cell_volumes , grid2->cell_volumes , grid1->number_of_cells) != 0)
if (opm_memcmp_double( grid1->cell_volumes , grid2->cell_volumes , grid1->number_of_cells) != 0)
return false;
}
return true;
opm/core/utility/memcmp_double.c → opm/core/utility/opm_memcmp_double.c
+1 -1
View File
@@ -8,7 +8,7 @@
http://www.cygnus-software.com/papers/comparingfloats/comparingfloats.htm
*/
int memcmp_double(const double * p1 , const double *p2 , size_t num_elements) {
int opm_memcmp_double(const double * p1 , const double *p2 , size_t num_elements) {
if (memcmp(p1 , p2 , num_elements * sizeof * p1) == 0)
return 0;
else {
opm/core/utility/memcmp_double.h → opm/core/utility/opm_memcmp_double.h
+3 -3
View File
@@ -4,15 +4,15 @@
otherwise it will return 1.
*/
#ifndef MEMCMP_DOUBLE_H
#define MEMCMP_DOUBLE_H
#ifndef OPM_MEMCMP_DOUBLE_H
#define OPM_MEMCMP_DOUBLE_H
#ifdef __cplusplus
extern "C" {
#endif
int memcmp_double(const double * p1 , const double *p2 , size_t num_elements);
int opm_memcmp_double(const double * p1 , const double *p2 , size_t num_elements);
#ifdef __cplusplus