From e2911ed905ad8561ba334019e60e3e2a54e2331d Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 31 Mar 2010 20:22:42 +0000
Subject: [PATCH] visual fea -> iridum ir3
---
Common/CommandLine.cpp | 6 +++---
Common/CreateFile.cpp | 8 ++++----
Common/GmshDefines.h | 2 +-
Fltk/menuWindow.cpp | 8 ++++----
Geo/GModel.h | 4 ++--
Geo/GModelIO_Mesh.cpp | 6 +++---
Geo/MElement.cpp | 2 +-
Geo/MElement.h | 2 +-
8 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/Common/CommandLine.cpp b/Common/CommandLine.cpp
index 9e4c57ad52..4ed07b1e08 100644
--- a/Common/CommandLine.cpp
+++ b/Common/CommandLine.cpp
@@ -63,7 +63,7 @@ void PrintUsage(const char *name)
Msg::Direct(" -saveall Save all elements (discard physical group definitions)");
Msg::Direct(" -o file Specify mesh output file name");
Msg::Direct(" -format string Set output mesh format (msh, msh1, msh2, unv, vrml, stl, mesh,");
- Msg::Direct(" bdf, p3d, cgns, med, fea)");
+ Msg::Direct(" bdf, p3d, cgns, med, ir3)");
Msg::Direct(" -bin Use binary format when available");
Msg::Direct(" -parametric Save vertices with their parametric coordinates");
Msg::Direct(" -numsubedges Set the number of subdivisions when displaying high order elements");
@@ -478,8 +478,8 @@ void GetOptions(int argc, char *argv[])
CTX::instance()->mesh.format = FORMAT_DIFF;
else if(!strcmp(argv[i], "med"))
CTX::instance()->mesh.format = FORMAT_MED;
- else if(!strcmp(argv[i], "fea"))
- CTX::instance()->mesh.format = FORMAT_FEA;
+ else if(!strcmp(argv[i], "ir3"))
+ CTX::instance()->mesh.format = FORMAT_IR3;
else
Msg::Fatal("Unknown mesh format");
i++;
diff --git a/Common/CreateFile.cpp b/Common/CreateFile.cpp
index 6160fbc619..57de2f7509 100644
--- a/Common/CreateFile.cpp
+++ b/Common/CreateFile.cpp
@@ -38,7 +38,7 @@ int GuessFileFormatFromFileName(std::string fileName)
else if(ext == ".stl") return FORMAT_STL;
else if(ext == ".cgns") return FORMAT_CGNS;
else if(ext == ".med") return FORMAT_MED;
- else if(ext == ".fea") return FORMAT_FEA;
+ else if(ext == ".ir3") return FORMAT_IR3;
else if(ext == ".mesh") return FORMAT_MESH;
else if(ext == ".bdf") return FORMAT_BDF;
else if(ext == ".diff") return FORMAT_DIFF;
@@ -79,7 +79,7 @@ std::string GetDefaultFileName(int format)
case FORMAT_STL: name += ".stl"; break;
case FORMAT_CGNS: name += ".cgns"; break;
case FORMAT_MED: name += ".med"; break;
- case FORMAT_FEA: name += ".fea"; break;
+ case FORMAT_IR3: name += ".ir3"; break;
case FORMAT_MESH: name += ".mesh"; break;
case FORMAT_BDF: name += ".bdf"; break;
case FORMAT_DIFF: name += ".diff"; break;
@@ -215,8 +215,8 @@ void CreateOutputFile(std::string fileName, int format)
CTX::instance()->mesh.saveAll, CTX::instance()->mesh.scalingFactor);
break;
- case FORMAT_FEA:
- GModel::current()->writeFEA
+ case FORMAT_IR3:
+ GModel::current()->writeIR3
(fileName, CTX::instance()->mesh.saveElementTagType,
CTX::instance()->mesh.saveAll, CTX::instance()->mesh.scalingFactor);
break;
diff --git a/Common/GmshDefines.h b/Common/GmshDefines.h
index 83456e0dd9..92b5f3d4b6 100644
--- a/Common/GmshDefines.h
+++ b/Common/GmshDefines.h
@@ -40,7 +40,7 @@
#define FORMAT_BREP 35
#define FORMAT_STEP 36
#define FORMAT_IGES 37
-#define FORMAT_FEA 38
+#define FORMAT_IR3 38
// Element types
#define TYPE_PNT 1
diff --git a/Fltk/menuWindow.cpp b/Fltk/menuWindow.cpp
index e46a6faa6e..d795a4abb6 100644
--- a/Fltk/menuWindow.cpp
+++ b/Fltk/menuWindow.cpp
@@ -242,8 +242,8 @@ static int _save_mesh(const char *name){ return genericMeshFileDialog
static int _save_bdf(const char *name){ return bdfFileDialog(name); }
static int _save_p3d(const char *name){ return genericMeshFileDialog
(name, "P3D Options", FORMAT_P3D, false, false); }
-static int _save_fea(const char *name){ return genericMeshFileDialog
- (name, "VisualFEA Options", FORMAT_FEA, false, true); }
+static int _save_ir3(const char *name){ return genericMeshFileDialog
+ (name, "Iridium Options", FORMAT_IR3, false, true); }
static int _save_stl(const char *name){ return genericMeshFileDialog
(name, "STL Options", FORMAT_STL, true, false); }
static int _save_vrml(const char *name){ return genericMeshFileDialog
@@ -281,7 +281,7 @@ static int _save_auto(const char *name)
case FORMAT_BDF : return _save_bdf(name);
case FORMAT_DIFF : return _save_diff(name);
case FORMAT_P3D : return _save_p3d(name);
- case FORMAT_FEA : return _save_fea(name);
+ case FORMAT_IR3 : return _save_ir3(name);
case FORMAT_STL : return _save_stl(name);
case FORMAT_VRML : return _save_vrml(name);
case FORMAT_EPS : return _save_eps(name);
@@ -325,7 +325,7 @@ static void file_save_as_cb(Fl_Widget *w, void *data)
{"Medit mesh" TT "*.mesh", _save_mesh},
{"Nastran bulk data file" TT "*.bdf", _save_bdf},
{"Plot3D structured mesh" TT "*.p3d", _save_p3d},
- {"VisualFEA mesh" TT "*.fea", _save_fea},
+ {"Iridum mesh" TT "*.ir3", _save_ir3},
{"STL surface mesh" TT "*.stl", _save_stl},
{"VRML surface mesh" TT "*.wrl", _save_vrml},
{"Encapsulated PostScript" TT "*.eps", _save_eps},
diff --git a/Geo/GModel.h b/Geo/GModel.h
index 6aa2a37cae..77d2673b4d 100644
--- a/Geo/GModel.h
+++ b/Geo/GModel.h
@@ -388,8 +388,8 @@ class GModel
bool saveAll=false, bool saveParametric=false,
double scalingFactor=1.0);
- // Visual FEA file format
- int writeFEA(const std::string &name, int elementTagType,
+ // Iridium file format
+ int writeIR3(const std::string &name, int elementTagType,
bool saveAll, double scalingFactor);
// mesh statistics (saved as a Gmsh post-processing view)
diff --git a/Geo/GModelIO_Mesh.cpp b/Geo/GModelIO_Mesh.cpp
index 1c6814d8b6..c5ac9564ee 100644
--- a/Geo/GModelIO_Mesh.cpp
+++ b/Geo/GModelIO_Mesh.cpp
@@ -1768,7 +1768,7 @@ int GModel::writeMESH(const std::string &name, int elementTagType,
return 1;
}
-int GModel::writeFEA(const std::string &name, int elementTagType,
+int GModel::writeIR3(const std::string &name, int elementTagType,
bool saveAll, double scalingFactor)
{
FILE *fp = fopen(name.c_str(), "w");
@@ -1809,7 +1809,7 @@ int GModel::writeFEA(const std::string &name, int elementTagType,
int numPhys = (*it)->physicals.size();
if(saveAll || numPhys)
for(unsigned int i = 0; i < (*it)->getNumMeshElements(); i++)
- (*it)->getMeshElement(i)->writeFEA
+ (*it)->getMeshElement(i)->writeIR3
(fp, elementTagType, iElement++, (*it)->tag(),
numPhys ? (*it)->physicals[0] : 0);
}
@@ -1819,7 +1819,7 @@ int GModel::writeFEA(const std::string &name, int elementTagType,
int numPhys = (*it)->physicals.size();
if(saveAll || numPhys)
for(unsigned int i = 0; i < (*it)->getNumMeshElements(); i++)
- (*it)->getMeshElement(i)->writeFEA
+ (*it)->getMeshElement(i)->writeIR3
(fp, elementTagType, iElement++, (*it)->tag(),
numPhys ? (*it)->physicals[0] : 0);
}
diff --git a/Geo/MElement.cpp b/Geo/MElement.cpp
index 0049f65781..e58e1fe5be 100644
--- a/Geo/MElement.cpp
+++ b/Geo/MElement.cpp
@@ -667,7 +667,7 @@ void MElement::writeMESH(FILE *fp, int elementTagType, int elementary,
(elementTagType == 2) ? physical : elementary);
}
-void MElement::writeFEA(FILE *fp, int elementTagType, int num, int elementary,
+void MElement::writeIR3(FILE *fp, int elementTagType, int num, int elementary,
int physical)
{
int numVert = getNumVertices();
diff --git a/Geo/MElement.h b/Geo/MElement.h
index 8831f18e39..e903ec9c6d 100644
--- a/Geo/MElement.h
+++ b/Geo/MElement.h
@@ -263,7 +263,7 @@ class MElement
virtual void writeVTK(FILE *fp, bool binary=false, bool bigEndian=false);
virtual void writeMESH(FILE *fp, int elementTagType=1, int elementary=1,
int physical=0);
- virtual void writeFEA(FILE *fp, int elementTagType, int num, int elementary,
+ virtual void writeIR3(FILE *fp, int elementTagType, int num, int elementary,
int physical);
virtual void writeBDF(FILE *fp, int format=0, int elementTagType=1,
int elementary=1, int physical=0);
--
GitLab