From 4b125595da02f01868f3393334b725bdf8402786 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 16 Feb 2008 21:37:22 +0000
Subject: [PATCH] prepa PViewDataGModel
---
Geo/GModelIO_Mesh.cpp | 87 +++++++++++------------------
Geo/MVertex.h | 5 +-
Parser/OpenFile.cpp | 6 +-
Post/PView.cpp | 118 ++++++++++++++++++++-------------------
Post/PView.h | 8 ++-
Post/PViewDataGModel.cpp | 70 +----------------------
Post/PViewDataListIO.cpp | 6 +-
doc/VERSIONS | 4 +-
8 files changed, 113 insertions(+), 191 deletions(-)
diff --git a/Geo/GModelIO_Mesh.cpp b/Geo/GModelIO_Mesh.cpp
index 34afdd5126..70f0f8de76 100644
--- a/Geo/GModelIO_Mesh.cpp
+++ b/Geo/GModelIO_Mesh.cpp
@@ -1,4 +1,4 @@
-// $Id: GModelIO_Mesh.cpp,v 1.30 2008-01-28 09:59:52 geuzaine Exp $
+// $Id: GModelIO_Mesh.cpp,v 1.31 2008-02-16 21:37:22 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -277,10 +277,11 @@ int GModel::readMSH(const std::string &name)
std::map<int, std::vector<MVertex*> > points;
std::map<int, std::vector<MElement*> > elements[7];
std::map<int, std::map<int, std::string> > physicals[4];
+ bool postpro = false;
// we might want to cache those for post-processing lookups
- std::map<int, MVertex*> _vertexMap;
- std::vector<MVertex*> _vertexVector;
+ std::map<int, MVertex*> vertexMap;
+ std::vector<MVertex*> vertexVector;
while(1) {
@@ -341,8 +342,8 @@ int GModel::readMSH(const std::string &name)
if(sscanf(str, "%d", &numVertices) != 1) return 0;
Msg(INFO, "%d vertices", numVertices);
- _vertexVector.clear();
- _vertexMap.clear();
+ vertexVector.clear();
+ vertexMap.clear();
int progress = (numVertices > 100000) ? numVertices / 25 : 0;
int minVertex = numVertices + 1, maxVertex = -1;
@@ -360,10 +361,10 @@ int GModel::readMSH(const std::string &name)
}
minVertex = std::min(minVertex, num);
maxVertex = std::max(maxVertex, num);
- if(_vertexMap.count(num))
+ if(vertexMap.count(num))
Msg(WARNING, "Skipping duplicate vertex %d", num);
else
- _vertexMap[num] = new MVertex(xyz[0], xyz[1], xyz[2], 0, num);
+ vertexMap[num] = new MVertex(xyz[0], xyz[1], xyz[2], 0, num);
if(progress && (i % progress == progress - 1))
Msg(PROGRESS, "Read %d vertices", i + 1);
}
@@ -371,19 +372,19 @@ int GModel::readMSH(const std::string &name)
// If the vertex numbering is dense, tranfer the map into a
// vector to speed up element creation
- if((int)_vertexMap.size() == numVertices &&
+ if((int)vertexMap.size() == numVertices &&
((minVertex == 1 && maxVertex == numVertices) ||
(minVertex == 0 && maxVertex == numVertices - 1))){
Msg(INFO, "Vertex numbering is dense");
- _vertexVector.resize(_vertexMap.size() + 1);
+ vertexVector.resize(vertexMap.size() + 1);
if(minVertex == 1)
- _vertexVector[0] = 0;
+ vertexVector[0] = 0;
else
- _vertexVector[numVertices] = 0;
- std::map<int, MVertex*>::const_iterator it = _vertexMap.begin();
- for(; it != _vertexMap.end(); ++it)
- _vertexVector[it->first] = it->second;
- _vertexMap.clear();
+ vertexVector[numVertices] = 0;
+ std::map<int, MVertex*>::const_iterator it = vertexMap.begin();
+ for(; it != vertexMap.end(); ++it)
+ vertexVector[it->first] = it->second;
+ vertexMap.clear();
}
}
@@ -418,11 +419,11 @@ int GModel::readMSH(const std::string &name)
int indices[30];
for(int j = 0; j < numVertices; j++) fscanf(fp, "%d", &indices[j]);
std::vector<MVertex*> vertices;
- if(_vertexVector.size()){
- if(!getVertices(numVertices, indices, _vertexVector, vertices)) return 0;
+ if(vertexVector.size()){
+ if(!getVertices(numVertices, indices, vertexVector, vertices)) return 0;
}
else{
- if(!getVertices(numVertices, indices, _vertexMap, vertices)) return 0;
+ if(!getVertices(numVertices, indices, vertexMap, vertices)) return 0;
}
createElementMSH(this, num, type, physical, elementary, partition,
vertices, points, elements, physicals);
@@ -451,11 +452,11 @@ int GModel::readMSH(const std::string &name)
int partition = (numTags > 2) ? data[4 - numTags + 2] : 0;
int *indices = &data[numTags + 1];
std::vector<MVertex*> vertices;
- if(_vertexVector.size()){
- if(!getVertices(numVertices, indices, _vertexVector, vertices)) return 0;
+ if(vertexVector.size()){
+ if(!getVertices(numVertices, indices, vertexVector, vertices)) return 0;
}
else{
- if(!getVertices(numVertices, indices, _vertexMap, vertices)) return 0;
+ if(!getVertices(numVertices, indices, vertexMap, vertices)) return 0;
}
createElementMSH(this, num, type, physical, elementary, partition,
vertices, points, elements, physicals);
@@ -469,34 +470,10 @@ int GModel::readMSH(const std::string &name)
if(progress) Msg(PROGRESS, "");
}
- /*
else if(!strncmp(&str[1], "NodeData", 8)) {
- if(!fgets(str, sizeof(str), fp)) return 0;
- // name = str[1] + remove final "
- int timeStep, numData, numComponents;
- double time;
- if(_vertexVector.empty() && _vertexMap.empty()){
- Msg(GERROR, "Mesh vertex information missing: impossible to load dataset");
- return false;
- }
-
- if(fscanf(fp, "%d %lf %d %d", &timeStep, &time, &numData, &numComponents) != 4)
- return 0;
- Msg(INFO, "%d node data", numData);
-
- //std::map<int, int> nodeNumber, nodeIndex
- PViewDataGModel *p = getPViewDataGModel(name)
- if(p){ // add data to existing view
- if(!p.count(timeStep)){
- // we don't have any data for this time step
- p[timeStep] = new nodeData(numNodes);
- }
- data = p[timeStep];
- if(num
- data.scalar.indices.append();
- data.scalar.values.append();
+ // there's some post-processing data to read later on
+ postpro = true;
}
- */
do {
if(!fgets(str, sizeof(str), fp) || feof(fp))
@@ -517,12 +494,12 @@ int GModel::readMSH(const std::string &name)
// vertex for each mesh vertex
if(noElements){
Msg(INFO, "No elements in mesh: creating geometry vertices");
- for(unsigned int i = 0; i < _vertexVector.size(); i++){
- MVertex *v = _vertexVector[i];
+ for(unsigned int i = 0; i < vertexVector.size(); i++){
+ MVertex *v = vertexVector[i];
if(v) points[v->getNum()].push_back(v);
}
- for(std::map<int, MVertex*>::iterator it = _vertexMap.begin();
- it != _vertexMap.end(); ++it)
+ for(std::map<int, MVertex*>::iterator it = vertexMap.begin();
+ it != vertexMap.end(); ++it)
points[it->second->getNum()].push_back(it->second);
}
@@ -548,17 +525,17 @@ int GModel::readMSH(const std::string &name)
(*it)->mesh_vertices.clear();
// store the vertices in their associated geometrical entity
- if(_vertexVector.size())
- storeVerticesInEntities(_vertexVector);
+ if(vertexVector.size())
+ storeVerticesInEntities(vertexVector);
else
- storeVerticesInEntities(_vertexMap);
+ storeVerticesInEntities(vertexMap);
// store the physical tags
for(int i = 0; i < 4; i++)
storePhysicalTagsInEntities(this, i, physicals[i]);
fclose(fp);
- return 1;
+ return postpro ? 2 : 1;
}
static void writeElementHeaderMSH(bool binary, FILE *fp, std::map<int,int> &elements,
diff --git a/Geo/MVertex.h b/Geo/MVertex.h
index c5c26189e3..e1706e6980 100644
--- a/Geo/MVertex.h
+++ b/Geo/MVertex.h
@@ -42,10 +42,11 @@ class MVertex{
char _visible, _order;
double _x, _y, _z;
GEntity *_ge;
+ //void *_data;
public :
MVertex(double x, double y, double z, GEntity *ge=0, int num=0)
- : _visible(true), _order(1), _x(x), _y(y), _z(z), _ge(ge)
+ : _visible(true), _order(1), _x(x), _y(y), _z(z), _ge(ge) //, _data(0)
{
if(num){
_num = num;
@@ -103,7 +104,7 @@ class MVertex{
linearSearch(std::set<MVertex*, MVertexLessThanLexicographic> &pos);
// Get the data associated with this vertex
- virtual void *getData(){ return 0; }
+ virtual void *getData(){ return 0 /* _data*/ ; }
// IO routines
void writeMSH(FILE *fp, bool binary=false, double scalingFactor=1.0);
diff --git a/Parser/OpenFile.cpp b/Parser/OpenFile.cpp
index 7560d991d6..fcb57ce472 100644
--- a/Parser/OpenFile.cpp
+++ b/Parser/OpenFile.cpp
@@ -1,4 +1,4 @@
-// $Id: OpenFile.cpp,v 1.172 2008-02-06 07:33:49 geuzaine Exp $
+// $Id: OpenFile.cpp,v 1.173 2008-02-16 21:37:22 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -385,10 +385,12 @@ int MergeFile(const char *name, int warn_if_missing)
!strncmp(header, "$PARA", 5) || !strncmp(header, "$ELM", 4) ||
!strncmp(header, "$MeshFormat", 11)) {
status = m->readMSH(name);
+ if(status > 1)
+ status = PView::readMSH(name);
}
else if(!strncmp(header, "$PostFormat", 11) ||
!strncmp(header, "$View", 5)) {
- status = PView::read(name);
+ status = PView::readPOS(name);
}
else {
status = m->readGEO(name);
diff --git a/Post/PView.cpp b/Post/PView.cpp
index d057a582ab..c7eb89bc97 100644
--- a/Post/PView.cpp
+++ b/Post/PView.cpp
@@ -1,4 +1,4 @@
-// $Id: PView.cpp,v 1.13 2008-01-20 12:21:30 geuzaine Exp $
+// $Id: PView.cpp,v 1.14 2008-02-16 21:37:22 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -153,7 +153,64 @@ void PView::setChanged(bool val)
if(_changed) _eye = SPoint3(0., 0., 0.);
}
-bool PView::read(std::string filename, int fileIndex)
+void PView::combine(bool time, int how, bool remove)
+{
+ // time == true: combine the timesteps (oherwise combine the elements)
+ // how == 0: try to combine all visible views
+ // 1: try to combine all views
+ // 2: try to combine all views having identical names
+
+ std::vector<nameData> nds;
+ for(unsigned int i = 0; i < list.size(); i++) {
+ PView *p = list[i];
+ PViewData *data = p->getData();
+ if(how || p->getOptions()->Visible) {
+ nameData nd;
+ // this will lead to weird results if there are views named
+ // "__all__" or "__vis__" :-)
+ if(how == 2)
+ nd.name = data->getName();
+ else if(how == 1)
+ nd.name = "__all__";
+ else
+ nd.name = "__vis__";
+ unsigned int j = 0;
+ while(j < nds.size()){
+ if(nds[j].name == nd.name){
+ nds[j].data.push_back(data);
+ nds[j].indices.push_back(i);
+ break;
+ }
+ j++;
+ }
+ if(j == nds.size()){
+ nd.data.push_back(data);
+ nd.indices.push_back(i);
+ nds.push_back(nd);
+ }
+ }
+ }
+
+ std::set<PView*> rm;
+ for(unsigned int i = 0; i < nds.size(); i++){
+ if(nds[i].data.size() > 1){
+ // there's potentially something to combine
+ PView *p = new PView(true);
+ PViewData *data = p->getData();
+ bool res = time ? data->combineTime(nds[i]): data->combineSpace(nds[i]);
+ if(res)
+ for(unsigned int j = 0; j < nds[i].indices.size(); j++)
+ rm.insert(list[nds[i].indices[j]]);
+ else
+ delete p;
+ }
+ }
+ if(remove)
+ for(std::set<PView*>::iterator it = rm.begin(); it != rm.end(); it++)
+ delete *it;
+}
+
+bool PView::readPOS(std::string filename, int fileIndex)
{
FILE *fp = fopen(filename.c_str(), "rb");
if(!fp){
@@ -234,61 +291,10 @@ bool PView::read(std::string filename, int fileIndex)
return true;
}
-void PView::combine(bool time, int how, bool remove)
+bool PView::readMSH(std::string filename, int fileIndex)
{
- // time == true: combine the timesteps (oherwise combine the elements)
- // how == 0: try to combine all visible views
- // 1: try to combine all views
- // 2: try to combine all views having identical names
-
- std::vector<nameData> nds;
- for(unsigned int i = 0; i < list.size(); i++) {
- PView *p = list[i];
- PViewData *data = p->getData();
- if(how || p->getOptions()->Visible) {
- nameData nd;
- // this will lead to weird results if there are views named
- // "__all__" or "__vis__" :-)
- if(how == 2)
- nd.name = data->getName();
- else if(how == 1)
- nd.name = "__all__";
- else
- nd.name = "__vis__";
- unsigned int j = 0;
- while(j < nds.size()){
- if(nds[j].name == nd.name){
- nds[j].data.push_back(data);
- nds[j].indices.push_back(i);
- break;
- }
- j++;
- }
- if(j == nds.size()){
- nd.data.push_back(data);
- nd.indices.push_back(i);
- nds.push_back(nd);
- }
- }
- }
-
- std::set<PView*> rm;
- for(unsigned int i = 0; i < nds.size(); i++){
- if(nds[i].data.size() > 1){
- // there's potentially something to combine
- PView *p = new PView(true);
- PViewData *data = p->getData();
- bool res = time ? data->combineTime(nds[i]): data->combineSpace(nds[i]);
- if(res)
- for(unsigned int j = 0; j < nds[i].indices.size(); j++)
- rm.insert(list[nds[i].indices[j]]);
- else
- delete p;
- }
- }
- if(remove)
- for(std::set<PView*>::iterator it = rm.begin(); it != rm.end(); it++)
- delete *it;
+ Msg(INFO, "Reading post-pro data from msh file");
+ return false;
}
bool PView::write(std::string filename, int format, bool append)
diff --git a/Post/PView.h b/Post/PView.h
index 33d838e981..cdae215d7b 100644
--- a/Post/PView.h
+++ b/Post/PView.h
@@ -76,11 +76,15 @@ class PView{
// the static list of all loaded views
static std::vector<PView*> list;
- // read view(s) in list format from a file
- static bool read(std::string filename, int fileIndex=-1);
+
// combine view
static void combine(bool time, int how, bool remove);
+ // read view(s) in list format from a file
+ static bool readPOS(std::string filename, int fileIndex=-1);
+ // read view data from MSH file
+ static bool readMSH(std::string filename, int fileIndex=-1);
+
// write view to file in given format
bool write(std::string filename, int format, bool append=false);
diff --git a/Post/PViewDataGModel.cpp b/Post/PViewDataGModel.cpp
index 07810566a7..ede1e63540 100644
--- a/Post/PViewDataGModel.cpp
+++ b/Post/PViewDataGModel.cpp
@@ -1,4 +1,4 @@
-// $Id: PViewDataGModel.cpp,v 1.7 2008-01-28 09:59:52 geuzaine Exp $
+// $Id: PViewDataGModel.cpp,v 1.8 2008-02-16 21:37:22 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -24,73 +24,6 @@
#include "PViewDataGModel.h"
-/*
-add new optional field in .msh file to store
-
-- node or element post-pro data
-- one field per-time step, per view
-
-$Data
-name precision-single-double step time-value
-type node-or-ele-id num-comp val (num-comp times)
-type node-or-ele-id num-comp val (num-comp times)
-...
-$EndData
-
-Then?
-
-1) in MVertex and MElement, add
-
-std::vector<std::vector<double> > _scalar, _vector, _tensor;
-
-and access using e.g. _scalar[viewIndex][comp & time step]. In GModel
-we would store a map with the correspondance between the index and the
-unique view id created in PView().
-
-2) Or, we store directly a map indexed with the unique view id
-
-1) and 2) are pretty expensive, due to the overhead and the "micro"
-allocations (in each element/node)
-
-3) It might be better to store the data *per entity*?
-
-4) Or just store the big vectors in the GModel?
-
-My preference at the moment is to store per entity (i.e., (3)): not
-too much overhead; can do local indexing and checks with
-nodes/elements--which are stored per entity too; avoids storing entity
-ptr in each value (I think we should have that info in the post-pro:
-it's one of the annoying shortcomings of the old format)
-
-if we choose 3, unfortunately, we need to keep track of some local
-indices to access the data with a single, continuous index. This is
-exactly the same problem as with PViewDataList. Maybe it's worth it?
-
-if we choose 4, we could have e.g. vectors of map<MVertex*, data> and
-map<MElement*, data>. The overhead is not negligeable... but it would
-be *very* simple to implement and maintain (very easy to load/discard
-time steps on the fly, do I/O; and the storage is completely separate
-from the model; it's good for handling errors too: when we loop over
-nodes/elements to generate vertex arrays, we just query the maps: if
-no answer, that's it).
-
-
-5) store 2 hash_maps in PViewDataGModel: one for vertices, one for
-elements. Each entry in the hash_map is an array of size
-
-[num_time_steps_stored * max_num_values]
-
-where
-
-* num_time_steps_stored is either num_time_steps (by default) or some
-user-set default (so that we do not have to load all the time steps at
-once)
-
-* max_num_values??
-
-
-*/
-
bool PViewDataGModel::writePOS(std::string name, bool binary, bool parsed,
bool append)
{
@@ -115,4 +48,3 @@ bool PViewDataGModel::writeMSH(std::string name)
// model->writeMSH()
return false;
}
-
diff --git a/Post/PViewDataListIO.cpp b/Post/PViewDataListIO.cpp
index 53cec51920..8cd30ae5dd 100644
--- a/Post/PViewDataListIO.cpp
+++ b/Post/PViewDataListIO.cpp
@@ -1,4 +1,4 @@
-// $Id: PViewDataListIO.cpp,v 1.5 2008-01-18 20:13:13 geuzaine Exp $
+// $Id: PViewDataListIO.cpp,v 1.6 2008-02-16 21:37:22 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -718,7 +718,7 @@ bool PViewDataList::writeMSH(std::string name)
writeElementsMSH(fp, NbTY, TY, 5, 9, 3, &nodes, &numelm);
fprintf(fp, "$ENDELM\n");
- /*
+#if 1 // test new postpro node-based storage
fprintf(fp, "$NodeData\n");
fprintf(fp, "\"%s\"\n", getName().c_str());
fprintf(fp, "1 1 %d\n", nodes.size());
@@ -729,7 +729,7 @@ bool PViewDataList::writeMSH(std::string name)
fprintf(fp, "\n");
}
fprintf(fp, "$EndNodeData\n");
- */
+#endif
fclose(fp);
return true;
diff --git a/doc/VERSIONS b/doc/VERSIONS
index 36d40b54c4..357698411a 100644
--- a/doc/VERSIONS
+++ b/doc/VERSIONS
@@ -1,9 +1,9 @@
-$Id: VERSIONS,v 1.393 2007-11-09 11:42:32 geuzaine Exp $
+$Id: VERSIONS,v 1.394 2008-02-16 21:37:22 geuzaine Exp $
2.1.0 (XX): new post-processing database; complete rewrite of
post-processing drawing code; improved 2D mesh algorithms; fixed
'could not find extruded vertex' in extrusions; many small
-improvements and small bug fixes.
+improvements and bug fixes all over the place.
2.0.8 (Jul 13, 2007): unused vertices are not saved in mesh files
anymore; new plugin GUI; automatic GUI font size selection; renamed
--
GitLab