From cc9bcc577cf9cd686b2a8d9e0e4cb11f5ff0b6d3 Mon Sep 17 00:00:00 2001
From: samuel shaner <samuelshaner@gmail.com>
Date: Sat, 5 Nov 2016 16:40:22 +0000
Subject: [PATCH] added num_delayed_groups attribute to mgxs object

---
 src/mgxs_header.F90 |  22 ++++++++++++++++++----
 tests/1d_mgxs.h5    | Bin 124720 -> 128136 bytes
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/mgxs_header.F90 b/src/mgxs_header.F90
index 7c149d5e1a..fc5e8cb3e1 100644
--- a/src/mgxs_header.F90
+++ b/src/mgxs_header.F90
@@ -64,6 +64,7 @@ module mgxs_header
     ! Fission information
     logical :: fissionable  ! mgxs object is fissionable?
     integer :: scatter_format ! either legendre, histogram, or tabular.
+    integer :: num_delayed_groups ! Num delayed groups
 
     ! Caching information
     integer :: index_temp ! temperature index for nuclide
@@ -445,6 +446,9 @@ module mgxs_header
       call mgxs_from_hdf5(this, xs_id, temperature, method, tolerance, &
                           temps_to_read, order_dim)
 
+      ! Set the number of delayed groups
+      this % num_delayed_groups = delayed_groups
+
       ! Load the more specific data
       do t = 1, temps_to_read % size()
         associate(xs => this % xs(t))
@@ -1126,6 +1130,9 @@ module mgxs_header
       call mgxs_from_hdf5(this, xs_id, temperature, method, tolerance, &
                           temps_to_read, order_dim)
 
+      ! Set the number of delayed groups
+      this % num_delayed_groups = delayed_groups
+
       ! Load the more specific data
       do t = 1, temps_to_read % size()
         associate(xs => this % xs(t))
@@ -1556,7 +1563,7 @@ module mgxs_header
 
                 ! If beta is zeros, raise error
                 if (temp_beta(1,1,1,1) == ZERO) then
