Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dmitri Naumov
ogs
Commits
c491984c
Commit
c491984c
authored
12 years ago
by
Tom Fischer
Browse files
Options
Downloads
Patches
Plain Diff
Using logog logging in file readMeshFromFile.cpp.
parent
4eb848ab
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
FileIO/readMeshFromFile.cpp
+18
-17
18 additions, 17 deletions
FileIO/readMeshFromFile.cpp
FileIO/readMeshFromFile.h
+11
-7
11 additions, 7 deletions
FileIO/readMeshFromFile.h
with
29 additions
and
24 deletions
FileIO/readMeshFromFile.cpp
+
18
−
17
View file @
c491984c
/**
/**
* @copyright
* Copyright (c) 2013, OpenGeoSys Community (http://www.opengeosys.org)
* Copyright (c) 2013, OpenGeoSys Community (http://www.opengeosys.org)
* Distributed under a Modified BSD License.
* Distributed under a Modified BSD License.
* See accompanying file LICENSE.txt or
* See accompanying file LICENSE.txt or
* http://www.opengeosys.org/project/license
* http://www.opengeosys.org/project/license
*
*
*
* @file readMeshFromFile.cpp
* \file readMeshFromFile.cpp
* @date 2012-09-27
*
* @author Karsten Rink
* Created on 2012-09-27 by Karsten Rink
*/
*/
#include
"readMeshFromFile.h"
// ThirdParty/logog
#include
"Mesh.h"
#include
"logog/include/logog.hpp"
#include
"RapidXmlIO/RapidVtuInterface.h"
#include
"RapidXmlIO/BoostVtuInterface.h"
#include
"Legacy/MeshIO.h"
// BaseLib
// BaseLib
#include
"StringTools.h"
#include
"FileTools.h"
#include
"FileTools.h"
#include
"StringTools.h"
// MeshLib
#include
"Mesh.h"
namespace
FileIO
{
// FileIO
#include
"Legacy/MeshIO.h"
#include
"RapidXmlIO/BoostVtuInterface.h"
#include
"readMeshFromFile.h"
namespace
FileIO
{
MeshLib
::
Mesh
*
readMeshFromFile
(
const
std
::
string
&
file_name
)
MeshLib
::
Mesh
*
readMeshFromFile
(
const
std
::
string
&
file_name
)
{
{
if
(
BaseLib
::
hasFileExtension
(
"msh"
,
file_name
))
if
(
BaseLib
::
hasFileExtension
(
"msh"
,
file_name
))
...
@@ -31,13 +36,9 @@ MeshLib::Mesh* readMeshFromFile(const std::string &file_name)
...
@@ -31,13 +36,9 @@ MeshLib::Mesh* readMeshFromFile(const std::string &file_name)
}
}
if
(
BaseLib
::
hasFileExtension
(
"vtu"
,
file_name
))
if
(
BaseLib
::
hasFileExtension
(
"vtu"
,
file_name
))
{
//return FileIO::RapidVtuInterface::readVTUFile(file_name);
return
FileIO
::
BoostVtuInterface
::
readVTUFile
(
file_name
);
return
FileIO
::
BoostVtuInterface
::
readVTUFile
(
file_name
);
}
std
::
cout
<<
"Unknown mesh file format"
<<
std
::
endl
;
ERR
(
"readMeshFromFile(): Unknown mesh file format in file %s."
,
file_name
.
c_str
())
;
return
0
;
return
0
;
}
}
}
// end namespace FileIO
}
This diff is collapsed.
Click to expand it.
FileIO/readMeshFromFile.h
+
11
−
7
View file @
c491984c
...
@@ -5,9 +5,9 @@
...
@@ -5,9 +5,9 @@
* http://www.opengeosys.org/project/license
* http://www.opengeosys.org/project/license
*
*
*
*
*
\
file readMeshFromFile.h
*
@
file readMeshFromFile.h
*
*
@date 2012-09-27
*
Created on 2012-09-27 by
Karsten Rink
*
@author
Karsten Rink
*/
*/
#ifndef READMESHFROMFILE_H
#ifndef READMESHFROMFILE_H
...
@@ -15,10 +15,14 @@
...
@@ -15,10 +15,14 @@
#include
<string>
#include
<string>
namespace
MeshLib
{
class
Mesh
;
}
namespace
MeshLib
{
class
Mesh
;
}
namespace
FileIO
{
namespace
FileIO
MeshLib
::
Mesh
*
readMeshFromFile
(
const
std
::
string
&
file_name
);
{
MeshLib
::
Mesh
*
readMeshFromFile
(
const
std
::
string
&
file_name
);
}
}
#endif // READMESHFROMFILE_H
#endif // READMESHFROMFILE_H
\ No newline at end of file
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