Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
third-party
moab
Commits
7893de9a
Commit
7893de9a
authored
Oct 19, 2016
by
vijaysm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removing some compiler warnings (shadow mostly)
parent
1ae9a663
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
tools/dagmc/DagMC.cpp
tools/dagmc/DagMC.cpp
+2
-2
tools/mcnpmit/main.cpp
tools/mcnpmit/main.cpp
+2
-1
No files found.
tools/dagmc/DagMC.cpp
View file @
7893de9a
...
...
@@ -65,7 +65,7 @@ namespace moab {
const
std
::
map
<
std
::
string
,
std
::
string
>
DagMC
::
no_synonyms
;
// DagMC Constructor
DagMC
::
DagMC
(
Interface
*
mb_impl
,
double
overlap_tolerance
,
double
numerical_precision
)
{
DagMC
::
DagMC
(
Interface
*
mb_impl
,
double
overlap_tolerance
,
double
p_
numerical_precision
)
{
moab_instance_created
=
false
;
// if we arent handed a moab instance create one
if
(
NULL
==
mb_impl
)
{
...
...
@@ -82,7 +82,7 @@ DagMC::DagMC(Interface *mb_impl, double overlap_tolerance, double numerical_prec
// This is the correct place to uniquely define default values for the dagmc settings
overlapThickness
=
overlap_tolerance
;
// must be nonnegative
defaultFacetingTolerance
=
.001
;
numericalPrecision
=
numerical_precision
;
numericalPrecision
=
p_
numerical_precision
;
memset
(
implComplName
,
0
,
NAME_TAG_SIZE
);
strcpy
(
implComplName
,
"impl_complement"
);
...
...
tools/mcnpmit/main.cpp
View file @
7893de9a
...
...
@@ -23,7 +23,6 @@ MCNPError read_files(int, char**);
MCNPError
next_double
(
std
::
string
,
double
&
,
int
&
);
MCNPError
next_int
(
std
::
string
,
int
&
,
int
&
);
MCNPError
result
;
moab
::
Tag
coord_tag
,
rotation_tag
,
cfd_heating_tag
,
cfd_error_tag
;
std
::
string
h5m_filename
;
...
...
@@ -36,6 +35,7 @@ bool read_qnv = false;
clock_t
start_time
,
load_time
,
build_time
,
interp_time
;
int
main
(
int
argc
,
char
**
argv
)
{
MCNPError
result
;
start_time
=
clock
();
...
...
@@ -340,6 +340,7 @@ int main(int argc, char **argv) {
MCNPError
read_files
(
int
argc
,
char
**
argv
)
{
MCNPError
result
;
// Check to see if appropriate command lines specified
if
(
argc
<
3
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment