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

MED3 support, final bits: field write. This brings MED3 support up to par with MED2. 

Caveats:

- We don't support new MED3 features (evolving meshes, multi-profile per field step (?))
- I still get crashes on files that used to work with MED2. However the mdump code
  shipped with MED3 also crashes on these files, so the bug might not be with Gmsh...
parent 29c18283
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Geo/GModelIO_MED.cpp
+ 19
− 12
View file @ b943ca87
......@@ -116,10 +116,7 @@ int med2mshNodeIndex(med_geometrie_element med, int k)
#if (MED_MAJOR_NUM == 3)
case MED_QUAD9:
#endif
{
// same node numbering as in Gmsh
return k;
}
return k; // same node numbering as in Gmsh
case MED_TETRA4: {
static const int map[4] = {0, 2, 1, 3};
return map[k];
......@@ -139,7 +136,7 @@ int med2mshNodeIndex(med_geometrie_element med, int k)
}
#if (MED_MAJOR_NUM == 3)
case MED_HEXA27: {
Msg::Error("FIXME HEX27 not implemented for MED3");
Msg::Error("FIXME HEX27 not yet implemented for MED3");
return k;
}
#endif
......@@ -190,7 +187,7 @@ int GModel::readMED(const std::string &name)
med_maillage meshType;
#if (MED_MAJOR_NUM == 3)
med_int meshDim, nStep;
char dtUnit[ MED_SNAME_SIZE + 1];
char dtUnit[MED_SNAME_SIZE + 1];
char axisName[3 * MED_SNAME_SIZE + 1], axisUnit[3 * MED_SNAME_SIZE + 1];
med_sorting_type sortingType;
med_axis_type axisType;
......@@ -242,10 +239,10 @@ int GModel::readMED(const std::string &name, int meshIndex)
// read mesh info
char meshName[MED_TAILLE_NOM + 1], meshDesc[MED_TAILLE_DESC + 1];
med_int spaceDim;
med_int spaceDim, nStep = 1;
med_maillage meshType;
#if (MED_MAJOR_NUM == 3)
med_int meshDim, nStep;
med_int meshDim;
char dtUnit[MED_SNAME_SIZE + 1];
char axisName[3 * MED_SNAME_SIZE + 1], axisUnit[3 * MED_SNAME_SIZE + 1];
med_sorting_type sortingType;
......@@ -258,12 +255,20 @@ int GModel::readMED(const std::string &name, int meshIndex)
Msg::Error("Unable to read mesh information");
return 0;
}
// FIXME: we should support multi-step MED3 meshes (probably by
// storing each mesh as a separate model, with a naming convention
// e.g. meshName_step%d). This way we could also handle multi-mesh
// time sequences in MED3.
if(nStep > 1)
Msg::Error("Discarding %d last meshes in multi-step MED mesh", nStep - 1);
setName(meshName);
if(meshType == MED_NON_STRUCTURE){
Msg::Info("Reading %d-D unstructured mesh <<%s>>", spaceDim, meshName);
}
else{
Msg::Error("Cannot read structured mesh");
Msg::Error("Reading structured MED meshes is not supported");
return 0;
}
med_int vf[3];
......@@ -403,13 +408,15 @@ int GModel::readMED(const std::string &name, int meshIndex)
#if (MED_MAJOR_NUM == 3)
if(vf[0] == 2){ // MED2 file
if(MEDfamily23Info(fid, meshName, i + 1, familyName, &attribId[0],
&attribVal[0], &attribDes[0], &familyNum, &groupNames[0]) < 0){
&attribVal[0], &attribDes[0], &familyNum,
&groupNames[0]) < 0){
Msg::Error("Could not read info for MED2 family %d", i + 1);
continue;
}
}
else{
if(MEDfamilyInfo(fid, meshName, i + 1, familyName, &familyNum, &groupNames[0]) < 0){
if(MEDfamilyInfo(fid, meshName, i + 1, familyName, &familyNum,
&groupNames[0]) < 0){
Msg::Error("Could not read info for MED3 family %d", i + 1);
continue;
}
......@@ -489,7 +496,7 @@ static void writeElementsMED(med_idt &fid, char *meshName, std::vector<med_int>
0, MED_FAUX, 0, MED_FAUX, &fam[0], (med_int)fam.size(),
MED_MAILLE, type, MED_NOD) < 0)
#endif
Msg::Error("Could not write elements");
Msg::Error("Could not write MED elements");
}
int GModel::writeMED(const std::string &name, bool saveAll, double scalingFactor)
......
Post/PViewDataGModelIO.cpp
+ 39
− 23
View file @ b943ca87
......@@ -287,6 +287,7 @@ extern "C" {
#define MED_TAILLE_NOM MED_NAME_SIZE
#define MED_TAILLE_PNOM MED_SNAME_SIZE
#define MED_LECTURE MED_ACC_RDONLY
#define MED_LECTURE_AJOUT MED_ACC_RDEXT
#define MED_NOEUD MED_NODE
#define MED_MAILLE MED_CELL
#define MED_NOEUD_MAILLE MED_NODE_ELEMENT
......@@ -303,7 +304,7 @@ extern int med2mshNodeIndex(med_geometrie_element med, int k);
bool PViewDataGModel::readMED(std::string fileName, int fileIndex)
{
med_idt fid = MEDouvrir((char*)fileName.c_str(), MED_LECTURE);
if(fid < 0) {
if(fid < 0){
Msg::Error("Unable to open file '%s'", fileName.c_str());
return false;
}
......@@ -315,15 +316,15 @@ bool PViewDataGModel::readMED(std::string fileName, int fileIndex)
}
char name[MED_TAILLE_NOM + 1], meshName[MED_TAILLE_NOM + 1];
char dtUnit[MED_TAILLE_PNOM + 1];
std::vector<char> compName(numComp * MED_TAILLE_PNOM + 1);
std::vector<char> compUnit(numComp * MED_TAILLE_PNOM + 1);
std::vector<char> dtUnit(MED_TAILLE_PNOM + 1);
med_int numSteps = 0;
med_type_champ type;
#if (MED_MAJOR_NUM == 3)
med_bool localMesh;
if(MEDfieldInfo(fid, fileIndex + 1, name, meshName, &localMesh, &type,
&compName[0], &compUnit[0], &dtUnit[0], &numSteps) < 0){
&compName[0], &compUnit[0], dtUnit, &numSteps) < 0){
#else
if(MEDchampInfo(fid, fileIndex + 1, name, &type, &compName[0], &compUnit[0],
numComp) < 0){
......@@ -338,7 +339,9 @@ bool PViewDataGModel::readMED(std::string fileName, int fileIndex)
int numCompMsh =
(numComp <= 1) ? 1 : (numComp <= 3) ? 3 : (numComp <= 9) ? 9 : numComp;
if(numCompMsh > 9) Msg::Warning("More than 9 components in field");
if(numCompMsh > 9)
Msg::Warning("More than 9 components in field: you will probably want to force "
"the field type to scalar, vector or tensor in the options");
// Warning! The ordering of the elements in the last two lists is
// important: it should match the ordering of the MSH element types
......@@ -387,8 +390,8 @@ bool PViewDataGModel::readMED(std::string fileName, int fileIndex)
for(int step = 0; step < numSteps; step++){
// FIXME: we should loop over all profiles instead of relying of
// the default one per step field
// FIXME: in MED3 we might want to loop over all profiles instead
// of relying of the default one
// FIXME: MED3 allows to store multi-step meshes; we should
// interface this with our own gmodel-per-step structure
......@@ -433,8 +436,8 @@ bool PViewDataGModel::readMED(std::string fileName, int fileIndex)
#if (MED_MAJOR_NUM == 3)
int profileSize;
med_int numVal = MEDfieldnValueWithProfile(fid, name, numdt, numit, ent, ele,
1, MED_COMPACT_STMODE, profileName, &profileSize,
locName, &ngauss);
1, MED_COMPACT_STMODE, profileName,
&profileSize, locName, &ngauss);
numVal *= ngauss;
#else
med_int numVal = MEDnVal(fid, name, ent, ele, numdt, numit, meshName,
......@@ -442,7 +445,8 @@ bool PViewDataGModel::readMED(std::string fileName, int fileIndex)
#endif
if(numVal <= 0) continue;
_type = (ent == MED_NOEUD) ? NodeData : (ent == MED_MAILLE) ? ElementData : ElementNodeData;
_type = (ent == MED_NOEUD) ? NodeData : (ent == MED_MAILLE) ?
ElementData : ElementNodeData;
int mult = 1;
if(ent == MED_NOEUD_MAILLE){
mult = nodesPerEle[pairs[pair].second];
......@@ -606,16 +610,6 @@ bool PViewDataGModel::readMED(std::string fileName, int fileIndex)
return true;
}
#if (MED_MAJOR_NUM == 3)
bool PViewDataGModel::writeMED(std::string fileName)
{
Msg::Error("FIXME writing MED3 fields is not implemented yet");
return false;
}
#else
bool PViewDataGModel::writeMED(std::string fileName)
{
if(_steps.empty()) return true;
......@@ -639,7 +633,7 @@ bool PViewDataGModel::writeMED(std::string fileName)
char *fieldName = (char*)getName().c_str();
med_idt fid = MEDouvrir((char*)fileName.c_str(), MED_LECTURE_AJOUT);
if(fid < 0) {
if(fid < 0){
Msg::Error("Unable to open file '%s'", fileName.c_str());
return false;
}
......@@ -664,20 +658,36 @@ bool PViewDataGModel::writeMED(std::string fileName)
return false;
}
#if (MED_MAJOR_NUM == 3)
if(MEDprofileWr(fid, profileName, (med_int)profile.size(), &profile[0]) < 0){
#else
if(MEDprofilEcr(fid, &profile[0], (med_int)profile.size(), profileName) < 0){
#endif
Msg::Error("Could not create MED profile");
return false;
}
int numComp = _steps[0]->getNumComponents();
#if (MED_MAJOR_NUM == 3)
if(MEDfieldCr(fid, fieldName, MED_FLOAT64, (med_int)numComp, "unknown", "unknown",
"unknown", meshname) < 0){
#else
if(MEDchampCr(fid, fieldName, MED_FLOAT64, (char*)"unknown", (char*)"unknown",
(med_int)numComp) < 0){
#endif
Msg::Error("Could not create MED field");
return false;
}
#if (MED_MAJOR_NUM == 3)
med_bool changeOfCoord, geoTransform;
med_int numNodes = MEDmeshnEntity(fid, meshName, MED_NO_DT, MED_NO_IT, MED_NODE,
MED_NO_GEOTYPE, MED_COORDINATE, MED_NO_CMODE,
&changeOfCoord, &geoTransform);
#else
med_int numNodes = MEDnEntMaa(fid, meshName, MED_COOR, MED_NOEUD,
MED_NONE, (med_connectivite)0);
#endif
if(numNodes <= 0){
Msg::Error("Could not get valid number of nodes in mesh");
return false;
......@@ -695,10 +705,18 @@ bool PViewDataGModel::writeMED(std::string fileName)
for(unsigned int i = 0; i < profile.size(); i++)
for(int k = 0; k < numComp; k++)
val[i * numComp + k] = _steps[step]->getData(indices[i])[k];
#if (MED_MAJOR_NUM == 3)
if(MEDfieldValueWithProfileWr(fid, fieldName, (med_int)(step + 1), MED_NO_IT,
time, MED_NODE, MED_NO_GEOTYPE, MED_COMPACT_STMODE,
profileName, "", MED_FULL_INTERLACE,
MED_ALL_CONSTITUENT, numNodes,
(unsigned char*)&val[0]) < 0){
#else
if(MEDchampEcr(fid, meshName, fieldName, (unsigned char*)&val[0],
MED_FULL_INTERLACE, numNodes, (char*)MED_NOGAUSS, MED_ALL,
profileName, MED_COMPACT, MED_NOEUD, MED_NONE, (med_int)step,
(char*)"unknown", time, MED_NONOR) < 0) {
(char*)"unknown", time, MED_NONOR) < 0){
#endif
Msg::Error("Could not write MED field");
return false;
}
......@@ -711,8 +729,6 @@ bool PViewDataGModel::writeMED(std::string fileName)
return true;
}
#endif
#else
bool PViewDataGModel::readMED(std::string fileName, int fileIndex)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment