Skip to content

Commit 36c0f2a

Browse files
whaeckwhaeck
committed
Merge branch 'update/dependencies' into 'develop'
updating ENDFtk dependency See merge request njoy/dryad!81
2 parents 140836c + b74db8b commit 36c0f2a

29 files changed

+119
-61
lines changed

‎cmake/dependencies.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ shacl_FetchContent_Declare( ACEtk
3131

3232
shacl_FetchContent_Declare( ENDFtk
3333
GIT_REPOSITORY ../../njoy/ENDFtk
34-
GIT_TAG 97838a724b1b32bdc6c0da7e219668e072750700 # NOT A RELEASED VERSION - CHANGE ME!
34+
GIT_TAG d1bc22f4df99f64789138ca18d25b85f9b1293f4 # NOT A RELEASED VERSION - CHANGE ME!
3535
)
3636

3737
#######################################################################

‎src/dryad/format/endf/createAtomicRelaxationFromFile.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace endf {
2929

3030
Log::info( "Reading ENDF file \'{}\'", filename );
3131

32-
auto tape = ENDFtk::tree::fromFile( filename );
32+
auto tape = ENDFtk::tree::fromFile< ENDFtk::tree::Tape >( filename );
3333
return createAtomicRelaxation( tape.materials().front(), normalise );
3434
}
3535

‎src/dryad/format/endf/createProjectileTargetFromFile.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace endf {
2929

3030
Log::info( "Reading ENDF file \'{}\'", filename );
3131

32-
auto tape = ENDFtk::tree::fromFile( filename );
32+
auto tape = ENDFtk::tree::fromFile< ENDFtk::tree::Tape >( filename );
3333
return createProjectileTarget( tape.materials().front(), normalise );
3434
}
3535

‎test/format/endf/ReactionInformation.test.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,8 @@ SCENARIO( "ReactionInformation" ) {
578578

579579
GIVEN( "an ENDF material for a ground state target, mf and mt number" ) {
580580

581-
auto tape = njoy::ENDFtk::tree::fromFile( "n-003_Li_007.endf" );
581+
using Tape = njoy::ENDFtk::tree::Tape;
582+
auto tape = njoy::ENDFtk::tree::fromFile< Tape >( "n-003_Li_007.endf" );
582583
auto material = tape.materials().front();
583584
auto n = njoy::dryad::id::ParticleID::neutron();
584585
auto li7 = njoy::dryad::id::ParticleID( 3007 );
@@ -679,7 +680,8 @@ SCENARIO( "ReactionInformation" ) {
679680

680681
GIVEN( "an ENDF material for a metastable state target, mf and mt number" ) {
681682

682-
auto tape = njoy::ENDFtk::tree::fromFile( "n-093_Np_236m1.endf" );
683+
using Tape = njoy::ENDFtk::tree::Tape;
684+
auto tape = njoy::ENDFtk::tree::fromFile< Tape >( "n-093_Np_236m1.endf" );
683685
auto material = tape.materials().front();
684686
auto n = njoy::dryad::id::ParticleID::neutron();
685687
auto np236m1 = njoy::dryad::id::ParticleID( 93236, 2 );

‎test/format/endf/atomic/createElectronSubshellConfiguration.test.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ SCENARIO( "createElectronSubshellConfiguration" ) {
2121

2222
using SubshellData = njoy::ENDFtk::section::Type< 28 >::SubshellData;
2323

24-
auto tape = njoy::ENDFtk::tree::fromFile( "atom-008_O_000.endf" );
24+
using Tape = njoy::ENDFtk::tree::Tape;
25+
auto tape = njoy::ENDFtk::tree::fromFile< Tape >( "atom-008_O_000.endf" );
2526
auto section = tape.materials().front().section( 28, 533 ).parse< 28 >();
2627

2728
WHEN( "a single parsed MF28 SubshellData is given" ) {
@@ -42,7 +43,8 @@ SCENARIO( "createElectronSubshellConfiguration" ) {
4243

4344
using SubshellData = njoy::ENDFtk::section::Type< 28 >::SubshellData;
4445

45-
auto tape = njoy::ENDFtk::tree::fromFile( "atom-029_Cu_000.endf" );
46+
using Tape = njoy::ENDFtk::tree::Tape;
47+
auto tape = njoy::ENDFtk::tree::fromFile< Tape >( "atom-029_Cu_000.endf" );
4648
auto section = tape.materials().front().section( 28, 533 ).parse< 28 >();
4749

4850
WHEN( "a single parsed MF28 SubshellData is given" ) {

‎test/format/endf/covariance/createCrossSectionCovarianceMatrix.test.cpp‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,8 @@ SCENARIO( "createCrossSectionCovarianceMatrix" ) {
256256
GIVEN( "an instance of an off-diagonal ReactionBlock with a single symmetric "
257257
"SquareMatrix and variance scaling information" ) {
258258

259-
auto tape = njoy::ENDFtk::tree::fromFile( "n-009_F_019.endf" );
259+
using Tape = njoy::ENDFtk::tree::Tape;
260+
auto tape = njoy::ENDFtk::tree::fromFile< Tape >( "n-009_F_019.endf" );
260261
auto material = tape.materials().front();
261262
auto section = material.file( 33 ).section( 16 ).parse< 33 >();
262263
ReactionBlock covariance = section.reactions()[0];
@@ -361,7 +362,8 @@ SCENARIO( "createCrossSectionCovarianceMatrix" ) {
361362
GIVEN( "an instance of an off-diagonal ReactionBlock with a single symmetric "
362363
"SquareMatrix and without variance scaling information" ) {
363364

364-
auto tape = njoy::ENDFtk::tree::fromFile( "n-009_F_019.endf" );
365+
using Tape = njoy::ENDFtk::tree::Tape;
366+
auto tape = njoy::ENDFtk::tree::fromFile< Tape >( "n-009_F_019.endf" );
365367
auto material = tape.materials().front();
366368
auto section = material.file( 33 ).section( 104 ).parse< 33 >();
367369
ReactionBlock covariance = section.reactions()[0];
@@ -450,7 +452,8 @@ SCENARIO( "createCrossSectionCovarianceMatrix" ) {
450452
GIVEN( "an instance of an off-diagonal ReactionBlock with a single asymmetric "
451453
"SquareMatrix" ) {
452454

453-
auto tape = njoy::ENDFtk::tree::fromFile( "n-009_F_019.endf" );
455+
using Tape = njoy::ENDFtk::tree::Tape;
456+
auto tape = njoy::ENDFtk::tree::fromFile< Tape >( "n-009_F_019.endf" );
454457
auto material = tape.materials().front();
455458
auto section = material.file( 33 ).section( 4 ).parse< 33 >();
456459
ReactionBlock covariance = section.reactions()[1];
@@ -550,7 +553,8 @@ SCENARIO( "createCrossSectionCovarianceMatrix" ) {
550553

551554
GIVEN( "an instance of an off-diagonal ReactionBlock with a single RectangularMatrix" ) {
552555

553-
auto tape = njoy::ENDFtk::tree::fromFile( "n-010_Ne_022.endf" );
556+
using Tape = njoy::ENDFtk::tree::Tape;
557+
auto tape = njoy::ENDFtk::tree::fromFile< Tape >( "n-010_Ne_022.endf" );
554558
auto material = tape.materials().front();
555559
auto section = material.file( 33 ).section( 16 ).parse< 33 >();
556560
ReactionBlock covariance = section.reactions()[1];

‎test/format/endf/covariance/createMatrix.test.cpp‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ SCENARIO( "createMatrix" ) {
2121

2222
GIVEN( "an instance of CovariancePairs using LB=0/1 (diagonal elements)" ) {
2323

24-
auto tape = njoy::ENDFtk::tree::fromFile( "n-009_F_019.endf" );
24+
using Tape = njoy::ENDFtk::tree::Tape;
25+
auto tape = njoy::ENDFtk::tree::fromFile< Tape >( "n-009_F_019.endf" );
2526
auto material = tape.materials().front();
2627
auto section = material.file( 33 ).section( 4 ).parse< 33 >();
2728
CovariancePairs covariance = std::get< CovariancePairs >( section.reactions()[0].explicitCovariances()[0] );
@@ -111,7 +112,8 @@ SCENARIO( "createMatrix" ) {
111112

112113
GIVEN( "an instance of SquareMatrix that is symmetric" ) {
113114

114-
auto tape = njoy::ENDFtk::tree::fromFile( "n-009_F_019.endf" );
115+
using Tape = njoy::ENDFtk::tree::Tape;
116+
auto tape = njoy::ENDFtk::tree::fromFile< Tape >( "n-009_F_019.endf" );
115117
auto material = tape.materials().front();
116118
auto section = material.file( 33 ).section( 4 ).parse< 33 >();
117119
SquareMatrix covariance = std::get< SquareMatrix >( section.reactions()[0].explicitCovariances()[1] );
@@ -171,7 +173,8 @@ SCENARIO( "createMatrix" ) {
171173

172174
GIVEN( "an instance of SquareMatrix that is asymmetric" ) {
173175

174-
auto tape = njoy::ENDFtk::tree::fromFile( "n-009_F_019.endf" );
176+
using Tape = njoy::ENDFtk::tree::Tape;
177+
auto tape = njoy::ENDFtk::tree::fromFile< Tape >( "n-009_F_019.endf" );
175178
auto material = tape.materials().front();
176179
auto section = material.file( 33 ).section( 4 ).parse< 33 >();
177180
SquareMatrix covariance = std::get< SquareMatrix >( section.reactions()[1].explicitCovariances()[0] );
@@ -231,7 +234,8 @@ SCENARIO( "createMatrix" ) {
231234

232235
GIVEN( "an instance of RectangularMatrix" ) {
233236

234-
auto tape = njoy::ENDFtk::tree::fromFile( "n-010_Ne_022.endf" );
237+
using Tape = njoy::ENDFtk::tree::Tape;
238+
auto tape = njoy::ENDFtk::tree::fromFile< Tape >( "n-010_Ne_022.endf" );
235239
auto material = tape.materials().front();
236240
auto section = material.file( 33 ).section( 16 ).parse< 33 >();
237241
RectangularMatrix covariance = std::get< RectangularMatrix >( section.reactions()[1].explicitCovariances()[0] );

‎test/format/endf/covariance/createVarianceScaling.test.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ SCENARIO( "createVarianceScaling" ) {
2121

2222
GIVEN( "an instance of CovariancePairs using LB=8/9" ) {
2323

24-
auto tape = njoy::ENDFtk::tree::fromFile( "n-009_F_019.endf" );
24+
using Tape = njoy::ENDFtk::tree::Tape;
25+
auto tape = njoy::ENDFtk::tree::fromFile< Tape >( "n-009_F_019.endf" );
2526
auto material = tape.materials().front();
2627
auto section = material.file( 33 ).section( 4 ).parse< 33 >();
2728
CovariancePairs covariance = std::get< CovariancePairs >( section.reactions()[0].explicitCovariances()[2] );
@@ -70,7 +71,8 @@ SCENARIO( "createVarianceScaling" ) {
7071

7172
GIVEN( "an instance of CovariancePairs not using LB=8/9" ) {
7273

73-
auto tape = njoy::ENDFtk::tree::fromFile( "n-009_F_019.endf" );
74+
using Tape = njoy::ENDFtk::tree::Tape;
75+
auto tape = njoy::ENDFtk::tree::fromFile< Tape >( "n-009_F_019.endf" );
7476
auto material = tape.materials().front();
7577
auto section = material.file( 33 ).section( 4 ).parse< 33 >();
7678
CovariancePairs covariance = std::get< CovariancePairs >( section.reactions()[0].explicitCovariances()[0] );

‎test/format/endf/createAtomicRelaxation.test.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ SCENARIO( "createAtomicRelaxation" ) {
1818

1919
GIVEN( "ENDF material with atomic relaxation data" ) {
2020

21-
auto tape = njoy::ENDFtk::tree::fromFile( "atom-008_O_000.endf" );
21+
using Tape = njoy::ENDFtk::tree::Tape;
22+
auto tape = njoy::ENDFtk::tree::fromFile< Tape >( "atom-008_O_000.endf" );
2223
auto material = tape.materials().front();
2324

2425
WHEN( "a single ENDF material is given" ) {

‎test/format/endf/createDocumentation.test.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ SCENARIO( "createDocumentation" ) {
1818

1919
GIVEN( "ENDF material with atomic relaxation data" ) {
2020

21-
auto tape = njoy::ENDFtk::tree::fromFile( "atom-008_O_000.endf" );
21+
using Tape = njoy::ENDFtk::tree::Tape;
22+
auto tape = njoy::ENDFtk::tree::fromFile< Tape >( "atom-008_O_000.endf" );
2223
auto mf1mt451 = tape.materials().front().section( 1, 451 ).parse< 1, 451 >();
2324

2425
WHEN( "a single ENDF material is given" ) {

0 commit comments

Comments
 (0)