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

Made reordersequence a C++ source file, in order to use std::sort().

Browse Source 
This is for the experimental change of the graph topology, putting the
connections in the graph sorted by flux magnitude. Currently the
changes are in the file, but commented out until further experiments
have been done.
This commit is contained in:
Atgeirr Flø Rasmussen 2012-02-15 22:42:07 +01:00
parent c8e0d59611
commit 541813ace5
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -80,7 +80,7 @@ opm/core/transport/spu_implicit.c \
opm/core/transport/transport_source.c \
opm/core/transport/reorder/TransportModelInterface.cpp \
opm/core/transport/reorder/TransportModelTwophase.cpp \
opm/core/transport/reorder/reordersequence.c \
opm/core/transport/reorder/reordersequence.cpp \
opm/core/transport/reorder/nlsolvers.c \
opm/core/transport/reorder/tarjan.c

28
opm/core/transport/reorder/reordersequence.c → opm/core/transport/reorder/reordersequence.cpp
View File

@ -12,6 +12,20 @@
#include <opm/core/transport/reorder/tarjan.h>
#endif
#include <algorithm>
#include <cmath>
struct SortByAbsFlux
{
SortByAbsFlux(const double* flux)
: flux_(flux)
{}
bool operator() (int f1, int f2)
{
return std::fabs(flux_[f1]) < std::fabs(flux_[f2]);
}
const double* flux_;
};
/* Construct adjacency matrix of upwind graph wrt flux. Column
indices are not sorted. */
@ -64,11 +78,15 @@ make_upwind_graph(int nc, int *cellfaces, int *faceptr, int *face2cell,
if ( theflux < 0)
{
ja[p++] = work[f];
// ja[p++] = f;
ja[p++] = work[f];
}
}
ia[i+1] = p;
// std::sort(ja + ia[i], ja + ia[i+1], SortByAbsFlux(flux));
// for (j = ia[i]; j < ia[i+1]; ++j) {
// ja[j] = work[ja[j]];
// }
}
}
@ -84,9 +102,9 @@ compute_reorder_sequence(int nc, int nf, int *cellfaces, int *faceptr, int *face
sz = 3*nc;
}
work = malloc( sz * sizeof *work);
ia = malloc((nc+1) * sizeof *ia);
ja = malloc( nf * sizeof *ja); /* A bit too much... */
work = (int*) malloc( sz * sizeof *work);
ia = (int*) malloc((nc+1) * sizeof *ia);
ja = (int*) malloc( nf * sizeof *ja); /* A bit too much... */
make_upwind_graph(nc, cellfaces, faceptr, face2cell,