Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gmsh
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Larry Price
gmsh
Commits
299c81a9
Commit
299c81a9
authored
16 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
fix compile without fourier model
parent
3b5957d6
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Geo/GModel.h
+7
-5
7 additions, 5 deletions
Geo/GModel.h
Geo/GModelIO_Fourier.cpp
+12
-4
12 additions, 4 deletions
Geo/GModelIO_Fourier.cpp
with
19 additions
and
9 deletions
Geo/GModel.h
+
7
−
5
View file @
299c81a9
...
...
@@ -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
;
}
...
...
This diff is collapsed.
Click to expand it.
Geo/GModelIO_Fourier.cpp
+
12
−
4
View file @
299c81a9
...
...
@@ -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'"
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment