From 28f04592a34c7470212b67f1b4610294bc9bf0ad Mon Sep 17 00:00:00 2001
From: shriwise <pshriwise@gmail.com>
Date: Fri, 17 Aug 2018 14:07:05 -0500
Subject: [PATCH] Factoring out the CAD geometry setup.

---
 src/input_xml.F90 | 147 +++++++++++++++++++++++++++-------------------
 1 file changed, 88 insertions(+), 59 deletions(-)

diff --git a/src/input_xml.F90 b/src/input_xml.F90
index afb68c946c..468e21b33a 100644
--- a/src/input_xml.F90
+++ b/src/input_xml.F90
@@ -561,6 +561,92 @@ contains
 
   end subroutine read_settings_xml_f
 
+
+!===============================================================================
+! READ_GEOMETRY_CAD reads data from a DAGMC .h5m file, checking
+! for material properties and surface boundary conditions
+! some universe information is spoofed for now
+!===============================================================================
+
+  subroutine read_geometry_cad()
+
+    integer :: i, j
+    integer :: univ_id
+    integer :: n_cells_in_univ
+    logical :: file_exists
+    character(MAX_LINE_LEN) :: filename
+    type(Cell),     pointer :: c
+    type(VectorInt) :: univ_ids      ! List of all universe IDs
+    type(DictIntInt) :: cells_in_univ_dict ! Used to count how many cells each
+                                           ! universe contains
+
+    ! Check if dagmc.h5m exists
+    filename = trim(path_input) // "dagmc.h5m"
+    inquire(FILE=filename, EXIST=file_exists)
+    if (.not. file_exists) then
+      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
+    
+    ! ==========================================================================
+    ! 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
+    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
+    end do
+    
+    ! Clear dictionary
+    call cells_in_univ_dict%clear()
+    
+    return
+
+  end subroutine read_geometry_cad
+  
 !===============================================================================
 ! 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
@@ -590,65 +676,8 @@ contains
                                            ! universe contains
 #ifdef CAD
     if (dagmc) then
-      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 % material(1))
-!        c % material(1) = cell_material(cell_pointer(i-1), 1)
-        allocate(c % sqrtKT(1))
-        c % sqrtkT(1) = 293
-        c % sqrtkT(:) = sqrt(K_BOLTZMANN * c % sqrtkT(:))
-        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
-      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
-      end do
-
-      ! Clear dictionary
-      call cells_in_univ_dict%clear()
-
-      return
+       call read_geometry_cad()
+       return
     end if
 #endif