Commit 7893de9a authored by vijaysm's avatar vijaysm

Removing some compiler warnings (shadow mostly)

parent 1ae9a663
...@@ -65,7 +65,7 @@ namespace moab { ...@@ -65,7 +65,7 @@ namespace moab {
const std::map<std::string, std::string> DagMC::no_synonyms; const std::map<std::string, std::string> DagMC::no_synonyms;
// DagMC Constructor // 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; moab_instance_created = false;
// if we arent handed a moab instance create one // if we arent handed a moab instance create one
if (NULL == mb_impl) { if (NULL == mb_impl) {
...@@ -82,7 +82,7 @@ DagMC::DagMC(Interface *mb_impl, double overlap_tolerance, double numerical_prec ...@@ -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 // This is the correct place to uniquely define default values for the dagmc settings
overlapThickness = overlap_tolerance; // must be nonnegative overlapThickness = overlap_tolerance; // must be nonnegative
defaultFacetingTolerance = .001; defaultFacetingTolerance = .001;
numericalPrecision = numerical_precision; numericalPrecision = p_numerical_precision;
memset( implComplName, 0, NAME_TAG_SIZE ); memset( implComplName, 0, NAME_TAG_SIZE );
strcpy( implComplName , "impl_complement" ); strcpy( implComplName , "impl_complement" );
......
...@@ -23,7 +23,6 @@ MCNPError read_files(int, char**); ...@@ -23,7 +23,6 @@ MCNPError read_files(int, char**);
MCNPError next_double(std::string, double&, int&); MCNPError next_double(std::string, double&, int&);
MCNPError next_int(std::string, int&, int&); MCNPError next_int(std::string, int&, int&);
MCNPError result;
moab::Tag coord_tag, rotation_tag, cfd_heating_tag, cfd_error_tag; moab::Tag coord_tag, rotation_tag, cfd_heating_tag, cfd_error_tag;
std::string h5m_filename; std::string h5m_filename;
...@@ -36,6 +35,7 @@ bool read_qnv = false; ...@@ -36,6 +35,7 @@ bool read_qnv = false;
clock_t start_time, load_time, build_time, interp_time; clock_t start_time, load_time, build_time, interp_time;
int main(int argc, char **argv) { int main(int argc, char **argv) {
MCNPError result;
start_time = clock(); start_time = clock();
...@@ -340,6 +340,7 @@ int main(int argc, char **argv) { ...@@ -340,6 +340,7 @@ int main(int argc, char **argv) {
MCNPError read_files(int argc, char **argv) { MCNPError read_files(int argc, char **argv) {
MCNPError result;
// Check to see if appropriate command lines specified // Check to see if appropriate command lines specified
if (argc < 3) { if (argc < 3) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment