From 45154ef21fcb3a48c3c3078d4364a91d538944ea Mon Sep 17 00:00:00 2001 From: pshriwise Date: Fri, 21 Sep 2018 16:16:41 -0400 Subject: [PATCH] Indentation and formatting updates. --- src/dagmc.cpp | 174 +++++++++++++++++++++++++------------------------- 1 file changed, 86 insertions(+), 88 deletions(-) diff --git a/src/dagmc.cpp b/src/dagmc.cpp index 050d437c60..8b5d5dc77d 100644 --- a/src/dagmc.cpp +++ b/src/dagmc.cpp @@ -35,105 +35,103 @@ void load_dagmc_geometry_c() // initialize cell objects openmc::n_cells = DAG->num_entities(3); - for(int i = 0; i < openmc::n_cells; i++) - { - moab::EntityHandle vol_handle = DAG->entity_by_index(3, i+1); - - // set cell ids using global IDs - openmc::DAGCell* c = new openmc::DAGCell(); - c->id_ = DAG->id_by_index(3, i+1); - c->dagmc_ptr = DAG; - c->universe_ = dagmc_univ_id; // set to zero for now - c->fill_ = openmc::C_NONE; // no fill, single universe - - openmc::cells.push_back(c); - openmc::cell_map[c->id_] = c->id_; - - // Populate the Universe vector and dict - auto it = openmc::universe_map.find(dagmc_univ_id); - if (it == openmc::universe_map.end()) { - openmc::universes.push_back(new openmc::Universe()); - openmc::universes.back()-> id_ = dagmc_univ_id; - openmc::universes.back()->cells_.push_back(i); - openmc::universe_map[dagmc_univ_id] = openmc::universes.size() - 1; + for(int i = 0; i < openmc::n_cells; i++) { + moab::EntityHandle vol_handle = DAG->entity_by_index(3, i+1); + + // set cell ids using global IDs + openmc::DAGCell* c = new openmc::DAGCell(); + c->id_ = DAG->id_by_index(3, i+1); + c->dagmc_ptr = DAG; + c->universe_ = dagmc_univ_id; // set to zero for now + c->fill_ = openmc::C_NONE; // no fill, single universe + + openmc::cells.push_back(c); + openmc::cell_map[c->id_] = c->id_; + + // Populate the Universe vector and dict + auto it = openmc::universe_map.find(dagmc_univ_id); + if (it == openmc::universe_map.end()) { + openmc::universes.push_back(new openmc::Universe()); + openmc::universes.back()-> id_ = dagmc_univ_id; + openmc::universes.back()->cells_.push_back(i); + openmc::universe_map[dagmc_univ_id] = openmc::universes.size() - 1; + } + else { + openmc::universes[it->second]->cells_.push_back(i); + } + + if(DAG->is_implicit_complement(vol_handle)) { + // assuming implicit complement is void for now + c->material_.push_back(openmc::MATERIAL_VOID); + continue; + } + + if(DAG->has_prop(vol_handle, "mat")){ + std::string mat_value; + rval = DAG->prop_value(vol_handle, "mat", mat_value); + MB_CHK_ERR_CONT(rval); + TOLOWER(mat_value); + + if(mat_value == "void" || mat_value == "vacuum") { + c->material_.push_back(openmc::MATERIAL_VOID); } else { - openmc::universes[it->second]->cells_.push_back(i); - } - - if(DAG->is_implicit_complement(vol_handle)) { - // assuming implicit complement is void for now - c->material_.push_back(openmc::MATERIAL_VOID); - continue; - } - - if(DAG->has_prop(vol_handle, "mat")){ - std::string mat_value; - rval = DAG->prop_value(vol_handle, "mat", mat_value); - MB_CHK_ERR_CONT(rval); - TOLOWER(mat_value); - - if(mat_value == "void" || mat_value == "vacuum") { - c->material_.push_back(openmc::MATERIAL_VOID); - } - else { - c->material_.push_back(std::stoi(mat_value)); - } - } - else { - std::cout << c->id_ << std::endl; - openmc::fatal_error("A volume without a material was found."); + c->material_.push_back(std::stoi(mat_value)); } } - + else { + std::cout << c->id_ << std::endl; + openmc::fatal_error("A volume without a material was found."); + } + } + // initialize surface objects openmc::n_surfaces = DAG->num_entities(2); openmc::surfaces.resize(openmc::n_surfaces); - for(int i = 0; i < openmc::n_surfaces; i++) - { - moab::EntityHandle surf_handle = DAG->entity_by_index(2, i+1); - - // set cell ids using global IDs - openmc::DAGSurface* s = new openmc::DAGSurface(); - s->id_ = DAG->id_by_index(2, i+1); - s->dagmc_ptr = DAG; - - if(DAG->has_prop(surf_handle, "boundary")) { - std::string bc_value; - rval = DAG->prop_value(surf_handle, "boundary", bc_value); - MB_CHK_ERR_CONT(rval); - TOLOWER(bc_value); - - if(bc_value == "transmit" || bc_value == "transmission") { - s->bc_ = openmc::BC_TRANSMIT; - } - else if(bc_value == "vacuum") { - s->bc_ = openmc::BC_VACUUM; - } - else if(bc_value == "reflective" || bc_value == "reflect" || bc_value == "reflecting") { - s->bc_ = openmc::BC_REFLECT; - } - else if(bc_value == "periodic") { - openmc::fatal_error("Periodic boundary condition not supported in DAGMC."); - } - else { - std::stringstream err_msg; - err_msg << "Unknown boundary condition \"" << s->bc_ - << "\" specified on surface " << s->id_; - openmc::fatal_error(err_msg); - } - } - // if no BC property is found, set to transmit - else { + for(int i = 0; i < openmc::n_surfaces; i++) { + moab::EntityHandle surf_handle = DAG->entity_by_index(2, i+1); + + // set cell ids using global IDs + openmc::DAGSurface* s = new openmc::DAGSurface(); + s->id_ = DAG->id_by_index(2, i+1); + s->dagmc_ptr = DAG; + + if(DAG->has_prop(surf_handle, "boundary")) { + std::string bc_value; + rval = DAG->prop_value(surf_handle, "boundary", bc_value); + MB_CHK_ERR_CONT(rval); + TOLOWER(bc_value); + + if(bc_value == "transmit" || bc_value == "transmission") { s->bc_ = openmc::BC_TRANSMIT; } - - // add to global array and map - openmc::surfaces[i] = s; - openmc::surface_map[s->id_] = s->id_; + else if(bc_value == "vacuum") { + s->bc_ = openmc::BC_VACUUM; + } + else if(bc_value == "reflective" || bc_value == "reflect" || bc_value == "reflecting") { + s->bc_ = openmc::BC_REFLECT; + } + else if(bc_value == "periodic") { + openmc::fatal_error("Periodic boundary condition not supported in DAGMC."); + } + else { + std::stringstream err_msg; + err_msg << "Unknown boundary condition \"" << s->bc_ + << "\" specified on surface " << s->id_; + openmc::fatal_error(err_msg); + } } - + // if no BC property is found, set to transmit + else { + s->bc_ = openmc::BC_TRANSMIT; + } + + // add to global array and map + openmc::surfaces[i] = s; + openmc::surface_map[s->id_] = s->id_; + } + return; }