Skip to content
Snippets Groups Projects
Commit af81ad88 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

MED IO work

parent 285d97b7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Geo/GModel.cpp
+ 4
− 1
View file @ af81ad88
// $Id: GModel.cpp,v 1.78 2008-03-29 10:19:36 geuzaine Exp $ // $Id: GModel.cpp,v 1.79 2008-03-29 15:36:02 geuzaine Exp $
// //
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
// //
...@@ -52,6 +52,9 @@ GModel::GModel(std::string name) ...@@ -52,6 +52,9 @@ GModel::GModel(std::string name)
#if !defined(HAVE_GMSH_EMBEDDED) #if !defined(HAVE_GMSH_EMBEDDED)
_fields = new FieldManager(); _fields = new FieldManager();
#endif #endif
//printf("sizeof(MVertex) = %d\n", sizeof(MVertex));
//printf("sizeof(MElement) = %d\n", sizeof(MElement));
} }
GModel::~GModel() GModel::~GModel()
......
Geo/GModelIO_MED.cpp
+ 4
− 4
View file @ af81ad88
// $Id: GModelIO_MED.cpp,v 1.18 2008-03-29 10:19:36 geuzaine Exp $ // $Id: GModelIO_MED.cpp,v 1.19 2008-03-29 15:36:02 geuzaine Exp $
// //
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
// //
...@@ -37,7 +37,7 @@ extern "C" { ...@@ -37,7 +37,7 @@ extern "C" {
#include <med.h> #include <med.h>
} }
static int getTypeForMED(int msh, med_geometrie_element &med) static int getElementTypeForMED(int msh, med_geometrie_element &med)
{ {
switch(msh) { switch(msh) {
case MSH_LIN_2: med = MED_SEG2; return 2; case MSH_LIN_2: med = MED_SEG2; return 2;
...@@ -124,7 +124,7 @@ int GModel::readMED(const std::string &name) ...@@ -124,7 +124,7 @@ int GModel::readMED(const std::string &name)
// read elements // read elements
for(int mshType = 0; mshType < 50; mshType++){ // loop over all possible MSH types for(int mshType = 0; mshType < 50; mshType++){ // loop over all possible MSH types
med_geometrie_element type; med_geometrie_element type;
int numNodPerEle = getTypeForMED(mshType, type); int numNodPerEle = getElementTypeForMED(mshType, type);
if(type == MED_NONE) continue; if(type == MED_NONE) continue;
med_int numEle = MEDnEntMaa(fid, meshName, MED_CONN, MED_MAILLE, type, MED_NOD); med_int numEle = MEDnEntMaa(fid, meshName, MED_CONN, MED_MAILLE, type, MED_NOD);
if(numEle <= 0) continue; if(numEle <= 0) continue;
...@@ -236,7 +236,7 @@ static void fillElementsMED(med_int family, std::vector<T*> &elements, med_int & ...@@ -236,7 +236,7 @@ static void fillElementsMED(med_int family, std::vector<T*> &elements, med_int &
for(int j = 0; j < elements[i]->getNumVertices(); j++) for(int j = 0; j < elements[i]->getNumVertices(); j++)
conn.push_back(elements[i]->getVertexMED(j)->getNum()); conn.push_back(elements[i]->getVertexMED(j)->getNum());
fam.push_back(family); fam.push_back(family);
if(!i) getTypeForMED(elements[i]->getTypeForMSH(), type); if(!i) getElementTypeForMED(elements[i]->getTypeForMSH(), type);
} }
} }
......
Post/PViewDataGModel.cpp
+ 5
− 5
View file @ af81ad88
// $Id: PViewDataGModel.cpp,v 1.35 2008-03-29 11:51:37 geuzaine Exp $ // $Id: PViewDataGModel.cpp,v 1.36 2008-03-29 15:36:02 geuzaine Exp $
// //
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
// //
...@@ -83,21 +83,21 @@ SBoundingBox3d PViewDataGModel::getBoundingBox(int step) ...@@ -83,21 +83,21 @@ SBoundingBox3d PViewDataGModel::getBoundingBox(int step)
int PViewDataGModel::getNumScalars(int step) int PViewDataGModel::getNumScalars(int step)
{ {
if(_steps.empty()) return 0; if(_steps.empty()) return 0;
if(_steps[0]->getNumComp() == 1) return getNumElements(0); if(_steps[0]->getNumComponents() == 1) return getNumElements(0);
return 0; return 0;
} }
int PViewDataGModel::getNumVectors(int step) int PViewDataGModel::getNumVectors(int step)
{ {
if(_steps.empty()) return 0; if(_steps.empty()) return 0;
if(_steps[0]->getNumComp() == 3) return getNumElements(0); if(_steps[0]->getNumComponents() == 3) return getNumElements(0);
return 0; return 0;
} }
int PViewDataGModel::getNumTensors(int step) int PViewDataGModel::getNumTensors(int step)
{ {
if(_steps.empty()) return 0; if(_steps.empty()) return 0;
if(_steps[0]->getNumComp() == 9) return getNumElements(0); if(_steps[0]->getNumComponents() == 9) return getNumElements(0);
return 0; return 0;
} }
...@@ -149,7 +149,7 @@ void PViewDataGModel::getNode(int step, int ent, int ele, int nod, ...@@ -149,7 +149,7 @@ void PViewDataGModel::getNode(int step, int ent, int ele, int nod,
int PViewDataGModel::getNumComponents(int step, int ent, int ele) int PViewDataGModel::getNumComponents(int step, int ent, int ele)
{ {
return _steps[step]->getNumComp(); return _steps[step]->getNumComponents();
} }
void PViewDataGModel::getValue(int step, int ent, int ele, int nod, int comp, double &val) void PViewDataGModel::getValue(int step, int ent, int ele, int nod, int comp, double &val)
......
Post/PViewDataGModel.h
+ 2
− 3
View file @ af81ad88
...@@ -31,8 +31,7 @@ class stepData{ ...@@ -31,8 +31,7 @@ class stepData{
enum DataType { enum DataType {
NodeData = 1, NodeData = 1,
ElementData = 2, ElementData = 2,
ElementNodeData = 3, ElementNodeData = 3
ElementGaussPointData = 4
}; };
private: private:
// a pointer to the underlying model // a pointer to the underlying model
...@@ -77,7 +76,7 @@ class stepData{ ...@@ -77,7 +76,7 @@ class stepData{
GEntity *getEntity(int ent){ return _entities[ent]; } GEntity *getEntity(int ent){ return _entities[ent]; }
DataType getType(){ return _type; } DataType getType(){ return _type; }
void setType(DataType type){ _type = type; } void setType(DataType type){ _type = type; }
int getNumComp(){ return _numComp; } int getNumComponents(){ return _numComp; }
std::string getFileName(){ return _fileName; } std::string getFileName(){ return _fileName; }
void setFileName(std::string name){ _fileName = name; } void setFileName(std::string name){ _fileName = name; }
int getFileIndex(){ return _fileIndex; } int getFileIndex(){ return _fileIndex; }
......
Post/PViewDataGModelIO.cpp
+ 117
− 76
View file @ af81ad88
// $Id: PViewDataGModelIO.cpp,v 1.15 2008-03-29 11:51:37 geuzaine Exp $ // $Id: PViewDataGModelIO.cpp,v 1.16 2008-03-29 15:36:02 geuzaine Exp $
// //
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
// //
...@@ -124,7 +124,7 @@ bool PViewDataGModel::writeMSH(std::string fileName, bool binary) ...@@ -124,7 +124,7 @@ bool PViewDataGModel::writeMSH(std::string fileName, bool binary)
} }
for(unsigned int step = 0; step < _steps.size(); step++){ for(unsigned int step = 0; step < _steps.size(); step++){
int numNodes = 0, numComp = _steps[step]->getNumComp(); int numNodes = 0, numComp = _steps[step]->getNumComponents();
for(int i = 0; i < _steps[step]->getNumData(); i++) for(int i = 0; i < _steps[step]->getNumData(); i++)
if(_steps[step]->getData(i)) numNodes++; if(_steps[step]->getData(i)) numNodes++;
if(numNodes){ if(numNodes){
...@@ -161,6 +161,19 @@ extern "C" { ...@@ -161,6 +161,19 @@ extern "C" {
#include <med.h> #include <med.h>
} }
static void fillData(stepData<double> *data, int dataIndex,
std::vector<double> &val, int valIndex, int numComp)
{
double *d = data->getData(dataIndex, true);
for(int j = 0; j < numComp; j++)
d[j] = val[numComp * valIndex + j];
for(int j = numComp; j < data->getNumComponents(); j++)
d[j] = 0.;
double s = ComputeScalarRep(data->getNumComponents(), d);
data->setMin(std::min(data->getMin(), s));
data->setMax(std::max(data->getMax(), s));
}
bool PViewDataGModel::readMED(std::string fileName, int fileIndex) bool PViewDataGModel::readMED(std::string fileName, int fileIndex)
{ {
med_idt fid = MEDouvrir((char*)fileName.c_str(), MED_LECTURE); med_idt fid = MEDouvrir((char*)fileName.c_str(), MED_LECTURE);
...@@ -188,91 +201,119 @@ bool PViewDataGModel::readMED(std::string fileName, int fileIndex) ...@@ -188,91 +201,119 @@ bool PViewDataGModel::readMED(std::string fileName, int fileIndex)
Msg(INFO, "Reading %d-component field <<%s>>\n", numComp, name); Msg(INFO, "Reading %d-component field <<%s>>\n", numComp, name);
setName(name); setName(name);
med_int numSteps = MEDnPasdetemps(fid, name, MED_NOEUD, MED_NONE); const med_entite_maillage entType[] =
if(numSteps < 0){ {MED_NOEUD, MED_MAILLE, MED_NOEUD_ELEMENT};
Msg(GERROR, "Could not get number of steps"); const med_geometrie_element eleType[] =
{MED_NONE, MED_SEG2, MED_TRIA3, MED_QUAD4, MED_TETRA4, MED_HEXA8, MED_PENTA6,
MED_PYRA5, MED_SEG3, MED_TRIA6, MED_TETRA10, MED_POINT1, MED_QUAD8,
MED_HEXA20, MED_PENTA15, MED_PYRA13};
const int nodesPerEle[] =
{0, 2, 3, 4, 4, 8, 6, 5, 3, 6, 10, 1, 8, 20, 15, 13};
med_int numSteps = 0;
std::vector<std::pair<int, int> > pairs;
for(int i = 0; i < sizeof(entType) / sizeof(entType[0]); i++){
for(int j = 0; j < sizeof(eleType) / sizeof(eleType[0]); j++){
med_int n = MEDnPasdetemps(fid, name, entType[i], eleType[j]);
if(n > 0){
pairs.push_back(std::pair<int, int>(i, j));
numSteps = std::max(numSteps, n);
}
if(!i && !j) break; // MED_NOEUD does not care about eleType
}
}
if(numSteps < 1 || pairs.empty()){
Msg(GERROR, "Nothing to import from MED file");
return false; return false;
} }
for(int step = 0; step < numSteps; step++){ for(int step = 0; step < numSteps; step++){
med_int numdt, numo, ngauss, numMeshes; med_entite_maillage ent = entType[pairs[0].first];
char dtunit[MED_TAILLE_PNOM +1], meshName[MED_TAILLE_NOM + 1]; stepData<double>::DataType entGmsh =
med_float dt; (ent == MED_NOEUD) ? stepData<double>::NodeData :
med_booleen local; (ent == MED_MAILLE) ? stepData<double>::ElementData :
if(MEDpasdetempsInfo(fid, name, MED_NOEUD, MED_NONE, step + 1, stepData<double>::ElementNodeData;
&ngauss, &numdt, &numo, dtunit, &dt, meshName, int numCompGmsh = (numComp == 2) ? 3 : numComp;
&local, &numMeshes) < 0){ _steps.push_back(new stepData<double>(GModel::current(), entGmsh, numCompGmsh));
Msg(GERROR, "Could not get step info"); _steps.back()->setFileName(fileName);
return false; _steps.back()->setFileIndex(fileIndex);
} }
med_int numNodes = MEDnVal(fid, name, MED_NOEUD, MED_NONE, numdt, numo, for(int step = 0; step < numSteps; step++){
meshName, MED_COMPACT); for(unsigned int pair = 0; pair < pairs.size(); pair++){
if(numNodes <= 0) continue; med_entite_maillage ent = entType[pairs[pair].first];
med_geometrie_element ele = eleType[pairs[pair].second];
med_int numdt, numo, ngauss, numMeshes;
char dtunit[MED_TAILLE_PNOM + 1], meshName[MED_TAILLE_NOM + 1];
med_float dt;
med_booleen local;
if(MEDpasdetempsInfo(fid, name, ent, ele, step + 1, &ngauss, &numdt, &numo,
dtunit, &dt, meshName, &local, &numMeshes) < 0){
Msg(GERROR, "Could not get step info");
return false;
}
_steps[step]->setTime(dt);
std::vector<double> val(numNodes * numComp); med_int numVal = MEDnVal(fid, name, ent, ele, numdt, numo,
char locname[MED_TAILLE_NOM + 1], profileName[MED_TAILLE_NOM + 1]; meshName, MED_COMPACT);
if(MEDchampLire(fid, meshName, name, (unsigned char*)&val[0], MED_FULL_INTERLACE, if(numVal <= 0) continue;
MED_ALL, locname, profileName, MED_COMPACT, MED_NOEUD, MED_NONE, _steps[step]->resizeData(numVal);
numdt, numo) < 0){
Msg(GERROR, "Could not get field values"); int mult = 1;
return false; if(ent == MED_NOEUD_ELEMENT) mult = nodesPerEle[pairs[pair].second];
} std::vector<double> val(numVal * numComp * mult);
char locname[MED_TAILLE_NOM + 1], profileName[MED_TAILLE_NOM + 1];
if(MEDchampLire(fid, meshName, name, (unsigned char*)&val[0], MED_FULL_INTERLACE,
MED_ALL, locname, profileName, MED_COMPACT, ent, ele,
numdt, numo) < 0){
Msg(GERROR, "Could not get field values");
return false;
}
int numCompGmsh = (numComp == 2) ? 3 : numComp; std::vector<med_int> profile;
stepData<double> *sd = new stepData<double> if(std::string(profileName) != MED_NOPFL){
(GModel::current(), stepData<double>::NodeData, numCompGmsh); med_int n = MEDnValProfil(fid, profileName);
_steps.push_back(sd); if(n > 0){
sd->setFileName(fileName); profile.resize(n);
sd->setFileIndex(fileIndex); if(MEDprofilLire(fid, &profile[0], profileName) < 0){
sd->setTime(dt); Msg(GERROR, "Could not read profile");
sd->resizeData(numNodes); return false;
}
std::vector<med_int> nodeTags(numNodes);
if(MEDnumLire(fid, meshName, &nodeTags[0], numNodes, MED_NOEUD, MED_NONE) < 0)
nodeTags.clear();
std::vector<med_int> profile;
if(std::string(profileName) != MED_NOPFL){
med_int n = MEDnValProfil(fid, profileName);
if(n > 0){
profile.resize(n);
if(MEDprofilLire(fid, &profile[0], profileName) < 0){
Msg(GERROR, "Could not read profile");
return false;
} }
} }
} if(profile.empty()){
if(profile.empty()){ profile.resize(numVal);
profile.resize(numNodes); for(int i = 0; i < numVal; i++)
for(int i = 0; i < numNodes; i++) profile[i] = i + 1;
profile[i] = i + 1;
}
for(unsigned int i = 0; i < profile.size(); i++){
int num = nodeTags.empty() ? profile[i] : nodeTags[profile[i] - 1];
MVertex *v = sd->getModel()->getMeshVertexByTag(num);
if(!v){
Msg(GERROR, "Unknown vertex %d in data", num);
return false;
} }
if(v->getDataIndex() < 0){
int max = sd->getModel()->getMaxVertexDataIndex(); if(ent == MED_NOEUD){
sd->getModel()->setMaxVertexDataIndex(max + 1); std::vector<med_int> nodeTags(numVal);
v->setDataIndex(max + 1); if(MEDnumLire(fid, meshName, &nodeTags[0], numVal, MED_NOEUD, MED_NONE) < 0)
nodeTags.clear();
for(unsigned int i = 0; i < profile.size(); i++){
int num = nodeTags.empty() ? profile[i] : nodeTags[profile[i] - 1];
MVertex *v = _steps[step]->getModel()->getMeshVertexByTag(num);
if(!v){
Msg(GERROR, "Unknown vertex %d in data", num);
return false;
}
if(v->getDataIndex() < 0){
int max = _steps[step]->getModel()->getMaxVertexDataIndex();
_steps[step]->getModel()->setMaxVertexDataIndex(max + 1);
v->setDataIndex(max + 1);
}
fillData(_steps[step], v->getDataIndex(), val, i, numComp);
}
} }
int index = v->getDataIndex(); else{
double *d = sd->getData(index, true); // TODO!
for(int j = 0; j < numComp; j++) }
d[j] = val[numComp * i + j];
for(int j = numComp; j < numCompGmsh; j++)
d[j] = 0.;
double s = ComputeScalarRep(numCompGmsh, d);
sd->setMin(std::min(sd->getMin(), s));
sd->setMax(std::max(sd->getMax(), s));
} }
} }
finalize(); finalize();
if(MEDfermer(fid) < 0){ if(MEDfermer(fid) < 0){
...@@ -326,7 +367,7 @@ bool PViewDataGModel::writeMED(std::string fileName) ...@@ -326,7 +367,7 @@ bool PViewDataGModel::writeMED(std::string fileName)
return false; return false;
} }
int numComp = _steps[0]->getNumComp(); int numComp = _steps[0]->getNumComponents();
if(MEDchampCr(fid, fieldName, MED_FLOAT64, (char*)"unknown", (char*)"unknown", if(MEDchampCr(fid, fieldName, MED_FLOAT64, (char*)"unknown", (char*)"unknown",
(med_int)numComp) < 0){ (med_int)numComp) < 0){
Msg(GERROR, "Could not create MED field"); Msg(GERROR, "Could not create MED field");
...@@ -344,7 +385,7 @@ bool PViewDataGModel::writeMED(std::string fileName) ...@@ -344,7 +385,7 @@ bool PViewDataGModel::writeMED(std::string fileName)
unsigned int n = 0; unsigned int n = 0;
for(int i = 0; i < _steps[step]->getNumData(); i++) for(int i = 0; i < _steps[step]->getNumData(); i++)
if(_steps[step]->getData(i)) n++; if(_steps[step]->getData(i)) n++;
if(n != prof.size() || numComp != _steps[step]->getNumComp()){ if(n != prof.size() || numComp != _steps[step]->getNumComponents()){
Msg(GERROR, "Skipping incompatible step"); Msg(GERROR, "Skipping incompatible step");
continue; continue;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment