Resolve "Depreciate use of Version 4 and 5.0 Draglibs"

1 files changed, 20 insertions, 19 deletions

diff --git a/Dragon/data/tdraglib_proc/TCDR22.c2m b/Dragon/data/tdraglib_proc/TCDR22.c2m
index 8983c9f..a8eac72 100644
--- a/Dragon/data/tdraglib_proc/TCDR22.c2m
+++ b/Dragon/data/tdraglib_proc/TCDR22.c2m
@@ -10,17 +10,20 @@
 *  Define STRUCTURES and MODULES used
 *----
 LINKED_LIST
-  ASSMB DISCR LIBRARY CP CALC OUT SPHGEOM MTRACK MACRO MACRO2 SYS FLUX
-  EDIT ;
+  ASSMB DISCR LIBRARY LIBRARY2 CP CALC OUT SPHGEOM MTRACK MACRO MACRO2 SYS
+  FLUX EDIT OPTIM ;
 MODULE
-  LIB: GEO: SYBILT: SHI: ASM: FLU: EDI: FLUD: MAC: DELETE: UTL: BIVACT:
-  BIVACA: SPH: OUT: ERROR: END: ;
+  LIB: GEO: SYBILT: USS: ASM: FLU: EDI: FLUD: MAC: DELETE: UTL: BIVACT:
+  BIVACA: OUT: ERROR: END: ;
+PROCEDURE SPH_FixedPt ;
 PROCEDURE assertS ;
+INTEGER IterEmax := 50 ;
 *----
 *  Microscopic cross sections from Jef 2.2 Draglib
 *----
 LIBRARY := LIB: ::
   NMIX 8 CTRA WIMS ANIS 2
+  SUBG
   MIXS LIB: DRAGON FIL: DLIB_J2
   MIX 1 579.9
     H1H2O    = H1_H2O   4.76690E-2   O16H2O   = O16      2.38345E-2
@@ -122,7 +125,7 @@ ASSMB := GEO: :: CAR2D 9 9
 DISCR := SYBILT: ASSMB ::
   TITLE 'TCDR02: 17 X 17 MULTICELL PWR BENCHMARK WITHOUT POISON'
   MAXR 400 QUA2 6 3 ;
-LIBRARY := SHI: LIBRARY DISCR :: LJ ;
+LIBRARY2 := USS: LIBRARY DISCR :: PASS 2 ;
 ASSMB DISCR := DELETE: ASSMB DISCR ;
 *----
 *  New lattice geometry with VOID boundary condition
@@ -148,16 +151,16 @@ ASSMB := GEO: :: CAR2D 9 9
 DISCR := SYBILT: ASSMB ::
   TITLE 'TCDR02: 17 X 17 MULTICELL PWR BENCHMARK WITHOUT POISON'
   MAXR 400 QUA2 6 3 ;
-CP := ASM: LIBRARY DISCR :: ARM ;
-CALC := FLU: CP LIBRARY DISCR ::
+CP := ASM: LIBRARY2 DISCR :: ARM ;
+CALC := FLU: CP LIBRARY2 DISCR ::
   TYPE K P1 HETE ;
-assertS CALC :: 'K-EFFECTIVE' 1 0.4551677 ;
+assertS CALC :: 'K-EFFECTIVE' 1 0.4565791 ;
 
 *----
 *  Editing using SPH model for transport-diffusion with flux-volume
 *  normalization
 *----
-OUT := EDI: LIBRARY DISCR CALC ASSMB ::
+OUT := EDI: LIBRARY2 DISCR CALC ASSMB ::
   EDIT 4 UPS SAVE MICR RES MERGE CELL COND 4.0
   ;
 
@@ -187,21 +190,19 @@ MACRO := OUT :: STEP UP 'REF-CASE0001' STEP UP 'MACROLIB' ;
 *----
 MACRO := MAC: MACRO :: ALBP 1 0.0 0.0 ;
 *----
-* Perform SPH equivalence
+* Perform fixed-point SPH equivalence
 *----
-MACRO2 := SPH: MACRO MTRACK :: EDIT 2 ITER 1.0E-7 ;
+MACRO2 OPTIM := SPH_FixedPt MACRO SPHGEOM MTRACK
+   :: 0.0 10.0 1.0E-7 <<IterEmax>> ;
+ECHO "control variables at convergence" ;
+UTL: OPTIM :: IMPR 'VAR-VALUE' * ;
 *----
 * Verification calculation
 *----
+CALC := DELETE: CALC ;
 SYS := BIVACA: MACRO2 MTRACK ;
-FLUX := FLUD: SYS MTRACK :: EDIT 2 ADI 20 ACCE 5 3 ;
-EDIT := OUT: FLUX SPHGEOM MACRO2 MTRACK ::
-      EDIT 0 INTG MIX ;
-
-ECHO "Error statistics after correction" ;
-ERROR: MACRO EDIT :: HREA 'NFTOT' ;
-
-assertS FLUX :: K-EFFECTIVE 1 0.4551687 ;
+CALC := FLUD: SYS MTRACK :: EDIT 2 ADI 5 ACCE 5 3 ;
+assertS CALC :: K-EFFECTIVE 1 0.4565792 ;
 
 ECHO "test TCDR22 completed" ;
 END: ;