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

Small cleanup in code.

Browse Source
This commit is contained in:
Halvor M. Nilsen 2012-06-12 12:46:19 +02:00
parent 843163fb4b
commit c550e8b4a2
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
opm/core/vag_format/vag.cpp
View File

@ -297,7 +297,7 @@ namespace OPM
volumes_to_vertices[i]=nodes; volumes_to_vertices[i]=nodes;
} }
// fill volume to vertice map
vag_grid.volumes_to_vertices.pos.resize(grid.number_of_cells+1); vag_grid.volumes_to_vertices.pos.resize(grid.number_of_cells+1);
vag_grid.volumes_to_vertices.value.resize(0); vag_grid.volumes_to_vertices.value.resize(0);
vag_grid.volumes_to_vertices.pos[0]=0; vag_grid.volumes_to_vertices.pos[0]=0;
@ -312,13 +312,12 @@ namespace OPM
std::set< std::set<int> > edges; std::set< std::set<int> > edges;
std::vector< std::vector< std::set<int> > > faces_spares; std::vector< std::vector< std::set<int> > > faces_spares;
//std::map<std::set<int>, int> edge_to_face;
int nfe=0; int nfe=0;
faces_spares.resize(grid.number_of_faces); faces_spares.resize(grid.number_of_faces);
for(int i=0;i < grid.number_of_faces;++i){ for(int i=0;i < grid.number_of_faces;++i){
int ne=grid.face_nodepos[i+1]-grid.face_nodepos[i]; int ne=grid.face_nodepos[i+1]-grid.face_nodepos[i];
nfe=nfe+ne; nfe=nfe+ne;
for(int j=0; j < ne-1;++j){ for(int j=0; j < ne-1;++j){
int node1=grid.face_nodes[grid.face_nodepos[i]+j]+1; int node1=grid.face_nodes[grid.face_nodepos[i]+j]+1;
int node2=grid.face_nodes[grid.face_nodepos[i]+j+1]+1; int node2=grid.face_nodes[grid.face_nodepos[i]+j+1]+1;
@ -328,6 +327,7 @@ namespace OPM
edges.insert(spair); edges.insert(spair);
faces_spares[i].push_back(spair); faces_spares[i].push_back(spair);
} }
// add end segment
{ {
std::set<int> spair; std::set<int> spair;
int node1=grid.face_nodes[grid.face_nodepos[i]+ne-1]+1; int node1=grid.face_nodes[grid.face_nodepos[i]+ne-1]+1;
@ -337,9 +337,9 @@ namespace OPM
edges.insert(spair); edges.insert(spair);
faces_spares[i].push_back(spair); faces_spares[i].push_back(spair);
} }
//edge_to_face.insert(std::pair< std::set<int> , int >(spair,i));
} }
// make edge numbering
// make edge numbering and fill edges
std::map<std::set<int>, int> edge_map; std::map<std::set<int>, int> edge_map;
std::set< std::set<int> >::iterator it; std::set< std::set<int> >::iterator it;
vag_grid.edges.resize(0); vag_grid.edges.resize(0);
@ -352,8 +352,7 @@ namespace OPM
vag_grid.edges.push_back(*sit); vag_grid.edges.push_back(*sit);
} }
} }
// make missing maps. // fill face_to_egdes
// std::map<std::set<int>, int>::key_compare mycomp=edge_map.key_comp();
vag_grid.number_of_edges=edges.size(); vag_grid.number_of_edges=edges.size();
vag_grid.faces_to_edges.pos.resize(vag_grid.number_of_faces+1); vag_grid.faces_to_edges.pos.resize(vag_grid.number_of_faces+1);
for(int i=0;i < grid.number_of_faces;++i){ for(int i=0;i < grid.number_of_faces;++i){