@@ -56,8 +56,8 @@ def read_keff(file):
5656def assert_db_allclose (test_db , ref_db , tol ):
5757 assert_nuclide_mass_allclose (test_db , ref_db , tol )
5858 assert_in_out_streams_allclose (test_db , ref_db , tol )
59- ref_data , ref_after_param , ref_before_param = read_fuel (ref_db , 'old' )
60- test_data , test_after_param , test_before_param = read_fuel (test_db , 'new' )
59+ ref_data , ref_after_param , ref_before_param = read_fuel (ref_db )
60+ test_data , test_after_param , test_before_param = read_fuel (test_db )
6161 # Compare materials composition
6262 for node_name , test_comp in test_data .items ():
6363 for nuc , test_mass_arr in test_comp .items ():
@@ -71,27 +71,19 @@ def assert_db_allclose(test_db, ref_db, tol):
7171 np .testing .assert_allclose (test_before_param , ref_before_param , rtol = tol )
7272
7373def assert_nuclide_mass_allclose (test_db , ref_db , tol ):
74- ref_mass_before , ref_mass_after = read_nuclide_mass (ref_db , 'old' )
75- test_mass_before , test_mass_after = read_nuclide_mass (test_db , 'new' )
74+ ref_mass_before , ref_mass_after = read_nuclide_mass (ref_db )
75+ test_mass_before , test_mass_after = read_nuclide_mass (test_db )
7676 for key , val in ref_mass_before .items ():
77- if key [- 2 ] == 'm' :
78- key = key [:- 2 ] + '_' + key [- 2 :]
7977 np .testing .assert_allclose (val , test_mass_before [key ], rtol = tol )
8078 for key , val in ref_mass_after .items ():
81- if key [- 2 ] == 'm' :
82- key = key [:- 2 ] + '_' + key [- 2 :]
8379 np .testing .assert_allclose (val , test_mass_after [key ], rtol = tol )
8480
85- def read_nuclide_mass (db_file , version ):
81+ def read_nuclide_mass (db_file ):
8682 db = tb .open_file (db_file , mode = 'r' )
8783 fuel_before = db .root .materials .fuel .before_reproc .comp
8884 fuel_after = db .root .materials .fuel .after_reproc .comp
89- if version == 'old' :
90- before_nucmap = fuel_before .attrs .iso_map
91- after_nucmap = fuel_after .attrs .iso_map
92- else :
93- before_nucmap = _create_nuclide_map (db .root .materials .fuel .before_reproc )
94- after_nucmap = _create_nuclide_map (db .root .materials .fuel .after_reproc )
85+ before_nucmap = _create_nuclide_map (db .root .materials .fuel .before_reproc )
86+ after_nucmap = _create_nuclide_map (db .root .materials .fuel .after_reproc )
9587
9688 mass_before = {}
9789 mass_after = {}
@@ -107,11 +99,11 @@ def assert_in_out_streams_allclose(test_db, ref_db, tol):
10799 ref_sparger , \
108100 ref_separator , \
109101 ref_ni_filter , \
110- ref_feed = read_in_out_streams (ref_db , 'old' )
102+ ref_feed = read_in_out_streams (ref_db )
111103 test_sparger , \
112104 test_separator , \
113105 test_ni_filter , \
114- test_feed = read_in_out_streams (test_db , 'new' )
106+ test_feed = read_in_out_streams (test_db )
115107 for key , val in test_sparger .items ():
116108 if len (key ) > 4 and key [- 3 ] == '_' :
117109 key = key [:- 3 ] + key [- 2 :]
@@ -133,27 +125,21 @@ def assert_in_out_streams_allclose(test_db, ref_db, tol):
133125 if key in ref_feed :
134126 np .testing .assert_allclose (val , ref_feed [key ], rtol = tol )
135127
136- def read_in_out_streams (db_file , version ):
128+ def read_in_out_streams (db_file ):
137129 db = tb .open_file (db_file , mode = 'r' )
138130 waste_sparger = db .root .materials .fuel .in_out_streams .waste_sparger
139131 waste_separator = \
140132 db .root .materials .fuel .in_out_streams .waste_entrainment_separator
141133 waste_ni_filter = db .root .materials .fuel .in_out_streams .waste_nickel_filter
142134 feed_leu = db .root .materials .fuel .in_out_streams .feed_leu
143- if version == 'old' :
144- waste_sparger_nucmap = waste_sparger .attrs .iso_map
145- waste_separator_nucmap = waste_separator .attrs .iso_map
146- waste_ni_filter_nucmap = waste_ni_filter .attrs .iso_map
147- feed_nucmap = feed_leu .attrs .iso_map
148- else :
149- waste_sparger_nucmap = _create_nuclide_map (waste_sparger )
150- waste_separator_nucmap = _create_nuclide_map (waste_separator )
151- waste_ni_filter_nucmap = _create_nuclide_map (waste_ni_filter )
152- feed_nucmap = _create_nuclide_map (feed_leu )
153- waste_sparger = waste_sparger .comp
154- waste_separator = waste_separator .comp
155- waste_ni_filter = waste_ni_filter .comp
156- feed_leu = feed_leu .comp
135+ waste_sparger_nucmap = _create_nuclide_map (waste_sparger )
136+ waste_separator_nucmap = _create_nuclide_map (waste_separator )
137+ waste_ni_filter_nucmap = _create_nuclide_map (waste_ni_filter )
138+ feed_nucmap = _create_nuclide_map (feed_leu )
139+ waste_sparger = waste_sparger .comp
140+ waste_separator = waste_separator .comp
141+ waste_ni_filter = waste_ni_filter .comp
142+ feed_leu = feed_leu .comp
157143
158144 mass_waste_sparger = {}
159145 mass_waste_separator = {}
@@ -178,15 +164,12 @@ def read_in_out_streams(db_file, version):
178164 mass_waste_ni_filter , \
179165 mass_feed_leu
180166
181- def read_fuel (file , version ):
167+ def read_fuel (file ):
182168 db = tb .open_file (file , mode = 'r' )
183169 fuel = db .root .materials .fuel
184170 out_data = {}
185171 for node in db .walk_nodes (fuel , classname = "EArray" ):
186- if version == 'old' :
187- nucmap = node .attrs .iso_map
188- else :
189- nucmap = _create_nuclide_map (node ._v_parent )
172+ nucmap = _create_nuclide_map (node ._v_parent )
190173 if node ._v_name == 'comp' :
191174 node_name = node ._v_parent ._v_name
192175 else :
0 commit comments