Initial commit from Polytechnique Montreal

8 files changed, 1500 insertions, 0 deletions

diff --git a/Dragon/data/tapollo2_proc/CEA93_V4_DPL.c2m b/Dragon/data/tapollo2_proc/CEA93_V4_DPL.c2m
new file mode 100644
index 0000000..98d1c77
--- /dev/null
+++ b/Dragon/data/tapollo2_proc/CEA93_V4_DPL.c2m
@@ -0,0 +1,135 @@
+*
+* DEPLETION CHAIN COMPATIBLE WITH CEA93/V4 LIBRARY IN APOLIB-2 FORMAT
+*
+PARAMETER LIBRARY ::
+  EDIT 1
+    ::: LINKED_LIST LIBRARY ;
+  ;
+MODULE LIB: END: ;
+*
+LIBRARY := LIB: :: EDIT 2
+ DEPL LIB: APLIB2 FIL: CEA93V4 CHAIN
+ U234     FROM N2N      1.0000E+00 U235     DECAY    1.0000E+00 PU238
+ U235     FROM NG       1.0000E+00 U234     N2N      1.0000E+00 U236
+ U236     FROM NG       1.0000E+00 U235
+ U238
+ NP237    FROM NG       1.0000E+00 U236     N2N      1.0000E+00 U238
+ NP239    FROM NG       1.0000E+00 U238
+ PU238    FROM NG       1.0000E+00 NP237    DECAY    1.0000E+00 CM242
+               N2N      1.0000E+00 PU239    N2N      1.0000E+00 NP239
+ PU239    FROM DECAY    1.0000E+00 NP239    NG       1.0000E+00 PU238
+               DECAY    1.0000E+00 CM243    N2N      1.0000E+00 PU240
+ PU240    FROM NG       1.0000E+00 PU239    DECAY    1.0000E+00 CM244
+               N2N      1.0000E+00 PU241
+ PU241    FROM NG       1.0000E+00 PU240    N2N      1.0000E+00 PU242
+ PU242    FROM NG       1.0000E+00 PU241    NG       1.4160E-01 AM241
+ AM241    FROM DECAY    1.0000E+00 PU241
+ AM242M   FROM NG       1.1500E-01 AM241
+ AM243    FROM NG       1.0000E+00 AM242M   NG       1.0000E+00 PU242
+ CM242    FROM NG       7.4340E-01 AM241    N2N      1.0000E+00 CM243
+ CM243    FROM NG       1.0000E+00 CM242    N2N      1.0000E+00 CM244
+ CM244    FROM NG       1.0000E+00 CM243    NG       1.0000E+00 AM243
+               N2N      1.0000E+00 CM245
+ CM245    FROM NG       1.0000E+00 CM244    N2N      1.0000E+00 CM246
+ CM246    FROM NG       1.0000E+00 CM245    N2N      1.0000E+00 CM247
+ CM247    FROM NG       1.0000E+00 CM246
+ GD154
+ GD155    FROM NG       1.0000E+00 GD154
+ GD156    FROM NG       1.0000E+00 GD155
+ GD157    FROM NG       1.0000E+00 GD156
+ GD158    FROM NG       1.0000E+00 GD157
+ GD160
+ TB159    FROM NG       1.0000E+00 GD158
+ DY160    FROM NG       1.0000E+00 TB159
+ DY161    FROM NG       1.0000E+00 DY160    NG       1.0000E+00 GD160
+ DY162    FROM NG       1.0000E+00 DY161
+ ZR95PF
+ ZR96PF   FROM NG       1.0000E+00 ZR95PF
+ NB95PF   FROM DECAY    1.0000E+00 ZR95PF
+ MO95PF   FROM DECAY    1.0000E+00 NB95PF
+ MO96PF   FROM NG       1.0000E+00 MO95PF   NG       1.0000E+00 NB95PF
+ MO97PF   FROM NG       1.0000E+00 MO96PF   NG       1.0000E+00 ZR96PF
+ MO98PF   FROM NG       1.0000E+00 MO97PF
+ MO99PF   FROM NG       1.0000E+00 MO98PF
+ MO100PF  FROM NG       1.0000E+00 MO99PF
+ TC99PF   FROM DECAY    1.0000E+00 MO99PF
+ RU101PF  FROM NG       1.0000E+00 MO100PF
+ RU102PF  FROM NG       1.0000E+00 RU101PF
+ RU103PF  FROM NG       1.0000E+00 RU102PF
+ RU104PF  FROM NG       1.0000E+00 RU103PF
+ RU105PF  FROM NG       1.0000E+00 RU104PF
+ RU106PF  FROM NG       1.0000E+00 RU105PF
+ RH103PF  FROM DECAY    1.0000E+00 RU103PF
+ RH105PF  FROM DECAY    1.0000E+00 RU105PF
+ PD105PF  FROM DECAY    1.0000E+00 RH105PF
+ PD106PF  FROM NG       1.0000E+00 PD105PF  NG       1.0000E+00 RH105PF
+               DECAY    1.0000E+00 RU106PF
+ PD107PF  FROM NG       1.0000E+00 PD106PF
+ PD108PF  FROM NG       1.0000E+00 PD107PF
+ AG109PF  FROM NG       1.0000E+00 PD108PF
+ I131PF
+ I135PF
+ XE131PF  FROM DECAY    1.0000E+00 I131PF
+ XE132PF  FROM NG       1.0000E+00 XE131PF  NG       1.0000E+00 I131PF
+ XE133PF  FROM NG       1.0000E+00 XE132PF
+ XE135PF  FROM DECAY    1.0000E+00 I135PF
+ XE136PF  FROM NG       1.0000E+00 XE135PF
+ CS133PF  FROM DECAY    1.0000E+00 XE133PF
+ CS134PF  FROM NG       1.0000E+00 CS133PF
+ CS135PF  FROM NG       1.0000E+00 CS134PF  DECAY    1.0000E+00 XE135PF
+ CS136PF  FROM NG       1.0000E+00 CS135PF
+ CS137PF  FROM NG       1.0000E+00 CS136PF
+ TE127MPF
+ I127PF   FROM DECAY    1.0000E+00 TE127MPF
+ TE129MPF
+ I129PF   FROM DECAY    1.0000E+00 TE129MPF
+ CE141PF
+ PR141PF  FROM DECAY    1.0000E+00 CE141PF
+ CE144PF
+ PR143PF
+ ND143PF  FROM DECAY    1.0000E+00 PR143PF
+ ND144PF  FROM NG       1.0000E+00 ND143PF  NG       1.0000E+00 PR143PF
+               DECAY    1.0000E+00 CE144PF
+ ND145PF  FROM NG       1.0000E+00 ND144PF
+ ND146PF  FROM NG       1.0000E+00 ND145PF
+ ND147PF  FROM NG       1.0000E+00 ND146PF
+ ND148PF  FROM NG       1.0000E+00 ND147PF
+ ND150PF
+ PM147PF  FROM DECAY    1.0000E+00 ND147PF
+ PM148PF  FROM NG       5.3000E-01 PM147PF
+ PM148MPF FROM NG       4.7000E-01 PM147PF
+ PM149PF  FROM NG       1.0000E+00 PM148PF  NG       1.0000E+00 ND148PF
+               NG       1.0000E+00 PM148MPF
+ PM151PF  FROM NG       1.0000E+00 ND150PF
+ SM147PF  FROM DECAY    1.0000E+00 PM147PF
+ SM148PF  FROM NG       1.0000E+00 SM147PF  DECAY    1.0000E+00 PM148PF
+               DECAY    1.0000E+00 PM148MPF
+ SM149PF  FROM NG       1.0000E+00 SM148PF  DECAY    1.0000E+00 PM149PF
+ SM150PF  FROM NG       1.0000E+00 SM149PF  NG       1.0000E+00 PM149PF
+ SM151PF  FROM NG       1.0000E+00 SM150PF  DECAY    1.0000E+00 PM151PF
+ SM152PF  FROM NG       1.0000E+00 SM151PF  NG       1.0000E+00 PM151PF
+ SM153PF  FROM NG       1.0000E+00 SM152PF
+ SM154PF  FROM NG       1.0000E+00 SM153PF
+ EU153PF  FROM DECAY    1.0000E+00 SM153PF
+ EU154PF  FROM NG       1.0000E+00 EU153PF
+ EU155PF  FROM NG       1.0000E+00 EU154PF  NG       1.0000E+00 SM154PF
+ EU156PF  FROM NG       1.0000E+00 EU155PF
+ EU157PF  FROM NG       1.0000E+00 EU156PF
+ GD154PF  FROM DECAY    1.0000E+00 EU154PF
+ GD155PF  FROM NG       1.0000E+00 GD154PF  DECAY    1.0000E+00 EU155PF
+ GD156PF  FROM NG       1.0000E+00 GD155PF  DECAY    1.0000E+00 EU156PF
+ GD157PF  FROM NG       1.0000E+00 GD156PF  DECAY    1.0000E+00 EU157PF
+ KR83PF
+ ZR93PF
+ CD113PF
+ IN115PF
+ LA139PF
+ PSU5U
+ PSU8U
+ PSP9U
+ PSP0U
+ PSP1U
+ PSP2U
+ ENDCHAIN ;
+*
+END: ;
diff --git a/Dragon/data/tapollo2_proc/CEA93_V6_DPL.c2m b/Dragon/data/tapollo2_proc/CEA93_V6_DPL.c2m
new file mode 100644
index 0000000..cc47e2f
--- /dev/null
+++ b/Dragon/data/tapollo2_proc/CEA93_V6_DPL.c2m
@@ -0,0 +1,141 @@
+*
+* DEPLETION CHAIN COMPATIBLE WITH CEA93/V6 LIBRARY IN APOLIB-2 FORMAT
+*
+PARAMETER LIBRARY ::
+  EDIT 1
+    ::: LINKED_LIST LIBRARY ;
+  ;
+MODULE LIB: END: ;
+*
+LIBRARY := LIB: :: EDIT 2
+ DEPL LIB: APLIB2 FIL: CEA93V6 CHAIN
+ U234     FROM N2N      1.0000E+00 U235     DECAY    1.0000E+00 PU238
+ U235     FROM NG       1.0000E+00 U234     N2N      1.0000E+00 U236
+               DECAY    1.0000E+00 PU239
+ U236     FROM NG       1.0000E+00 U235     N2N      1.0000E+00 U237
+               N2N      3.8328E-01 NP237    DECAY    1.0000E+00 PU240
+ U237     FROM NG       1.0000E+00 U236     N2N      1.0000E+00 U238
+ U238     FROM NG       1.0000E+00 U237     DECAY    1.0000E+00 PU242
+ NP237    FROM N2N      1.0000E+00 NP238    N2N      1.0000E+00 PU238
+               NG       1.0000E+00 PU236    DECAY    1.0000E+00 U237
+               DECAY    1.0000E+00 AM241
+ NP238    FROM NG       1.0000E+00 NP237    N2N      1.0000E+00 NP239
+ NP239    FROM NG       1.0000E+00 NP238    NG       1.0000E+00 U238
+               DECAY    1.0000E+00 AM243
+ PU236    FROM N2N      3.8328E-01 NP237
+ PU238    FROM DECAY    1.0000E+00 NP238    DECAY    1.0000E+00 CM242
+               N2N      1.0000E+00 PU239
+ PU239    FROM DECAY    1.0000E+00 NP239    NG       1.0000E+00 PU238
+               DECAY    1.0000E+00 CM243    N2N      1.0000E+00 PU240
+ PU240    FROM NG       1.0000E+00 PU239    NG       1.0000E+00 NP239
+               N2N      1.0000E+00 PU241    N2N      1.0000E+00 AM241
+               DECAY    1.0000E+00 CM244
+ PU241    FROM NG       1.0000E+00 PU240    N2N      1.0000E+00 PU242
+               DECAY    1.0000E+00 CM245
+ PU242    FROM NG       1.0000E+00 PU241    NG       1.53105E-01 AM241
+               DECAY    1.0000E+00 CM246
+ AM241    FROM N2N      1.0000E+00 AM242M   N2N      1.0000E+00 CM242
+               DECAY    1.0000E+00 PU241
+ AM242M   FROM NG       1.1500E-01 AM241    N2N      1.0000E+00 AM243
+ AM243    FROM NG       1.0000E+00 AM242M   NG       1.0000E+00 PU242
+ CM242    FROM NG       7.31895E-01 AM241   N2N      1.0000E+00 CM243
+ CM243    FROM NG       1.0000E+00 CM242    N2N      1.0000E+00 CM244
+ CM244    FROM NG       1.0000E+00 CM243    NG       1.0000E+00 AM243
+               N2N      1.0000E+00 CM245
+ CM245    FROM NG       1.0000E+00 CM244    N2N      1.0000E+00 CM246
+ CM246    FROM NG       1.0000E+00 CM245    N2N      1.0000E+00 CM247
+ CM247    FROM NG       1.0000E+00 CM246    N2N      1.0000E+00 CM248
+ CM248    FROM NG       1.0000E+00 CM247
+ ZR95PF
+ ZR96PF   FROM NG       1.0000E+00 ZR95PF
+ NB95PF   FROM DECAY    1.0000E+00 ZR95PF
+ MO95PF   FROM DECAY    1.0000E+00 NB95PF
+ MO96PF   FROM NG       1.0000E+00 MO95PF   NG       1.0000E+00 NB95PF
+ MO97PF   FROM NG       1.0000E+00 MO96PF   NG       1.0000E+00 ZR96PF
+ MO98PF   FROM NG       1.0000E+00 MO97PF
+ MO99PF   FROM NG       1.0000E+00 MO98PF
+ MO100PF  FROM NG       1.0000E+00 MO99PF
+ TC99PF   FROM DECAY    1.0000E+00 MO99PF
+ RU101PF  FROM NG       1.0000E+00 MO100PF
+ RU102PF  FROM NG       1.0000E+00 RU101PF
+ RU103PF  FROM NG       1.0000E+00 RU102PF
+ RU104PF  FROM NG       1.0000E+00 RU103PF
+ RU105PF  FROM NG       1.0000E+00 RU104PF
+ RU106PF  FROM NG       1.0000E+00 RU105PF
+ RH103PF  FROM DECAY    1.0000E+00 RU103PF
+ RH105PF  FROM DECAY    1.0000E+00 RU105PF
+ PD105PF  FROM DECAY    1.0000E+00 RH105PF
+ PD106PF  FROM NG       1.0000E+00 PD105PF  NG       1.0000E+00 RH105PF
+               DECAY    1.0000E+00 RU106PF
+ PD107PF  FROM NG       1.0000E+00 PD106PF
+ PD108PF  FROM NG       1.0000E+00 PD107PF
+ AG109PF  FROM NG       1.0000E+00 PD108PF
+ I131PF
+ I135PF
+ XE131PF  FROM DECAY    1.0000E+00 I131PF
+ XE132PF  FROM NG       1.0000E+00 XE131PF  NG       1.0000E+00 I131PF
+ XE133PF  FROM NG       1.0000E+00 XE132PF
+ XE135PF  FROM DECAY    1.0000E+00 I135PF
+ XE136PF  FROM NG       1.0000E+00 XE135PF
+ CS133PF  FROM DECAY    1.0000E+00 XE133PF
+ CS134PF  FROM NG       1.0000E+00 CS133PF
+ CS135PF  FROM NG       1.0000E+00 CS134PF  DECAY    1.0000E+00 XE135PF
+ CS136PF  FROM NG       1.0000E+00 CS135PF
+ CS137PF  FROM NG       1.0000E+00 CS136PF
+ TE127MPF
+ I127PF   FROM DECAY    1.0000E+00 TE127MPF
+ TE129MPF
+ I129PF   FROM DECAY    1.0000E+00 TE129MPF
+ CE141PF
+ PR141PF  FROM DECAY    1.0000E+00 CE141PF
+ CE144PF
+ PR143PF
+ ND143PF  FROM DECAY    1.0000E+00 PR143PF
+ ND144PF  FROM NG       1.0000E+00 ND143PF  NG       1.0000E+00 PR143PF
+               DECAY    1.0000E+00 CE144PF
+ ND145PF  FROM NG       1.0000E+00 ND144PF
+ ND146PF  FROM NG       1.0000E+00 ND145PF
+ ND147PF  FROM NG       1.0000E+00 ND146PF
+ ND148PF  FROM NG       1.0000E+00 ND147PF
+ ND150PF
+ PM147PF  FROM DECAY    1.0000E+00 ND147PF
+ PM148PF  FROM NG       5.3000E-01 PM147PF
+ PM148MPF FROM NG       4.7000E-01 PM147PF
+ PM149PF  FROM NG       1.0000E+00 PM148PF  NG       1.0000E+00 ND148PF
+               NG       1.0000E+00 PM148MPF
+ PM151PF  FROM NG       1.0000E+00 ND150PF
+ SM147PF  FROM DECAY    1.0000E+00 PM147PF
+ SM148PF  FROM NG       1.0000E+00 SM147PF  DECAY    1.0000E+00 PM148PF
+               DECAY    1.0000E+00 PM148MPF
+ SM149PF  FROM NG       1.0000E+00 SM148PF  DECAY    1.0000E+00 PM149PF
+ SM150PF  FROM NG       1.0000E+00 SM149PF  NG       1.0000E+00 PM149PF
+ SM151PF  FROM NG       1.0000E+00 SM150PF  DECAY    1.0000E+00 PM151PF
+ SM152PF  FROM NG       1.0000E+00 SM151PF  NG       1.0000E+00 PM151PF
+ SM153PF  FROM NG       1.0000E+00 SM152PF
+ SM154PF  FROM NG       1.0000E+00 SM153PF
+ EU153PF  FROM DECAY    1.0000E+00 SM153PF
+ EU154PF  FROM NG       1.0000E+00 EU153PF
+ EU155PF  FROM NG       1.0000E+00 EU154PF  NG       1.0000E+00 SM154PF
+ EU156PF  FROM NG       1.0000E+00 EU155PF
+ EU157PF  FROM NG       1.0000E+00 EU156PF
+ GD154PF  FROM DECAY    1.0000E+00 EU154PF
+ GD155PF  FROM NG       1.0000E+00 GD154PF  DECAY    1.0000E+00 EU155PF
+ GD156PF  FROM NG       1.0000E+00 GD155PF  DECAY    1.0000E+00 EU156PF
+ GD157PF  FROM NG       1.0000E+00 GD156PF  DECAY    1.0000E+00 EU157PF
+ KR83PF
+ ZR93PF
+ CD113PF
+ IN115PF
+ LA139PF
+ PSU5U
+ PSU8U
+ PSP9U
+ PSP0U
+ PSP1U
+ PSP2U
+ PSA1U
+ PSA2U
+
+ ENDCHAIN ;
+*
+END: ;
diff --git a/Dragon/data/tapollo2_proc/TCA231.c2m b/Dragon/data/tapollo2_proc/TCA231.c2m
new file mode 100644
index 0000000..6ccbe54
--- /dev/null
+++ b/Dragon/data/tapollo2_proc/TCA231.c2m
@@ -0,0 +1,273 @@
+*----
+*
+*  TEST CASE TCA231
+*  SIMPLE 9 X 9 PWR ASSEMBLY WITH SYBIL
+*  CEA93V4 LIBRARY APOLLIB-2 FORMAT
+*  MULTI-PARAMETER COMPO WITH INTERPOLATION
+*
+*  Author: A. Hebert
+*
+*----
+*  Define STRUCTURES and MODULES used
+*----
+REAL POW := 3.016E17 ; (*flux normalization factor in Mev/(s*cm) *)
+REAL evobeg evoend VOL_ASS NORM_FCT1 NORM_FCT2 COTE LAME B2 ;
+INTEGER istep := 1 ;
+REAL step2 step3 step4 step5 step6 := 9.375 18.75 37.5 75.0 500.0 ;
+REAL BoronCont := 600.0E-6 ;
+MODULE GEO: LIB: SYBILT: ASM: FLU: SHI: UTL: EVO: EDI:
+       DELETE: COMPO: BIVACT: GREP: SPH: END: ;
+LINKED_LIST LIBRARY ASSMB TRACK MACRO SYS FLUX EDIT BURNUP CPO
+            CPONEW MACRO2 SPHGEOM MTRACK ;
+INTEGER WATER FUEL1 FUEL2 CLAD := 1 2 3 4 ;
+PROCEDURE assertS ;
+*
+LIBRARY := LIB: ::
+ EDIT 2
+ DEPL LIB: APLIB2 FIL: CEA93V4 CHAIN
+ U234     FROM N2N      1.0000E+00 U235
+ U235     FROM NG       1.0000E+00 U234
+ U236     FROM NG       1.0000E+00 U235
+ U238
+ NP237    FROM NG       1.0000E+00 U236
+ PU238    FROM NG       1.0000E+00 NP237    DECAY    1.0000E+00 CM242
+ PU239    FROM NG       1.0000E+00 PU238
+               DECAY    1.0000E+00 CM243    NG       1.0000E+00 U238
+ PU240    FROM NG       1.0000E+00 PU239    DECAY    1.0000E+00 CM244
+ PU241    FROM NG       1.0000E+00 PU240
+ PU242    FROM NG       1.0000E+00 PU241    NG       1.4160E-01 AM241
+ AM241    FROM DECAY    1.0000E+00 PU241
+ AM242M   FROM NG       1.1500E-01 AM241
+ AM243    FROM NG       1.0000E+00 PU242
+ CM242    FROM NG       7.4340E-01 AM241
+ CM243    FROM NG       1.0000E+00 CM242
+ CM244    FROM NG       1.0000E+00 CM243    NG       1.0000E+00 AM243
+
+ I135PF
+ XE135PF  FROM DECAY    1.0000E+00 I135PF
+ ND143PF
+ ND144PF  FROM NG       1.0000E+00 ND143PF
+ ND145PF  FROM NG       1.0000E+00 ND144PF
+ ND146PF  FROM NG       1.0000E+00 ND145PF
+ ND147PF  FROM NG       1.0000E+00 ND146PF
+ ND148PF  FROM NG       1.0000E+00 ND147PF
+ PM147PF  FROM DECAY    1.0000E+00 ND147PF
+ PM148PF  FROM NG       5.3000E-01 PM147PF
+ PM148MPF FROM NG       4.7000E-01 PM147PF
+ PM149PF  FROM NG       1.0000E+00 PM148PF  NG       1.0000E+00 PM148MPF
+ SM149PF  FROM DECAY    1.0000E+00 PM149PF
+ SM150PF  FROM NG       1.0000E+00 SM149PF
+ SM151PF  FROM NG       1.0000E+00 SM150PF
+ SM152PF  FROM NG       1.0000E+00 SM151PF
+ EU153PF  FROM NG       1.0000E+00 SM152PF
+ EU154PF  FROM NG       1.0000E+00 EU153PF
+ EU155PF  FROM NG       1.0000E+00 EU154PF
+ MO95PF TC99PF RH103PF RH105PF
+ AG109PF XE131PF CS133PF
+ PSU5U PSU8U PSP9U PSP0U PSP1U PSP2U
+ ENDCHAIN
+*
+ ANIS 2
+ NMIX 4    (*MAXIMUM OF 4 MATERIAL MIXTURES*)
+ CTRA APOL
+*
+ MIXS LIB: APLIB2 FIL: CEA93V4
+ MIX <<WATER>> 300.16
+  H2O      = H2O_3_P5 2.3934E-02
+ MIX <<FUEL1>> 579.9
+  U238     = U238_4 2.2089E-02 1 SHIB U238SS_3 IRSET 0.0 38
+  U235     = U235_4 8.6623E-04 1 SHIB U235SS_4 IRSET 0.0 38
+  PU239    = PU239_4 0.0 1 SHIB PU239SS_4 IRSET 0.0 38
+  PU240    = PU240_4 0.0 1 SHIB PU240SS_4 IRSET 0.0 38
+  O16      = O16_6  4.5910E-02
+ MIX <<FUEL2>> COMB <<FUEL1>> 1.0
+ MIX <<CLAD>> 300.16
+  AL27     = AL27_4 3.9222E-02
+     ;
+ASSMB := GEO: :: CAR2D 5 5 (*9 X 9 ASSEMBLY*)
+          X- DIAG X+ REFL
+          Y- SYME Y+ DIAG
+          CELL C1 C3 C2 C3 C4
+                  C3 C3 C3 C4
+                     C2 C3 C4
+                        C3 C4
+                           C5
+          MERGE 1  2  3  2  6
+                   2  2  4  6
+                      5  4  6
+                         4  6
+                            7
+          ::: C1 := GEO: CARCEL 2 (*WATER CELL - NO FUEL*)
+                MESHX 0.0 1.262082
+                MESHY 0.0 1.262082
+                RADIUS 0.0 3.0E-01 4.1266E-01
+                MIX <<WATER>> <<WATER>> <<WATER>>
+          ;
+          ::: C2 := GEO: CARCEL 3 (*POISON CELL*)
+                MESHX 0.0 1.262082
+                MESHY 0.0 1.262082
+                RADIUS 0.0 3.25296E-01 4.60039E-01 5.63430E-01
+                MIX <<CLAD>> <<CLAD>> <<CLAD>> <<WATER>>
+          ;
+          ::: C3 := GEO: C1 (*ORDINARY CELL*)
+                MIX <<FUEL1>> <<FUEL2>> <<WATER>>
+          ;
+          ::: C4 := GEO: C3 (*SURFACE CELL*)
+                MESHX 0.0 1.322082
+                MIX <<FUEL1>> <<FUEL2>> <<WATER>>
+          ;
+          ::: C5 := GEO: C4 (*CORNER CELL*)
+                MESHY 0.0 1.322082
+                MIX <<FUEL1>> <<FUEL2>> <<WATER>>
+          ;
+          ;
+TRACK := SYBILT: ASSMB ::
+     EDIT 1
+     MAXR 40  (*MAXIMUM OF 40 REGIONS*)
+     TITLE 'MULTICELL 9 X 9 PWR BENCHMARK WITH POISON'
+     ;
+*
+CPO := COMPO: ::
+     EDIT 5
+     COMM  'First line of comment'
+           'Second line of comment'
+     ENDC
+     PARA  'BCON' VALU REAL
+     PARA  'FTMP' TEMP LIBRARY <<FUEL1>>
+     PARA  'WTMP' TEMP LIBRARY <<WATER>>
+     PARA  'BURN' IRRA
+     PARA  'FLUB' FLUB
+     PARA  'PUIS' POWR
+     PARA  'XE1'  CONC XE135PF LIBRARY <<FUEL1>>
+     PARA  'XE2'  CONC XE135PF LIBRARY <<FUEL2>>
+
+     LOCA  'burn' IRRA
+     LOCA  'flug' FLUG
+     LOCA  'mass' MASL
+     LOCA  'xe'   CONC XE135PF
+     LOCA  'mtmp' TEMP
+     
+     INIT
+;
+*
+LIBRARY := SHI: LIBRARY TRACK :: EDIT 2 LJ ;
+*
+SYS := ASM: LIBRARY TRACK :: PIJ ECCO ;
+FLUX := FLU: TRACK LIBRARY SYS :: TYPE B B1 ECCO ;
+*
+EVALUATE COTE := 1.262082 ;
+EVALUATE LAME := 1.322082 ;
+EVALUATE VOL_ASS := COTE 7.0 * LAME 2.0 * + ;
+EVALUATE VOL_ASS := VOL_ASS VOL_ASS * ;
+EVALUATE NORM_FCT1 := POW 1.60207E-13 * VOL_ASS / ;
+
+EVALUATE NORM_FCT2 := NORM_FCT1 2.651005 / 1.00115 / ;
+PRINT 'assembly volume=' VOL_ASS 'cm**3  in-fuel power=' NORM_FCT2
+      'MW/tonne=' ;
+PRINT 'normalization power=' NORM_FCT1 'W/CC' ;
+EVALUATE evoend := 0.0 ;
+WHILE evoend step2 NORM_FCT2 / < DO
+
+  EVALUATE evobeg := evoend ;
+  EVALUATE evoend := step2 NORM_FCT2 / ;
+  PRINT 'Burnup step' istep 'between' evobeg 'and' evoend 'day:' ;
+  IF istep 1 = THEN
+    BURNUP LIBRARY := EVO: LIBRARY FLUX TRACK :: EDIT 3 RUNG
+         DEPL <<evobeg>> <<evoend>> DAY W/CC <<NORM_FCT1>>
+         EPS2 100.0 EXPM 1.0 RUNG SAT NODI ;
+  ELSE
+    BURNUP LIBRARY := EVO: BURNUP LIBRARY FLUX TRACK :: EDIT 2
+         DEPL <<evobeg>> <<evoend>> DAY W/CC <<NORM_FCT1>>
+         EPS2 100.0 EXPM 1.0E15 RUNG EXTR NSAT NODI ;
+  ENDIF ;
+
+  PRINT 'Self-shielding calculation' istep 'at' evoend 'DAY:' ;
+  LIBRARY := SHI: LIBRARY TRACK :: EDIT 2 LJ ;
+  SYS := DELETE: SYS ;
+  SYS := ASM: LIBRARY TRACK :: PIJ ECCO ;
+  FLUX := FLU: FLUX TRACK LIBRARY SYS :: TYPE B B1 ECCO ;
+  IF istep 3 = THEN
+     GREP: FLUX :: GETVAL "B2  B1HOM" 1 >>B2<< ;
+  ENDIF ;
+  PRINT 'step2=' step2 'evoend=' evoend ;
+
+  PRINT 'Edition at' evoend 'DAY  burnup=' 
+          step2 'MWday/tonne=' ;
+
+  EDIT := EDI: FLUX LIBRARY TRACK ASSMB :: EDIT 1
+*    EDITION FOR HETEROGENEOUS DIFFUSION CALCULATIONS
+*    CELL-BY-CELL HOMOGENIZATION OF THE ASSEMBLY
+     SAVE COND 74 99 MERG CELL
+     MICR 9 U235 U238 PU239 PU240 PU241 PU242 AM241 AM242M XE135PF
+     SAVE ON 'EDITCDAT   1'
+     ;
+  SPHGEOM := EDIT :: STEP UP 'MACRO-GEOM' ;
+  MTRACK := BIVACT: SPHGEOM :: DUAL (*IELEM=*) 1 (*ICOL=*) 2 ;
+  EDIT := SPH: EDIT MTRACK ;
+  SPHGEOM MTRACK := DELETE: SPHGEOM MTRACK ;
+*
+  BURNUP LIBRARY := EVO: BURNUP LIBRARY FLUX TRACK :: EDIT 2
+                       SAVE <<evoend>> DAY W/CC <<NORM_FCT1>> ;
+
+  CPO := COMPO: CPO EDIT BURNUP FLUX LIBRARY ::
+      EDIT 3
+      SET <<evoend>> DAY
+      BCON <<BoronCont>>
+      ;
+  EDIT := DELETE: EDIT ;
+
+  EVALUATE step2 step3 step4 step5 step6 := step3 step4 step5 step6
+  step2 ;
+
+  EVALUATE istep := istep 1 + ;
+
+ENDWHILE ;
+assertS FLUX :: K-INFINITY 1 1.346755 ;
+*
+* CONCATENATION
+*
+CPONEW := COMPO: ::
+     EDIT 5
+     COMM  'First line of comment(new)'
+           'Second line of comment'
+     ENDC
+     PARA  'BCON' VALU REAL
+     PARA  'FTMP' TEMP LIBRARY <<FUEL1>>
+     PARA  'WTMP' TEMP LIBRARY <<WATER>>
+     PARA  'BURN' IRRA
+     PARA  'FLUB' FLUB
+     PARA  'PUIS' POWR
+     PARA  'CELL' VALU CHAR
+     PARA  'XE1'  CONC XE135PF LIBRARY <<FUEL1>>
+     PARA  'XE2'  CONC XE135PF LIBRARY <<FUEL2>>
+
+     LOCA  'burn' IRRA
+     LOCA  'flug' FLUG
+     LOCA  'mass' MASL
+     LOCA  'xe'   CONC XE135PF
+     LOCA  'mtmp' TEMP
+
+     INIT
+;
+
+CPONEW := COMPO: CPONEW CPO :: CELL '2D' ;
+CPO := DELETE: CPO ;
+*
+* MULTICOMPO ACCESS
+MACRO2 := SPH: CPONEW ::
+   EDIT 1
+   STEP UP default STEP AT 3
+   MACRO LEAK <<B2>> OFF
+   ;
+UTL: MACRO2 :: DIR ;
+*
+* VERIFICATION CALCULATION AT THIRD BURNUP
+ASSMB TRACK SYS FLUX := DELETE: ASSMB TRACK SYS FLUX ;
+ASSMB := CPONEW :: STEP UP default STEP UP 'GEOMETRIES' STEP AT 1 ;
+TRACK := BIVACT: ASSMB :: DUAL (*IELEM=*) 1 (*ICOL=*) 2 ;
+SYS := ASM: MACRO2 TRACK :: ARM ;
+FLUX := FLU: MACRO2 TRACK SYS :: TYPE K ;
+assertS FLUX :: K-EFFECTIVE 1 1.0 ;
+ECHO "test TCA231 completed" ;
+*
+END: ;
diff --git a/Dragon/data/tapollo2_proc/TCA232.c2m b/Dragon/data/tapollo2_proc/TCA232.c2m
new file mode 100644
index 0000000..2b7e9ee
--- /dev/null
+++ b/Dragon/data/tapollo2_proc/TCA232.c2m
@@ -0,0 +1,69 @@
+*----
+*
+*  TEST CASE TCA232
+*  FIRST MOX ROWLAND'S BENCHMARK
+*  DISTRIBUTED SELF-SHIELDING
+*  99-GROUP APOLIB-2
+*
+*  Author: A. Hebert
+*
+*----
+*  Define STRUCTURES and MODULES used
+*----
+LINKED_LIST LIBRARY LIBRARY2 C3 TRACK1 TRACK2 MACRO SYS FLUX ;
+MODULE GEO: SYBILT: USS: LIB: ASM: FLU: UTL: END: ;
+INTEGER COMB0101 COMB0102 COMB0103 COMB0104 COMB0105 COMB0106 GAIN1
+        MODE1 MODE2 := 
+        1 2 3 4 5 6 7 8 9 ; (* DISTRIBUTED SELF-SHIELDING *)
+REAL RCOMB1 RCOMB2 RCOMB3 RCOMB4 RCOMB5 RCOMB6 ;
+PROCEDURE assertS ;
+*
+LIBRARY := LIB: ::
+ EDIT 3
+ NMIX 9    (*MAXIMUM OF MATERIAL MIXTURES*)
+ CTRA APOL (*APOLLO TYPE TRANSPORT CORRECTION*)
+ ANIS 2
+ SUBG      (*COMPUTE SUBGROUPS*)
+*
+ MIXS LIB: APLIB2 FIL: CEA93V4
+ MIX <<COMB0101>> 500.0 (*COMB0101*)
+    U235     = U235_4  5.105E-5 1 SHIB U235SS_4  IRSET 0.0 44
+    U238     = U238_4  2.037E-2 1 SHIB U238SS_3  IRSET 0.0 44
+    PU238    = PU238_4 4.669E-5 1 SHIB PU238SS_4 IRSET 0.0 44
+    PU239    = PU239_4 1.465E-3 1 SHIB PU239SS_4 IRSET 0.0 44
+    PU240    = PU240_4 5.691E-4 SHIB PU240SS_4
+    PU241    = PU241_4 2.713E-4 1 SHIB PU241SS_3 IRSET 0.0 44
+    PU242    = PU242_3 1.413E-4 1 SHIB PU242SS_3 IRSET 0.0 44
+    AM241    = AM241_1 3.028E-5 1 SHIB AM241SS_1 IRSET 0.0 44
+    O16      = O16_6   4.588E-2
+ MIX <<COMB0102>> COMB <<COMB0101>> 1.0 (*COMB0102*)
+ MIX <<COMB0103>> COMB <<COMB0101>> 1.0 (*COMB0103*)
+ MIX <<COMB0104>> COMB <<COMB0101>> 1.0 (*COMB0104*)
+ MIX <<COMB0105>> COMB <<COMB0101>> 1.0 (*COMB0105*)
+ MIX <<COMB0106>> COMB <<COMB0101>> 1.0 (*COMB0106*)
+ MIX <<GAIN1>> 300.0 (*GAIN1*)
+    ZR      = ZR_4  3.88E-2 2 SHIB ZRSS_4 IRSET 0.0 44
+ MIX <<MODE1>> 300.0 (*MODE1*)
+    H2O     = H2O_3_P5 2.372E-2
+ MIX <<MODE2>> 300.0 (*MODE2*)
+    H2O     = H2O_3_P5 2.372E-2
+ ;
+EVALUATE RCOMB1 RCOMB2 RCOMB3 RCOMB4 RCOMB5 RCOMB6 := 0.259307 
+0.343031 0.366715 0.388960 0.3996186 0.41 ;
+C3 := GEO: :: TUBE 9
+      R+ REFL
+      RADIUS 0.0 <<RCOMB1>> <<RCOMB2>> <<RCOMB3>> <<RCOMB4>>
+                 <<RCOMB5>> <<RCOMB6>> 0.475 0.6045552 0.710879
+      MIX <<COMB0101>> <<COMB0102>> <<COMB0103>> <<COMB0104>>
+          <<COMB0105>> <<COMB0106>> <<GAIN1>> <<MODE1>> <<MODE2>>
+          ;
+TRACK2 := SYBILT: C3 ::
+     EDIT 1
+     MAXR 20
+     QUA1 5 TITLE 'FIRST MOX ROWLAND S BENCHMARK' ;
+LIBRARY2 := USS: LIBRARY TRACK2 :: EDIT 1 TRAN PASS 2 ;
+SYS := ASM: LIBRARY2 TRACK2 :: PIJ ;
+FLUX := FLU: SYS LIBRARY2 TRACK2 :: TYPE K ;
+assertS FLUX :: K-EFFECTIVE 1 1.194064 ;
+ECHO "test TCA232 completed" ;
+END: ;
diff --git a/Dragon/data/tapollo2_proc/TCA233.c2m b/Dragon/data/tapollo2_proc/TCA233.c2m
new file mode 100644
index 0000000..144dcea
--- /dev/null
+++ b/Dragon/data/tapollo2_proc/TCA233.c2m
@@ -0,0 +1,132 @@
+*----
+*
+*  TEST CASE TCA233
+*  9 X 9 PWR ASSEMBLY WITH NXT
+*  99-GROUP APOLIB-2
+*
+*  Author: A. Hebert
+*
+*----
+*  Define STRUCTURES and MODULES used
+*----
+LINKED_LIST LIBRARY ASSMB TRACK SYS FLUX EDIT SPHGEOM MTRACK ;
+MODULE GEO: NXT: BIVACT: MAC: LIB: ASM: FLU: EDI: SPH: DELETE:
+       END: ;
+SEQ_BINARY TRACK_FIL ;
+PROCEDURE assertS ;
+*
+LIBRARY := LIB: ::
+     EDIT 2
+     ANIS 2
+     NMIX 3    (*MAXIMUM OF 3 MATERIAL MIXTURES*)
+*
+ MIXS LIB: APLIB2 FIL: CEA93V4
+ MIX 1 300.16
+  H2O      = H2O_3_P5 2.3934E-02
+ MIX 2 579.9
+  U238     = U238_4 2.2089E-02 1 SHIB U238SS_3 IRSET 0.0 38
+  U235     = U235_4 8.6623E-04 1 SHIB U235SS_4 IRSET 0.0 38
+  O16      = O16_6  4.5910E-02
+ MIX 3 300.16
+  AL27     = AL27_4 3.9222E-02
+     ;
+ASSMB := GEO: :: CAR2D 5 5 (*ASSEMBLAGE 9 X 9*)
+          X- DIAG X+ REFL
+          Y- SYME Y+ DIAG
+          CELL C1 C3 C2 C3 C4
+                  C3 C3 C3 C4
+                     C2 C3 C4
+                        C3 C4
+                           C5
+*          MERGE 1  2  3  4  5
+*                   6  7  8  9
+*                     10 11  9
+*                        12  9
+*                           13
+          ::: C1 := GEO: CARCEL 1 (*CELLULE SANS COMBUSTIBLE*)
+                MESHX 0.0 1.262082
+                MESHY 0.0 1.262082
+                RADIUS 0.0 4.12660E-01
+                MIX 1 1
+          ;
+          ::: C2 := GEO: CARCEL 3 (*CELLULE EMPOISONNEE*)
+                MESHX 0.0 1.262082
+                MESHY 0.0 1.262082
+                RADIUS 0.0 3.25296E-01 4.60039E-01 5.63430E-01
+                MIX 3 3 3 1
+          ;
+          ::: C3 := GEO: CARCEL 1 (*CELLULE NORMALE*)
+                MESHX 0.0 1.262082
+                MESHY 0.0 1.262082
+                RADIUS 0.0 4.12660E-01
+                MIX 2 1
+          ;
+          ::: C4 := GEO: C3 (*CELLULE PERIPHERIQUE*)
+                MESHX 0.0 1.322082
+                MIX 2 1
+          ;
+          ::: C5 := GEO: C4 (*CELLULE DE COIN*)
+                MESHY 0.0 1.322082
+                MIX 2 1
+          ;
+          ;
+TRACK TRACK_FIL := NXT: ASSMB ::
+     EDIT 1
+     TITLE 'MULTICELL 9 X 9 PWR BENCHMARK WITH POISON'
+     TISO 12 12.0 ;
+*
+SYS := ASM: LIBRARY TRACK TRACK_FIL :: PIJ PNOR HELI ;
+*
+FLUX := FLU: LIBRARY TRACK SYS ::
+  EDIT 2 TYPE K B0 SIGS BUCK 0.0 ;
+assertS FLUX :: 'K-EFFECTIVE' 1 1.065848 ;
+*
+*---
+* MACRO-GEOMETRY TRACKING IN BIVAC
+*---
+SPHGEOM := GEO: :: CAR2D 5 5 (*ASSEMBLAGE 9 X 9*)
+        X- DIAG X+ REFL
+        Y- SYME Y+ DIAG
+        MESHX 0.0 1.26208198 2.52416396 3.78624582 5.04832792 6.37040997
+        MESHY 0.0 1.26208198 2.52416396 3.78624582 5.04832792 6.37040997
+        MIX 1  2  3  4  5
+               6  7  8  9
+                 10 11 12
+                    13 14
+                       15
+;
+MTRACK := BIVACT: SPHGEOM :: DUAL (*IELEM=*) 2 (*ICOL=*) 2 ;
+
+EDIT := EDI: FLUX LIBRARY TRACK ASSMB :: EDIT 3
+*    EDITION FOR HETEROGENEOUS DIFFUSION CALCULATIONS
+*    CELL-BY-CELL HOMOGENIZATION OF THE ASSEMBLY
+     EDIT 3 SAVE COND 74 99 MERG CELL
+     ;
+EDIT := SPH: EDIT MTRACK ;
+*
+TRACK TRACK_FIL SYS FLUX EDIT := DELETE: TRACK TRACK_FIL SYS FLUX EDIT ;
+*---
+* IN-LINE TRACKING WITH NXT
+*---
+TRACK := NXT: ASSMB ::
+     EDIT 1
+     TITLE 'MULTICELL 9 X 9 PWR BENCHMARK WITH POISON'
+     TISO 12 12.0 ;
+*
+SYS := ASM: LIBRARY TRACK :: PIJ PNOR HELI ;
+*
+FLUX := FLU: LIBRARY TRACK SYS ::
+  EDIT 2 TYPE K B0 SIGS BUCK 0.0 ;
+assertS FLUX :: 'K-EFFECTIVE' 1 1.065848 ;
+*
+EDIT := EDI: FLUX LIBRARY TRACK ASSMB :: EDIT 3
+*    EDITION FOR HETEROGENEOUS DIFFUSION CALCULATIONS
+*    CELL-BY-CELL HOMOGENIZATION OF THE ASSEMBLY
+     EDIT 3 SAVE COND 74 99 MERG CELL
+     ;
+EDIT := SPH: EDIT MTRACK ;
+SPHGEOM MTRACK := DELETE: SPHGEOM MTRACK ;
+
+ECHO "test TCA233 completed" ;
+END: ;
+QUIT "LIST" .
diff --git a/Dragon/data/tapollo2_proc/TCA234.c2m b/Dragon/data/tapollo2_proc/TCA234.c2m
new file mode 100644
index 0000000..67b0618
--- /dev/null
+++ b/Dragon/data/tapollo2_proc/TCA234.c2m
@@ -0,0 +1,293 @@
+*----
+*
+*  TEST CASE TCA234
+*  SIMPLE 5 X 5 PWR ASSEMBLY WITH SYBIL
+*  CEA93V4 LIBRARY APOLIB-2 FORMAT
+*  MULTI-PARAMETER SAPHYB GENERATION
+*
+*  Author: A. Hebert
+*
+*----
+*  Define STRUCTURES and MODULES used
+*----
+REAL POW := 2.7236364E16 ;
+REAL COTE := 1.26518 ;
+REAL evobeg evoend VOL_ASS NORM_FCT1 NORM_FCT2 ;
+REAL step2 step3 step4 step5 := 9.375 18.75 37.5 75.0 ;
+REAL BoronCont := 600.0E-6 ;
+INTEGER istep ;
+LINKED_LIST LIBRARY LIBRARY2 ASSMB TRACK SYS FLUX BURNUP EDIT SAPOBJ
+            SAPMIL SPHGEOM MTRACK ;
+MODULE LIB: GEO: SYBILT: USS: ASM: FLU: EDI: DELETE: EVO: SAP: SPH:
+END: ;
+PROCEDURE assertS ;
+*
+LIBRARY := LIB: ::
+ EDIT 2
+ DEPL LIB: APLIB2 FIL: CEA93V4 CHAIN
+ U234     FROM N2N      1.0000E+00 U235
+ U235     FROM NG       1.0000E+00 U234
+ U236     FROM NG       1.0000E+00 U235
+ U238
+ NP237    FROM NG       1.0000E+00 U236
+ PU238    FROM NG       1.0000E+00 NP237    DECAY    1.0000E+00 CM242
+ PU239    FROM NG       1.0000E+00 PU238
+               DECAY    1.0000E+00 CM243    NG       1.0000E+00 U238
+ PU240    FROM NG       1.0000E+00 PU239    DECAY    1.0000E+00 CM244
+ PU241    FROM NG       1.0000E+00 PU240
+ PU242    FROM NG       1.0000E+00 PU241    NG       1.4160E-01 AM241
+ AM241    FROM DECAY    1.0000E+00 PU241
+ AM242M   FROM NG       1.1500E-01 AM241
+ AM243    FROM NG       1.0000E+00 PU242
+ CM242    FROM NG       7.4340E-01 AM241
+ CM243    FROM NG       1.0000E+00 CM242
+ CM244    FROM NG       1.0000E+00 CM243    NG       1.0000E+00 AM243
+
+ I135PF
+ XE135PF  FROM DECAY    1.0000E+00 I135PF
+ ND143PF
+ ND144PF  FROM NG       1.0000E+00 ND143PF
+ ND145PF  FROM NG       1.0000E+00 ND144PF
+ ND146PF  FROM NG       1.0000E+00 ND145PF
+ ND147PF  FROM NG       1.0000E+00 ND146PF
+ ND148PF  FROM NG       1.0000E+00 ND147PF
+ PM147PF  FROM DECAY    1.0000E+00 ND147PF
+ PM148PF  FROM NG       5.3000E-01 PM147PF
+ PM148MPF FROM NG       4.7000E-01 PM147PF
+ PM149PF  FROM NG       1.0000E+00 PM148PF  NG       1.0000E+00 PM148MPF
+ SM149PF  FROM DECAY    1.0000E+00 PM149PF
+ SM150PF  FROM NG       1.0000E+00 SM149PF
+ SM151PF  FROM NG       1.0000E+00 SM150PF
+ SM152PF  FROM NG       1.0000E+00 SM151PF
+ EU153PF  FROM NG       1.0000E+00 SM152PF
+ EU154PF  FROM NG       1.0000E+00 EU153PF
+ EU155PF  FROM NG       1.0000E+00 EU154PF
+ MO95PF TC99PF RH103PF RH105PF
+ AG109PF XE131PF CS133PF
+ PSU5U PSU8U PSP9U PSP0U PSP1U PSP2U
+ ENDCHAIN
+*
+ NMIX 10   (*MAXIMUM OF MATERIAL MIXTURES*)
+ CTRA APOL (*APOLLO TYPE TRANSPORT CORRECTION*)
+ SUBG      (*COMPUTE PHYSICAL PROBABILITY TABLES*)
+*
+ MIXS LIB: APLIB2 FIL: CEA93V4
+ MIX 1 579.16 (*Water*)
+  H2O      = H2O_3_P5 2.3840E-02
+  B10      = B10_3    4.7664E-06
+  B11      = B11_3    1.9065E-05
+ MIX 2 579.16 (*Tube*)
+  FE54     = FE54_3 8.5594E-06
+  FE56     = FE56_4 1.3536E-04
+  FE57     = FE57_3 3.2467E-06
+  FE58     = FE58_3 4.1321E-07
+  CR50     = CR50_3 3.2834E-06
+  CR52     = CR52_3 6.3244E-05
+  CR53     = CR53_3 7.1706E-06
+  CR54     = CR54_3 1.7813E-06
+  O16      = O16_6  3.0671E-04
+  ZR       = ZR_4   4.2211E-02 2 SHIB ZRSS_4
+ MIX 3 579.16 (*TubeMode*)
+  H2O      = H2O_3_P5 2.2796E-02
+  B10      = B10_3    4.5913E-06
+  B11      = B11_3    1.8365E-05
+  FE54     = FE54_3   1.1921E-04
+  FE56     = FE56_4   1.8852E-03
+  FE57     = FE57_3   4.5218E-05
+  FE58     = FE58_3   5.7550E-06
+  NI58     = NI58_3   5.4208E-04
+  NI60     = NI60_3   2.0724E-04
+  NI61     = NI61_3   8.9725E-06
+  NI62     = NI62_3   2.8506E-05
+  NI64     = NI64_3   7.2256E-06
+  CR50     = CR50_3   3.1782E-05
+  CR52     = CR52_3   6.1219E-04
+  CR53     = CR53_3   6.9409E-05
+  CR54     = CR54_3   1.7243E-05
+  MN55     = MN55_3   2.8729E-05
+  SI       = SI_3     2.4816E-05
+  AL27     = AL27_4   1.1264E-05
+  MO95     = MO95_4   1.9533E-05
+  TI       = TI_2     1.1174E-05
+  CO59     = CO59_2   5.1569E-07
+  NB93     = NB93_2   3.3858E-05
+ MIX 4 923.16 (*FuelMed*)
+  U238     = U238_4 2.1779E-02 1 SHIB U238SS_3 IRSET 0.0 38
+  U236     = U236_2 4.3339E-06 1 SHIB U236SS_3 IRSET 0.0 38
+  U235     = U235_4 7.0598E-04 1 SHIB U235SS_4 IRSET 0.0 38
+  U234     = U234_2 5.4335E-06
+  O16      = O16_6  4.4990E-02
+ MIX 5 608.16 (*CladMed*)
+  FE54     = FE54_3 7.7670E-06
+  FE56     = FE56_4 1.2283E-04
+  FE57     = FE57_3 2.9461E-06
+  FE58     = FE58_3 3.7496E-07
+  CR50     = CR50_3 2.9794E-06
+  CR52     = CR52_3 5.7389E-05
+  CR53     = CR53_3 6.5067E-06
+  CR54     = CR54_3 1.6164E-06
+  O16      = O16_6  2.7831E-04
+  ZR       = ZR_4   3.8303E-02 3 SHIB ZRSS_4
+ MIX 6 579.16 (*WaterMed*)
+  H2O      = H2O_3_P5 2.3700E-02
+  B10      = B10_3    4.7543E-06
+  B11      = B11_3    1.9017E-05
+  FE54     = FE54_3   5.4285E-06
+  FE56     = FE56_4   8.5845E-05
+  FE57     = FE57_3   2.0591E-06
+  FE58     = FE58_3   2.6206E-07
+  NI58     = NI58_3   1.7511E-04
+  NI60     = NI60_3   6.6944E-05
+  NI61     = NI61_3   2.8983E-06
+  NI62     = NI62_3   9.2080E-06
+  NI64     = NI64_3   2.3341E-06
+  CR50     = CR50_3   4.5576E-06
+  CR52     = CR52_3   8.7790E-05
+  CR53     = CR53_3   9.9535E-06
+  CR54     = CR54_3   2.4726E-06
+  MN55     = MN55_3   9.3942E-07
+  SI       = SI_3     1.8376E-06
+  AL27     = AL27_4   5.3133E-06
+  MO95     = MO95_4   9.2140E-06
+  TI       = TI_2     5.2710E-06
+  CO59     = CO59_2   2.4326E-07
+  NB93     = NB93_2   1.5971E-05
+ MIX 7 COMB 4 1.0 (*COMB02*)
+ MIX 8 COMB 4 1.0 (*COMB03*)
+ MIX 9 COMB 4 1.0 (*COMB04*)
+ MIX 10 COMB 4 1.0 (*COMB05*)
+;
+ASSMB := GEO: :: CAR2D 3 3 (*ASSEMBLAGE 5 X 5*)
+          X- DIAG X+ REFL
+          Y- SYME Y+ DIAG
+          MIX C1 C2 C4
+                 C3 C5
+                    C6
+          ::: C1 := GEO: CARCEL 2 (*CELLULE SANS COMBUSTIBLE*)
+                MESHX 0.0 <<COTE>>
+                MESHY 0.0 <<COTE>>
+                RADIUS 0.0 5.72460E-01 6.13180E-01
+                MIX 1 2 3
+          ;
+          ::: C2 := GEO: C1 (*CELLULE AVEC COMBUSTIBLE*)
+                RADIUS 0.0 4.12360E-01 4.75880E-01
+                MIX 4 5 6
+          ;
+          ::: C3 := GEO: C2 (*CELLULE AVEC COMBUSTIBLE*)
+                MIX 8 5 6
+          ;
+          ::: C4 := GEO: C2 (*CELLULE AVEC COMBUSTIBLE*)
+                MIX 7 5 6
+          ;
+          ::: C5 := GEO: C2 (*CELLULE AVEC COMBUSTIBLE*)
+                MIX 9 5 6
+          ;
+          ::: C6 := GEO: C2 (*CELLULE AVEC COMBUSTIBLE*)
+                MIX 10 5 6
+          ;
+;
+TRACK := SYBILT: ASSMB ::
+     EDIT 1
+     MAXR 40  (*MAXIMUM OF 40 REGIONS*)
+     MAXZ 100000
+     TITLE 'SMALL SAPHYB CONSTRUCTION'
+     QUA2 6 6
+     DP00 ;
+*
+SAPOBJ := SAP: LIBRARY ::
+     EDIT 5
+     COMM  'First line of comment'
+           'Second line of comment'
+     ENDC
+     NOML  'Test saphyb library'
+     PARA  'boron conc.'      'BCON' VALE FLOT
+     PARA  'fuel temp.'       'FTMP' TEMP LIBRARY2 4
+     PARA  'water temp.'      'WTMP' TEMP LIBRARY2 6
+     PARA  'fuel burnup'      'BURN' IRRA
+     PARA  'global fluence'   'FLUB' FLUB
+     PARA  'global power'     'PUIS' PUIS
+     PARA  'Xe concentration' 'XE'   CONC XE135PF LIBRARY2 4
+     ISOT  FISS I135PF XE135PF PM149PF SM149PF
+     MACR  'residual' REST
+     REAC  TOTA ABSO SNNN FISS CHI NUFI ENER FUIT DIFF SELF PROF TRAN
+     LOCA  'fuel burnup'      'BURN' IRRA
+     LOCA  'local fluence'    'FLUB' FLUB
+     LOCA  'heavy isot'       'MASS' MASL
+     LOCA  'Xe concentration' 'XE'   CONC XE135PF
+     LOCA  'sph factors'      'SPH'  EQUI
+     LOCA  'temperature'      'MTMP' TEMP
+     NAME  ECell11 ECell21 ECell31 ECell22 ECell32 ECell33
+;
+*
+LIBRARY2 := USS: LIBRARY TRACK :: EDIT 2 ;
+*
+SYS := ASM: LIBRARY2 TRACK :: PIJ ;
+FLUX := FLU: LIBRARY2 TRACK SYS :: TYPE B B1 SIGS ;
+
+EVALUATE VOL_ASS := COTE 5.0 * ;
+EVALUATE VOL_ASS := VOL_ASS VOL_ASS * ;
+EVALUATE NORM_FCT1 := POW 1.60207E-13 * VOL_ASS / ;
+
+EVALUATE NORM_FCT2 := NORM_FCT1 2.8473 / 1.00336 / ;
+PRINT 'volume_assemblage=' VOL_ASS 'cm**3  in-fuel power=' NORM_FCT2
+      'MW/tonne=' ;
+PRINT 'normalization power=' NORM_FCT1 'W/CC' ;
+EVALUATE evoend := 0.0 ;
+EVALUATE istep := 1 ;
+WHILE evoend step2 NORM_FCT2 / < DO
+
+  EVALUATE evobeg := evoend ;
+  EVALUATE evoend := step2 NORM_FCT2 / ;
+  PRINT 'Burnup step' istep 'between' evobeg 'and' evoend 'day:' ;
+  IF istep 1 = THEN
+    BURNUP LIBRARY2 := EVO: LIBRARY2 TRACK FLUX :: EDIT 3 RUNG
+         DEPL <<evobeg>> <<evoend>> DAY W/CC <<NORM_FCT1>>
+         RUNG EPS2 100.0 EXPM 1.0E15 ;
+  ELSE
+    BURNUP LIBRARY2 := EVO: BURNUP LIBRARY2 TRACK FLUX :: EDIT 2
+      DEPL <<evobeg>> <<evoend>> DAY W/CC <<NORM_FCT1>>
+      RUNG EXTR EPS2 100.0 EXPM 1.0E15 ;
+  ENDIF ;
+
+  SYS := DELETE: SYS ;
+  SYS := ASM: LIBRARY2 TRACK :: PIJ ;
+  FLUX := FLU: FLUX LIBRARY2 TRACK SYS :: TYPE B B1 SIGS ;
+
+  PRINT 'Edition at' evoend 'DAY  burnup=' step2 'MWday/tonne=' ;
+
+    EDIT := EDI: LIBRARY2 TRACK FLUX ASSMB :: EDIT 3
+      COND 12 24 50 75 87 99
+      MERGE CELL SYBIL
+      MICR ALL
+      SAVE ON 'EDITCDAT   1'
+      ;
+    SPHGEOM := EDIT :: STEP UP 'MACRO-GEOM' ;
+    MTRACK := SYBILT: SPHGEOM ;
+    EDIT := SPH: EDIT MTRACK ;
+    SPHGEOM MTRACK := DELETE: SPHGEOM MTRACK ;
+
+    BURNUP LIBRARY2 := EVO: BURNUP LIBRARY2 TRACK FLUX :: EDIT 2
+                       SAVE <<evoend>> DAY W/CC <<NORM_FCT1>> ;
+
+    SAPOBJ := SAP: SAPOBJ EDIT BURNUP LIBRARY2 FLUX ::
+      EDIT 3
+      SET <<evoend>> DAY
+      BCON <<BoronCont>>
+      ;
+
+    EDIT := DELETE: EDIT ;
+
+  EVALUATE step2 step3 step4 step5 := step3 step4 step5 step2 ;
+
+  EVALUATE istep := istep 1 + ;
+
+ENDWHILE ;
+
+BURNUP LIBRARY2 := EVO: BURNUP LIBRARY2 TRACK FLUX :: EDIT 2
+        SAVE <<evoend>> DAY W/CC <<NORM_FCT1>> ;
+
+assertS FLUX :: K-INFINITY 1 1.197001 ;
+SAPMIL := SAPOBJ :: STEP UP 'calc       3' STEP UP 'mili       4' ;
+assertS SAPMIL :: RDATAX 4 9.442280 ;
+
+END: ;
diff --git a/Dragon/data/tapollo2_proc/TCA235.c2m b/Dragon/data/tapollo2_proc/TCA235.c2m
new file mode 100644
index 0000000..dc4c6ae
--- /dev/null
+++ b/Dragon/data/tapollo2_proc/TCA235.c2m
@@ -0,0 +1,322 @@
+*----
+*
+*  TEST CASE TCA235
+*  SIMPLE 5 X 5 PWR ASSEMBLY WITH SYBIL
+*  CEA93V4 LIBRARY APOLIB-2 FORMAT
+*  MULTI-PARAMETER SAPHYB GENERATION FOR COCAGNE
+*
+*  Author: A. Hebert
+*
+*----
+*  Define STRUCTURES and MODULES used
+*----
+PARAMETER  SAPOBJ :: ::: XSM_FILE SAPOBJ ; ;
+REAL POW := 2.7236364E16 ;
+REAL COTE := 1.26518 ;
+REAL LAME := 1.31518 ;
+REAL evobeg evoend VOL_ASS NORM_FCT1 NORM_FCT2 ;
+REAL step2 step3 step4 step5 := 9.375 18.75 37.5 75.0 ;
+REAL BoronCont := 600.0E-6 ;
+INTEGER istep ;
+LINKED_LIST LIBRARY LIBRARY2 ASSMB TRACK SYS FLUX BURNUP EDIT SAPMIL
+            SPHGEOM MTRACK MACROLIB FLUX1 ;
+MODULE LIB: GEO: SYBILT: BIVACT: USS: ASM: FLU: EDI: DELETE: EVO: SAP:
+       SPH: UTL: MODUL1: END: ;
+PROCEDURE assertS ;
+*
+LIBRARY := LIB: ::
+ EDIT 3
+ DEPL LIB: APLIB2 FIL: CEA93V4 CHAIN
+ U234     FROM N2N      1.0000E+00 U235
+ U235     FROM NG       1.0000E+00 U234
+ U236     FROM NG       1.0000E+00 U235
+ U238
+ NP237    FROM NG       1.0000E+00 U236
+ PU238    FROM NG       1.0000E+00 NP237    DECAY    1.0000E+00 CM242
+ PU239    FROM NG       1.0000E+00 PU238
+               DECAY    1.0000E+00 CM243    NG       1.0000E+00 U238
+ PU240    FROM NG       1.0000E+00 PU239    DECAY    1.0000E+00 CM244
+ PU241    FROM NG       1.0000E+00 PU240
+ PU242    FROM NG       1.0000E+00 PU241    NG       1.4160E-01 AM241
+ AM241    FROM DECAY    1.0000E+00 PU241
+ AM242M   FROM NG       1.1500E-01 AM241
+ AM243    FROM NG       1.0000E+00 PU242
+ CM242    FROM NG       7.4340E-01 AM241
+ CM243    FROM NG       1.0000E+00 CM242
+ CM244    FROM NG       1.0000E+00 CM243    NG       1.0000E+00 AM243
+
+ I135PF
+ XE135PF  FROM DECAY    1.0000E+00 I135PF
+ ND143PF
+ ND144PF  FROM NG       1.0000E+00 ND143PF
+ ND145PF  FROM NG       1.0000E+00 ND144PF
+ ND146PF  FROM NG       1.0000E+00 ND145PF
+ ND147PF  FROM NG       1.0000E+00 ND146PF
+ ND148PF  FROM NG       1.0000E+00 ND147PF
+ PM147PF  FROM DECAY    1.0000E+00 ND147PF
+ PM148PF  FROM NG       5.3000E-01 PM147PF
+ PM148MPF FROM NG       4.7000E-01 PM147PF
+ PM149PF  FROM NG       1.0000E+00 PM148PF  NG       1.0000E+00 PM148MPF
+ SM149PF  FROM DECAY    1.0000E+00 PM149PF
+ SM150PF  FROM NG       1.0000E+00 SM149PF
+ SM151PF  FROM NG       1.0000E+00 SM150PF
+ SM152PF  FROM NG       1.0000E+00 SM151PF
+ EU153PF  FROM NG       1.0000E+00 SM152PF
+ EU154PF  FROM NG       1.0000E+00 EU153PF
+ EU155PF  FROM NG       1.0000E+00 EU154PF
+ MO95PF TC99PF RH103PF RH105PF
+ AG109PF XE131PF CS133PF
+ PSU5U PSU8U PSP9U PSP0U PSP1U PSP2U
+ ENDCHAIN
+*
+ NMIX 10   (*MAXIMUM OF MATERIAL MIXTURES*)
+ CTRA APOL (*APOLLO TYPE TRANSPORT CORRECTION*)
+ SUBG      (*COMPUTE PHYSICAL PROBABILITY TABLES*)
+*
+ MIXS LIB: APLIB2 FIL: CEA93V4
+ MIX 1 579.16 (*Water*)
+  H2O      = H2O_3_P5 2.3840E-02
+  B10      = B10_3    4.7664E-06
+  B11      = B11_3    1.9065E-05
+ MIX 2 579.16 (*Tube*)
+  FE54     = FE54_3 8.5594E-06
+  FE56     = FE56_4 1.3536E-04
+  FE57     = FE57_3 3.2467E-06
+  FE58     = FE58_3 4.1321E-07
+  CR50     = CR50_3 3.2834E-06
+  CR52     = CR52_3 6.3244E-05
+  CR53     = CR53_3 7.1706E-06
+  CR54     = CR54_3 1.7813E-06
+  O16      = O16_6  3.0671E-04
+  ZR       = ZR_4   4.2211E-02 2 SHIB ZRSS_4
+ MIX 3 579.16 (*TubeMode*)
+  H2O      = H2O_3_P5 2.2796E-02
+  B10      = B10_3    4.5913E-06
+  B11      = B11_3    1.8365E-05
+  FE54     = FE54_3   1.1921E-04
+  FE56     = FE56_4   1.8852E-03
+  FE57     = FE57_3   4.5218E-05
+  FE58     = FE58_3   5.7550E-06
+  NI58     = NI58_3   5.4208E-04
+  NI60     = NI60_3   2.0724E-04
+  NI61     = NI61_3   8.9725E-06
+  NI62     = NI62_3   2.8506E-05
+  NI64     = NI64_3   7.2256E-06
+  CR50     = CR50_3   3.1782E-05
+  CR52     = CR52_3   6.1219E-04
+  CR53     = CR53_3   6.9409E-05
+  CR54     = CR54_3   1.7243E-05
+  MN55     = MN55_3   2.8729E-05
+  SI       = SI_3     2.4816E-05
+  AL27     = AL27_4   1.1264E-05
+  MO95     = MO95_4   1.9533E-05
+  TI       = TI_2     1.1174E-05
+  CO59     = CO59_2   5.1569E-07
+  NB93     = NB93_2   3.3858E-05
+ MIX 4 923.16 (*FuelMed*)
+  U238     = U238_4 2.1779E-02 1 SHIB U238SS_3 IRSET 0.0 38
+  U236     = U236_2 4.3339E-06 1 SHIB U236SS_3 IRSET 0.0 38
+  U235     = U235_4 7.0598E-04 1 SHIB U235SS_4 IRSET 0.0 38
+  U234     = U234_2 5.4335E-06
+  O16      = O16_6  4.4990E-02
+  I135     = I135PF_1  0.0
+  XE135    = XE135PF_1 0.0
+  PM147    = PM147PF_1 0.0
+  PM148    = PM148PF_1 0.0
+  PM148M   = PM148MPF_1 0.0
+  PM149    = PM149PF_1 0.0
+  SM149    = SM149PF_1 0.0
+ MIX 5 608.16 (*CladMed*)
+  FE54     = FE54_3 7.7670E-06
+  FE56     = FE56_4 1.2283E-04
+  FE57     = FE57_3 2.9461E-06
+  FE58     = FE58_3 3.7496E-07
+  CR50     = CR50_3 2.9794E-06
+  CR52     = CR52_3 5.7389E-05
+  CR53     = CR53_3 6.5067E-06
+  CR54     = CR54_3 1.6164E-06
+  O16      = O16_6  2.7831E-04
+  ZR       = ZR_4   3.8303E-02 3 SHIB ZRSS_4
+ MIX 6 579.16 (*WaterMed*)
+  H2O      = H2O_3_P5 2.3700E-02
+  B10      = B10_3    4.7543E-06
+  B11      = B11_3    1.9017E-05
+  FE54     = FE54_3   5.4285E-06
+  FE56     = FE56_4   8.5845E-05
+  FE57     = FE57_3   2.0591E-06
+  FE58     = FE58_3   2.6206E-07
+  NI58     = NI58_3   1.7511E-04
+  NI60     = NI60_3   6.6944E-05
+  NI61     = NI61_3   2.8983E-06
+  NI62     = NI62_3   9.2080E-06
+  NI64     = NI64_3   2.3341E-06
+  CR50     = CR50_3   4.5576E-06
+  CR52     = CR52_3   8.7790E-05
+  CR53     = CR53_3   9.9535E-06
+  CR54     = CR54_3   2.4726E-06
+  MN55     = MN55_3   9.3942E-07
+  SI       = SI_3     1.8376E-06
+  AL27     = AL27_4   5.3133E-06
+  MO95     = MO95_4   9.2140E-06
+  TI       = TI_2     5.2710E-06
+  CO59     = CO59_2   2.4326E-07
+  NB93     = NB93_2   1.5971E-05
+ MIX 7 COMB 4 1.0 (*COMB02*)
+ MIX 8 COMB 4 1.0 (*COMB03*)
+ MIX 9 COMB 4 1.0 (*COMB04*)
+ MIX 10 COMB 4 1.0 (*COMB05*)
+;
+ASSMB := GEO: :: CAR2D 3 3 (*ASSEMBLAGE 5 X 5*)
+          X- DIAG X+ REFL
+          Y- SYME Y+ DIAG
+          MIX C1 C2 C4
+                 C3 C5
+                    C6
+          ::: C1 := GEO: CARCEL 2 (*CELLULE SANS COMBUSTIBLE*)
+                MESHX 0.0 <<COTE>>
+                MESHY 0.0 <<COTE>>
+                RADIUS 0.0 5.72460E-01 6.13180E-01
+                MIX 1 2 3
+          ;
+          ::: C2 := GEO: C1 (*CELLULE AVEC COMBUSTIBLE*)
+                RADIUS 0.0 4.12360E-01 4.75880E-01
+                MIX 4 5 6
+          ;
+          ::: C3 := GEO: C2 (*CELLULE AVEC COMBUSTIBLE*)
+                MIX 8 5 6
+          ;
+          ::: C4 := GEO: C2 (*CELLULE AVEC COMBUSTIBLE*)
+                MIX 7 5 6
+                MESHX 0.0 <<LAME>>
+          ;
+          ::: C5 := GEO: C2 (*CELLULE AVEC COMBUSTIBLE*)
+                MIX 9 5 6
+                MESHX 0.0 <<LAME>>
+          ;
+          ::: C6 := GEO: C2 (*CELLULE AVEC COMBUSTIBLE*)
+                MIX 10 5 6
+                MESHX 0.0 <<LAME>>
+                MESHY 0.0 <<LAME>>
+          ;
+;
+TRACK := SYBILT: ASSMB ::
+     EDIT 1
+     MAXR 40  (*MAXIMUM OF 40 REGIONS*)
+     MAXZ 100000
+     TITLE 'SMALL SAPHYB CONSTRUCTION'
+     QUA2 6 6
+     DP00 ;
+*
+SAPOBJ := SAP: LIBRARY ::
+     EDIT 3
+     COMM  'First line of comment'
+           'Second line of comment'
+     ENDC
+     NOML  'Test saphyb library'
+     PARA  'BORON CONC.'      'BCON' VALE FLOT
+     PARA  'FUEL TEMP.'       'FTMP' TEMP LIBRARY2 4
+     PARA  'WATER TEMP.'      'WTMP' TEMP LIBRARY2 6
+     PARA  'BURNUP'           'BURN' IRRA
+     PARA  'FLUENCE'          'FLUB' FLUB
+     PARA  'GLOBAL_POWER'     'PUIS' PUIS
+     ISOT  FISS I135 XE135 PM147 PM148 PM148M PM149 SM149
+     MACR  'MACR' TOUT
+     MACR  'MACT' REST
+     REAC  TOTA ABSO SNNN FISS CHI NUFI ENER FUIT DIFF SELF PROF TRAN
+     LOCA  'BURN_LOCAL'         'BURN' IRRA
+     LOCA  'FLUE_LOCAL'         'FLUB' FLUB
+     LOCA  'DENS_NOYAUX_LOURDS' 'MASS' MASL
+     LOCA  'XENON'              'XE'   CONC XE135
+     LOCA  'EQUIVALENCE'        'SPH'  EQUI
+     LOCA  'TEMPERATURE'        'MTMP' TEMP
+     NAME  ECell11 ECell21 ECell31 ECell22 ECell32 ECell33
+;
+*
+LIBRARY2 := USS: LIBRARY TRACK :: EDIT 2 ;
+*
+SYS := ASM: LIBRARY2 TRACK :: PIJ ;
+FLUX := FLU: LIBRARY2 TRACK SYS :: TYPE B B1 SIGS ;
+SYS := DELETE: SYS ;
+
+EVALUATE VOL_ASS := COTE 5.0 * ;
+EVALUATE VOL_ASS := VOL_ASS VOL_ASS * ;
+EVALUATE NORM_FCT1 := POW 1.60207E-13 * VOL_ASS / ;
+
+EVALUATE NORM_FCT2 := NORM_FCT1 2.8473 / 1.00336 / ;
+PRINT 'volume_assemblage=' VOL_ASS 'cm**3  in-fuel power=' NORM_FCT2
+      'MW/tonne=' ;
+PRINT 'normalization power=' NORM_FCT1 'W/CC' ;
+EVALUATE evoend := 0.0 ;
+EVALUATE istep := 1 ;
+WHILE evoend step2 NORM_FCT2 / < DO
+
+  EVALUATE evobeg := evoend ;
+  EVALUATE evoend := step2 NORM_FCT2 / ;
+  PRINT 'Burnup step' istep 'between' evobeg 'and' evoend 'day:' ;
+  IF istep 1 = THEN
+    BURNUP LIBRARY2 := EVO: LIBRARY2 TRACK FLUX :: EDIT 3 RUNG
+         DEPL <<evobeg>> <<evoend>> DAY W/CC <<NORM_FCT1>>
+         RUNG EPS2 100.0 EXPM 1.0E15 ;
+  ELSE
+    BURNUP LIBRARY2 := EVO: BURNUP LIBRARY2 TRACK FLUX :: EDIT 3
+      DEPL <<evobeg>> <<evoend>> DAY W/CC <<NORM_FCT1>>
+      RUNG EXTR EPS2 100.0 EXPM 1.0E15 ;
+  ENDIF ;
+
+  SYS := ASM: LIBRARY2 TRACK :: PIJ ;
+  FLUX := FLU: FLUX LIBRARY2 TRACK SYS :: TYPE B B1 SIGS ;
+  SYS := DELETE: SYS ;
+
+  PRINT 'Edition at' evoend 'DAY  burnup=' step2 'MWday/tonne=' ;
+
+    EDIT := EDI: LIBRARY2 TRACK FLUX ASSMB :: EDIT 0
+      COND 4.0
+      MERGE CELL
+      MICR ALL
+      SAVE ON 'EDITCDAT   1'
+      ;
+    IF istep 1 = THEN
+      SPHGEOM := EDIT :: STEP UP 'MACRO-GEOM' ;
+      MTRACK := BIVACT: SPHGEOM :: DUAL (*IELEM=*) 1 (*ICOL=*) 3 ;
+    ENDIF ;
+    EDIT := SPH: EDIT MTRACK :: EDIT 3 ;
+
+    BURNUP LIBRARY2 := EVO: BURNUP LIBRARY2 TRACK FLUX :: EDIT 3
+                       SAVE <<evoend>> DAY W/CC <<NORM_FCT1>> ;
+
+    SAPOBJ := SAP: SAPOBJ EDIT BURNUP LIBRARY2 FLUX ::
+      EDIT 3
+      SET <<evoend>> DAY
+      BCON <<BoronCont>>
+      ;
+
+    EDIT := DELETE: EDIT ;
+
+  EVALUATE step2 step3 step4 step5 := step3 step4 step5 step2 ;
+
+  EVALUATE istep := istep 1 + ;
+
+ENDWHILE ;
+
+BURNUP LIBRARY2 := EVO: BURNUP LIBRARY2 TRACK FLUX :: EDIT 2
+        SAVE <<evoend>> DAY W/CC <<NORM_FCT1>> ;
+
+assertS FLUX :: K-INFINITY 1 1.200448 ;
+SAPMIL := SAPOBJ :: STEP UP 'calc       3' STEP UP 'mili       4' ;
+
+UTL: SAPOBJ :: DIR ;
+*
+*************************************************
+* Verification calculation at 38.681076 MWd/tonne
+*************************************************
+*
+*MACROLIB := MODUL1: SAPOBJ :: EDIT 3 CALC 3 ;
+MACROLIB := SPH: SAPOBJ :: EDIT 3 MACRO
+                 SPRD EQUI 'SPH' STEP AT 3 ;
+SYS := ASM: MACROLIB MTRACK :: ARM ;
+FLUX1 := FLU: MACROLIB MTRACK SYS ::
+         TYPE K LKRD IDEM EXTE 100 5.0E-8 ;
+assertS FLUX1 :: 'K-EFFECTIVE' 1 1.0 ;
+SPHGEOM MTRACK SYS FLUX1 := DELETE: SPHGEOM MTRACK SYS FLUX1 ;
+
+END: ;
diff --git a/Dragon/data/tapollo2_proc/TCA241.c2m b/Dragon/data/tapollo2_proc/TCA241.c2m
new file mode 100644
index 0000000..ce1825e
--- /dev/null
+++ b/Dragon/data/tapollo2_proc/TCA241.c2m
@@ -0,0 +1,135 @@
+*---
+* Regression test 3 for MCCG: and MOCC:
+*---
+*  TEST CASE TCA241
+*  9 x 9 PWR SIMPLIFIED ASSEMBLY WITH POISON
+*  CEA93V4 99 GROUPS LIBRARY FILE CEA93V4
+*---
+
+*----
+*  Define STRUCTURES and MODULES used
+*----
+LINKED_LIST LIBRARY ASSMB TRACK SYS FLUX EDIT ;
+SEQ_BINARY TRACK_FIL ;
+MODULE GEO: EXCELT: MCCGT: MAC: LIB: ASM: FLU: EDI: END: DELETE: ;
+PROCEDURE assertS ;
+*----
+*  Microscopic cross sections
+*----
+LIBRARY := LIB: ::
+  EDIT 0 ANIS 2 NMIX 3 
+  MIXS LIB: APLIB2 FIL: CEA93V4
+  MIX 1 300.16
+    H2O      = H2O_3_P5 2.3934E-02
+  MIX 2 579.9
+    U238     = U238_4 2.2089E-02 1 SHIB U238SS_3 IRSET 0.0 38
+    U235     = U235_4 8.6623E-04 1 SHIB U235SS_4 IRSET 0.0 38
+    O16      = O16_6  4.5910E-02
+  MIX 3 300.16
+    AL27     = AL27_4 3.9222E-02
+     ;
+*----
+* Geometry ASSMB : a 9 X 9 PWR ASSEMBLY
+*  contains  C1 : cell without fuel
+*            C2 : poisoned cell
+*            C3 : normal fuel cell
+*            C4 : peripheral cell
+*            C5 : corner cell
+*----
+ASSMB := GEO: :: CAR2D 5 5
+  X- DIAG X+ REFL Y- SYME Y+ DIAG
+  CELL C1 C3 C2 C3 C4
+          C3 C3 C3 C4
+             C2 C3 C4
+                C3 C4
+                   C5
+          ::: C1 := GEO: CARCEL 1
+                MESHX 0.0 1.262082
+                MESHY 0.0 1.262082
+                RADIUS 0.0 4.12660E-01
+                SPLITR 4
+                MIX 1 1
+          ;
+          ::: C2 := GEO: CARCEL 3
+                MESHX 0.0 1.262082
+                MESHY 0.0 1.262082
+                RADIUS 0.0 3.25296E-01 4.60039E-01 5.63430E-01
+                MIX 3 3 3 1
+          ;
+          ::: C3 := GEO: C1
+                MIX 2 1
+          ;
+          ::: C4 := GEO: C3
+                MESHX 0.0 1.322082
+          ;
+          ::: C5 := GEO: C4
+                MESHY 0.0 1.322082
+          ;
+  ;
+*----
+*  MCCG (isotropic BC)
+*----
+*----
+*  Tracking calculation
+*----
+TRACK TRACK_FIL := EXCELT: ASSMB ::
+   EDIT 1 MAXR 100
+   TITLE 'MULTICELL 9 X 9 PWR BENCHMARK WITH POISON'
+   ANIS 2 TRAK TISO 12 20.0
+;
+*---
+*  Multigroup Flux Calculation
+*  Edition
+*---
+TRACK := MCCGT: TRACK TRACK_FIL ASSMB ::
+  EDIT 1 CACB 4
+  AAC 80 TMT EPSI 1E-5 STIS 1
+  MAXI 1 KRYL 0 SCR 0 HDD 100000.0 ;
+SYS := ASM: LIBRARY TRACK TRACK_FIL ::
+  ARM EDIT 1 ;
+FLUX := FLU: LIBRARY TRACK SYS TRACK_FIL ::
+  EDIT 1 TYPE K THER 5 5E-5 EXTE 100 1E-5 ;
+assertS FLUX :: 'K-EFFECTIVE' 1 1.050948 ;
+EDIT := EDI: FLUX LIBRARY TRACK ASSMB ::
+  EDIT 2 COND 14 27 52 75 89 99
+  MERGE MIX 1 2 3  ;
+*---
+* Memory Release
+*---
+TRACK TRACK_FIL SYS FLUX EDIT := DELETE: 
+TRACK TRACK_FIL SYS FLUX EDIT ;
+*----
+*  MOCC (cyclic tracking)
+*----
+*----
+*  Tracking calculation
+*----
+TRACK TRACK_FIL := EXCELT: ASSMB ::
+   EDIT 1 MAXR 100
+   TITLE 'MULTICELL 9 X 9 PWR BENCHMARK WITH POISON'
+   ANIS 2 TRAK TSPC 7 20.0
+;
+*---
+*  Multigroup Flux Calculation
+*  Edition
+*---
+TRACK := MCCGT: TRACK TRACK_FIL ASSMB ::
+  EDIT 1 CACB 4
+  AAC 80 TMT EPSI 1E-5
+  MAXI 1 KRYL 0 SCR 0 HDD 0.0 ;
+SYS := ASM: LIBRARY TRACK TRACK_FIL ::
+  ARM EDIT 2 ;
+FLUX := FLU: LIBRARY TRACK SYS TRACK_FIL ::
+  EDIT 1 TYPE K THER 5 5E-5 EXTE 100 1E-5 ;
+assertS FLUX :: 'K-EFFECTIVE' 1 1.071877 ;
+EDIT := EDI: FLUX LIBRARY TRACK ASSMB ::
+  EDIT 2 COND 14 27 52 75 89 99
+  MERGE MIX 1 2 3  ;
+*---
+* Memory Release
+*---
+TRACK TRACK_FIL LIBRARY ASSMB SYS FLUX EDIT := DELETE: 
+TRACK TRACK_FIL LIBRARY ASSMB SYS FLUX EDIT ;
+ECHO "test TCA241 completed" ;
+END: ;
+QUIT "LIST" .