Merge branch 'release-v0.5.3' into develop

docs/source/conf.py

@@ -48,7 +48,7 @@ copyright = u'2011-2013, Massachusetts Institute of Technology'
 # The short X.Y version.
 version = "0.5"
 # The full version, including alpha/beta/rc tags.
-release = "0.5.2"
+release = "0.5.3"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/source/releasenotes/index.rst

@@ -10,6 +10,7 @@ bugs fixed, and known issues for each successive release.
 .. toctree::
     :maxdepth: 1
 
+    notes_0.5.3
     notes_0.5.2
     notes_0.5.1
     notes_0.5.0

docs/source/releasenotes/notes_0.5.3.rst

@@ -21,12 +21,20 @@ the problem at hand (mostly on the number of nuclides in the problem).
 New Features
 ------------
 
-- Special run mode --tallies removed.
+- Output interface enhanced to allow multiple files handles to be opened
+- Particle restart file linked to output interface
 - Particle restarts and state point restarts are both identified with the -r
   command line flag.
-- New regression test suite.
-- All memory leaks fixed.
-- Shared-memory parallelism with OpenMP.
+- Particle instance no longer global, passed to all physics routines
+- Physics routines refactored to rely less on global memory, more arguments
+  passed in
+- CMFD routines refactored and now can compute dominance ratio on the fly
+- PETSc 3.4.2 or higher must be used and compiled with fortran datatype support
+- Memory leaks fixed except for ones from xml-fortran package
+- Test suite enhanced to test output with different compiler options
+- Description of OpenMC development workflow added
+- OpenMP shared-memory parallelism added
+- Special run mode --tallies removed.
 
 ---------
 Bug Fixes
@@ -35,7 +43,7 @@ Bug Fixes
 - 2b1e8a_: Normalize direction vector after reflecting particle.
 - 5853d2_: Set blank default for cross section listing alias.
 - e178c7_: Fix infinite loop with words greater than 80 characters in write_message.
-- c18a6e_: Chcek for valid secondary mode on S(a,b) tables.
+- c18a6e_: Check for valid secondary mode on S(a,b) tables.
 - 82c456_: Fix bug where last process could have zero particles.
 
 .. _2b1e8a: https://github.com/mit-crpg/openmc/commit/2b1e8a

docs/source/usersguide/input.rst

@@ -1205,13 +1205,9 @@ with "false".
 ``<mesh>`` Element
 ------------------
 
-If a structured mesh is desired as a filter for a tally, it must be specified in
-a separate element with the tag name ``<mesh>``. This element has the following
+The CMFD mesh is a structured Cartesian mesh. This element has the following
 attributes/sub-elements:
 
-  :type:
-    The type of structured mesh. Only "rectangular" is currently supported.
-
   :lower_left:
     The lower-left corner of the structured mesh. If only two coordinate are
     given, it is assumed that the mesh is an x-y mesh.

src/cmfd_loss_operator.F90

@@ -26,8 +26,10 @@ contains
     integer :: nnz  ! number of nonzeros in matrix
     integer :: n_i  ! number of interior cells
     integer :: n_c  ! number of corner cells
-    integer :: n_s  ! number side cells
+    integer :: n_s  ! number of side cells
+    integer :: n_e  ! number of edge cells
     integer :: nz_c ! number of non-zero corner cells
+    integer :: nz_e ! number of non-zero edge cells
     integer :: nz_s ! number of non-zero side cells
     integer :: nz_i ! number of non-zero interior cells
 
@@ -48,13 +50,16 @@ contains
     if (cmfd_coremap) then
       nnz = preallocate_loss_matrix(nx, ny, nz, ng, n)
     else ! structured Cartesian grid
-      n_c  = 4                   ! define # of corners
-      n_s  = 2*(nx + ny) - 8     ! define # of sides
-      n_i  = nx*ny - (n_c + n_S) ! define # of interiors  
-      nz_c = ng*n_c*(3 + ng - 1) ! define # nonzero corners
-      nz_s = ng*n_s*(4 + ng - 1) ! define # nonzero sides
-      nz_i = ng*n_i*(5 + ng - 1) ! define # nonzero interiors
-      nnz  = nz_c + nz_s + nz_i
+      n_c  = 8                   ! define # of corners
+      n_e  = 4*(nx - 2) + 4*(ny - 2) + 4*(nz - 2) ! define # of edges
+      n_s  = 2*(nx - 2)*(ny - 2) + 2*(nx - 2)*(nz - 2) &
+           + 2*(ny - 2)*(nz - 2) ! define # of sides
+      n_i  = nx*ny*nz - (n_c + n_e + n_s) ! define # of interiors  
+      nz_c = ng*n_c*(4 + ng - 1) ! define # nonzero corners
+      nz_e = ng*n_e*(5 + ng - 1) ! define # nonzero edges
+      nz_s = ng*n_s*(6 + ng - 1) ! define # nonzero sides
+      nz_i = ng*n_i*(7 + ng - 1) ! define # nonzero interiors
+      nnz  = nz_c + nz_e + nz_s + nz_i
     end if
 
     ! Configure loss matrix