diff --git a/Geo/GModel.h b/Geo/GModel.h index 5da79fd8bca8d62fd8a98b5aba6bd2a175ccb05e..96fd652df1e229a203c71adfc1d1db0efad9403c 100644 --- a/Geo/GModel.h +++ b/Geo/GModel.h @@ -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; } diff --git a/Geo/GModelIO_Fourier.cpp b/Geo/GModelIO_Fourier.cpp index 0b581492bd2384a9200591ebb36faedc4e8dea70..2b4b42bb55487149ffd48076617acd2ce762bd5b 100644 --- a/Geo/GModelIO_Fourier.cpp +++ b/Geo/GModelIO_Fourier.cpp @@ -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'",