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

fix compile without fourier model

parent 3b5957d6
No related branches found
No related tags found
No related merge requests found
......@@ -55,6 +55,12 @@ class GModel
void _deleteOCCInternals();
#endif
FM_Internals *_fm_internals;
#if !defined(HAVE_GMSH_EMBEDDED)
void _createFMInternals();
void _deleteFMInternals();
#endif
// Characteristic Lengths fields
FieldManager *_fields;
......@@ -69,10 +75,6 @@ class GModel
// index of the current model
static int _current;
FM_Internals *_fm_internals;
void createFMInternals();
void deleteFMInternals();
protected:
std::string modelName;
std::set<GRegion*, GEntityLessThan> regions;
......@@ -100,9 +102,9 @@ class GModel
void destroy();
// Access internal CAD representations
FM_Internals *getFMInternals() { return _fm_internals; }
GEO_Internals *getGEOInternals(){ return _geo_internals; }
OCC_Internals *getOCCInternals(){ return _occ_internals; }
FM_Internals *getFMInternals() { return _fm_internals; }
// Access characteristic length fields
FieldManager *getFields(){ return _fields; }
......
......@@ -93,13 +93,13 @@ void FM_Internals::buildGModel(FM::Reader* reader, GModel* model)
makeGFace(reader->GetPatch(i), model);
}
void GModel::createFMInternals()
void GModel::_createFMInternals()
{
if (!_fm_internals)
_fm_internals = new FM_Internals;
}
void GModel::deleteFMInternals()
void GModel::_deleteFMInternals()
{
delete _fm_internals;
_fm_internals = 0;
......@@ -107,13 +107,13 @@ void GModel::deleteFMInternals()
int GModel::readFourier()
{
createFMInternals();
_createFMInternals();
getFMInternals()->loadFM();
}
int GModel::readFourier(const std::string &filename)
{
createFMInternals();
_createFMInternals();
getFMInternals()->loadFM(filename.c_str());
getFMInternals()->buildGModel(getFMInternals()->current(),this);
......@@ -127,6 +127,14 @@ int GModel::writeFourier(const std::string &filename)
#else
void GModel::_createFMInternals()
{
}
void GModel::_deleteFMInternals()
{
}
int GModel::readFourier(const std::string &fn)
{
Msg::Error("Gmsh has to be compiled with Fourier Model support to load '%s'",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment