From 122cce8ed4da874c99c7c42c718a37885c7cabae Mon Sep 17 00:00:00 2001 From: shriwise Date: Fri, 17 Aug 2018 16:30:40 -0500 Subject: [PATCH] Ahereing to Fortran styleguide. --- src/geometry.cpp | 29 +++++++------- src/geometry_header.F90 | 2 +- src/input_xml.F90 | 86 ++++++++++++++++++++--------------------- 3 files changed, 58 insertions(+), 59 deletions(-) diff --git a/src/geometry.cpp b/src/geometry.cpp index abbca4481a..2dca114cfa 100644 --- a/src/geometry.cpp +++ b/src/geometry.cpp @@ -58,22 +58,21 @@ find_cell(Particle* p, int search_surf) { #ifdef CAD // if (dagmc) then - // i_cell = next_cell(cells(p % last_cell(1)), surfaces(ABS(p % surface))) - // p % last_material = p % material - // p % last_sqrtKT = p % sqrtKT - // p % coord(1) % cell = i_cell - // p % cell_instance = 1 - // p % material = cells(i_cell) % material(1) - // p % sqrtKT = cells(i_cell) % sqrtKT(1) + // i_cell = next_cell(cells(p % last_cell(1)), surfaces(ABS(p % surface))) + // p % last_material = p % material + // p % last_sqrtKT = p % sqrtKT + // p % coord(1) % cell = i_cell + // p % cell_instance = 1 + // p % material = cells(i_cell) % material(1) + // p % sqrtKT = cells(i_cell) % sqrtKT(1) - // ! Show cell information on trace - // if (verbosity >= 10 .or. trace) then - // call write_message(" Entering cell " // trim(to_str(& - // cells(i_cell) % id()))) - // call write_message(" with material " // trim(to_str(p % material))) - // end if - - // return + // ! Show cell information on trace + // if (verbosity >= 10 .or. trace) then + // call write_message(" Entering cell " // trim(to_str(& + // cells(i_cell) % id()))) + // end if + + // return // end if #endif diff --git a/src/geometry_header.F90 b/src/geometry_header.F90 index 942a2f77ca..b58b5415ba 100644 --- a/src/geometry_header.F90 +++ b/src/geometry_header.F90 @@ -27,7 +27,7 @@ module geometry_header integer(C_INT32_T), intent(in), value :: cell_ind type(C_PTR) :: ptr end function cell_pointer - + function cell_id_c(cell_ptr) bind(C, name='cell_id') result(id) import C_PTR, C_INT32_T type(C_PTR), intent(in), value :: cell_ptr diff --git a/src/input_xml.F90 b/src/input_xml.F90 index 1a2013f1c1..9954a9b855 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -563,7 +563,7 @@ contains #ifdef CAD - + !=============================================================================== ! READ_GEOMETRY_CAD reads data from a DAGMC .h5m file, checking ! for material properties and surface boundary conditions @@ -589,68 +589,68 @@ contains call fatal_error("Geometry CAD file '" // trim(filename) // "' does not & &exist!") end if - + call write_message("Reading CAD geometry...", 5) call load_cad_geometry() call allocate_surfaces() call allocate_cells() - + ! setup universe data structs do i = 1, n_cells - c => cells(i) - ! additional metadata spoofing - allocate(c % sqrtKT(1)) - c % sqrtkT(1) = -1.0 ! rely on temps from elsewhere - univ_id = c % universe() - if (.not. allocated(c%region)) allocate(c%region(0)) - - if (.not. cells_in_univ_dict % has(univ_id)) then - n_universes = n_universes + 1 - n_cells_in_univ = 1 - call universe_dict % set(univ_id, n_universes) - call univ_ids % push_back(univ_id) - else - n_cells_in_univ = 1 + cells_in_univ_dict % get(univ_id) - end if - call cells_in_univ_dict % set(univ_id, n_cells_in_univ) - end do - + c => cells(i) + ! additional metadata spoofing + allocate(c % sqrtKT(1)) + c % sqrtkT(1) = -1.0 ! rely on temps from elsewhere + univ_id = c % universe() + if (.not. allocated(c%region)) allocate(c%region(0)) + + if (.not. cells_in_univ_dict % has(univ_id)) then + n_universes = n_universes + 1 + n_cells_in_univ = 1 + call universe_dict % set(univ_id, n_universes) + call univ_ids % push_back(univ_id) + else + n_cells_in_univ = 1 + cells_in_univ_dict % get(univ_id) + end if + call cells_in_univ_dict % set(univ_id, n_cells_in_univ) + end do + ! ========================================================================== ! SETUP UNIVERSES - + ! Allocate universes, universe cell arrays, and assign base universe allocate(universes(n_universes)) do i = 1, n_universes - associate (u => universes(i)) - u % id = univ_ids % data(i) - ! Allocate cell list - n_cells_in_univ = cells_in_univ_dict % get(u % id) - allocate(u % cells(n_cells_in_univ)) - u % cells(:) = 0 - end associate + associate (u => universes(i)) + u % id = univ_ids % data(i) + ! Allocate cell list + n_cells_in_univ = cells_in_univ_dict % get(u % id) + allocate(u % cells(n_cells_in_univ)) + u % cells(:) = 0 + end associate end do - + root_universe = 0 + 1 - + do i = 1, n_cells - ! Get index in universes array - j = universe_dict % get(cells(i) % universe()) - ! Set the first zero entry in the universe cells array to the index in the - ! global cells array - associate (u => universes(j)) - u % cells(find(u % cells, 0)) = i - end associate + ! Get index in universes array + j = universe_dict % get(cells(i) % universe()) + ! Set the first zero entry in the universe cells array to the index in the + ! global cells array + associate (u => universes(j)) + u % cells(find(u % cells, 0)) = i + end associate end do - + ! Clear dictionary call cells_in_univ_dict%clear() - + return end subroutine read_geometry_cad #endif - + !=============================================================================== ! READ_GEOMETRY_XML reads data from a geometry.xml file and parses it, checking ! for errors and placing properly-formatted data in the right data structures @@ -680,8 +680,8 @@ contains ! universe contains #ifdef CAD if (dagmc) then - call read_geometry_cad() - return + call read_geometry_cad() + return end if #endif