-                  call fatal_error("cannot set delayed-nu-fission with a 1D &
+                  call fatal_error("cannot set delayed-nu-fission with a 3D &
                        &array if beta not provided")
                 end if
 
@@ -2030,6 +2037,7 @@ module mgxs_header
         this % name = trim(mat % name)
       end if
 
+      ! Set whether this material is fissionable
       this % fissionable = mat % fissionable
 
       ! The following info we should initialize, but we dont need it nor
@@ -2163,6 +2171,9 @@ module mgxs_header
       call mgxs_combine(this, temps, mat, nuclides, max_order, scatter_format, &
                         order_dim)
 
+      ! Set the number of delayed groups
+      this % num_delayed_groups = delayed_groups
+
       ! Create the Xs Data for each temperature
       TEMP_LOOP: do t = 1, temps % size()
 
@@ -2462,6 +2473,9 @@ module mgxs_header
       call mgxs_combine(this, temps, mat, nuclides, max_order, scatter_format, &
            order_dim)
 
+      ! Set the number of delayed groups
+      this % num_delayed_groups = delayed_groups
+
       ! Get the number of each polar and azi angles and make sure all the
       ! NuclideAngle types have the same number of these angles
       n_pol = -1
@@ -3121,7 +3135,7 @@ module mgxs_header
         end do
 
         ! Adjust dg in case of round off error
-        dg = min(dg, num_delayed_groups)
+        dg = min(dg, this % num_delayed_groups)
 
         ! Get the outgoing group
         gout = 1
@@ -3175,7 +3189,7 @@ module mgxs_header
         ! Get the delayed group
         dg = 0
 
-        do while (xi_pd < prob_prompt)
+        do while (xi_pd >= prob_prompt)
           dg = dg + 1
           prob_prompt = prob_prompt + &
                this % get_xs('delayed-nu-fission', gin, uvw=uvw, dg=dg) / &
@@ -3183,7 +3197,7 @@ module mgxs_header
         end do
 
         ! Adjust dg in case of round off error
-        dg = min(dg, num_delayed_groups)
+        dg = min(dg, this % num_delayed_groups)
 
         ! Get the outgoing group
         gout = 1
diff --git a/tests/1d_mgxs.h5 b/tests/1d_mgxs.h5
index 5989962ce035ce67a0d1a2fe430b84adee2f2844..e3b85c24163fe4020435db5c5d674575f2b65be0 100644
GIT binary patch
delta 1879
zcmc&#Sx}Q#7|kE-5D*lpLRcb+h^7<>OIQU@K$gg&h)Pj#NdXlkg2n|!j4fE%T$0}w
zMUg!bTp$ElT|mXEh~k1!1+CZtK@ns`D`Hy|Y#%z)m(H|z=H5Hsde1oz-z~YJn$)ej
zpG{4AB{6j%JKS^>u_bzhrSc2?c!E$R<pvAJuc3@C-cv$S#~@=IXi`Jwc>gi4W!Fcq
z)><0rZx}=N&xlk8Fj}c(WKFCJzmFgrMMf&^uNh=<m4J*<qbqr=R%+1Bv0|;UTNEnT
zxG{XgiZH=O!3S5&hG=2TM)P%>%vVK-L=n;J#`40#qXb*S!~PZ^#^NN)iai2>sjQs-
zGfC`J9;zH+K_hjm|6<|a{Q++}Pn}RB*H?QH{v^wgL)KRFNz2X@Wk=2B2@e1E^#pc9
z1-pUhH<+YF8D+?SHHwf&J~mvhVmTtqdwnC7t8W;jcqTcM{SiGu9nJZ~g*wLRPdk0V
zM8b{MH)?B<4>a{ugWocOD3mplI^hUwZ5n^H(Ku4SYAQh`t*VShPKl<gI)7lS3zcls
zq^ouheJJBA>beL;Q|riHPKceP$uFGQg|O&M40)DdjOR_2$!9Ow;X7sUw;mlbl$hwH
zy(^JH<*g*QNFYPv(7g-wg9WJDEG6fM6hQW5FiI%PN5Lug1B+VnurRhPJ@tJqZlxr3
zuo$^8b3EKq<eh`(=azG$_Gd%7S^3CEB^&%=tGfwdSz<Kj8#i2-odxakVL#R5SxB*E
zr<uEDqx|aLrH&~%u=hIs#>p`sxz)>VO)r*X+rntyz3Y#o^3IS<V|p>RWE`Iz<fDM<
z^%i<(YbivD65&~H8B)w!%<hMtMq1&CruTw!<mmcF3vDY<IO`Cr{9y(BQsevXg^Mdu
z=T?;Kbg>edGu)5#4priu<1ZFpO{+rCmrqI;{osN&LErw2Ko?wf)~(g-cgEalP2GFK
zoUub|x7_&XENrjqoibGFggHu2O?$Z`Zjp}#xqBRtb?C*fack{yKTyqLd9WQygAZs+
zB5mO;Q!CXg<KlcPEiXXq!^P*@b|m#!bFp)QzSq-OF2cPde_HjKEgHuWjVUMXpomut
zTr+V({T7c9`>feGGtf@GeAX3`0C`UV%N;pJsVirPctW~0v!1t{kB8S4Cx(r@v0ZL`
z<%!$}VtJd-)_z|wqwL~ZiFsfiBra97&BHE5Lz7sTIv*VG;ZPl_KYZ6M_NUMA$L}|b
z+NJRSFBA~x1^llHh#Q*zNr9W4EQdq2EWEV8twSs4;+ZhyY)A$RU8b(qQOR6rpS!Qo
z9Ku3vd!b{VD;LtqB?Bxq7AW-C{^3V9pt~f7O_4G&@X~#dzSssn^1Y(raZI!bXSBtY
zSc4&MS+x1sm8pn}SM+HNTESw+g9jHjGvHCyQ}mK!1(RJ1E*;P}M4-d{AMb@(BI`ze
zrutodgn9BbD||V~RW02<S*Zt7d9yS9ojE$p3!104(vftU_ttpW49ZM()6k`K$iCK4
zh$75TQlB29=R$|yBt;P4%M9WSi>ewO2_4GuL6#ncX4sl0K6=Vg4|{JM2z@Oy$Nt+H
z`($<o2*~CJTsY4`PUtM-Ju8iHHNT@!?q`j5uZx+xS4>08ozOj^Xj`00c4=aIn;@H+
znHhJ_0gpKx<w`aiR+<%Y1{`OwmuSj$n@v$H-Phai2QhT&lNWZmn8S}&(|>t_D`NK1
zj(op_18QNhNBUeh=>AqQsW06U>yHKEdGH)`Uh5&JEVF`!Th}))T;1U%XT}>4)`+Le
z&Uh0Z@Csh-wk~nR?rF^3nc;zi$dgZ8d#&L<{OaNL$)0dbd$*;`)&_1jhEf9}c%FF0
zpbT}dv_WQLQC`hqPc)cO)Z@iAIGDWHZuNOjXiywR=PP9*MT0`4jD1EcR&R*j6eA)n
K)bweeX7(SGdFR#u

delta 141
zcmeBp$-dzn`veUpgXa^qEEw50CLfiY{2_y5vw>6@<K(<7uE`suJtiy2XiQ#E!ZG>9
zE{(|*G6kCt$Ye23{v{K^w1IE3PyU|G4vIIJCO;@zuz82dgUMj+3wA)YE9~-^JYiSB
r<N_Iv$pX7QrYkIFT(o)B?tgrfiW{0WPH)#Z&G<o@nSnuI;z3aWY<N5Q