Skip to content

Commit cee0f66

Browse files
whaeckwhaeck
authored
Merge pull request #187 from njoy/develop
ENDFtk v0.5.0
2 parents a49f6c7 + ceb4e8a commit cee0f66

File tree

597 files changed

+1498396
-3352
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

597 files changed

+1498396
-3352
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,4 @@ dependencies
4141
# python
4242
__pycache__
4343
*.pyc
44+
.ipynb*

‎CMakeLists.txt

+50-10
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ target_link_libraries( ENDFtk
6363
INTERFACE Log
6464
INTERFACE catch-adapter
6565
INTERFACE disco
66-
INTERFACE hana-adapter
6766
INTERFACE header-utilities
6867
INTERFACE range-v3
6968
)
@@ -81,6 +80,13 @@ if( ENDFtk.python )
8180
${CMAKE_CURRENT_SOURCE_DIR}/python/src/record/InterpolationRecord.python.cpp
8281
${CMAKE_CURRENT_SOURCE_DIR}/python/src/record/DirectoryRecord.python.cpp
8382
${CMAKE_CURRENT_SOURCE_DIR}/python/src/record/TapeIdentification.python.cpp
83+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/CovariancePairs.python.cpp
84+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/SquareMatrix.python.cpp
85+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/RectangularMatrix.python.cpp
86+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/DerivedRedundant.python.cpp
87+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/DerivedRatioToStandard.python.cpp
88+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/ReactionBlock.python.cpp
89+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/covariance.python.cpp
8490
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/1/TabulatedMultiplicity.python.cpp
8591
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/1/PolynomialMultiplicity.python.cpp
8692
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/1/451.python.cpp
@@ -141,6 +147,38 @@ if( ENDFtk.python )
141147
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/28/SubshellData.python.cpp
142148
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/28.python.cpp
143149
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/3.python.cpp
150+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151.python.cpp
151+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/ScatteringRadiusCovariances.python.cpp
152+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/LimitedBreitWignerLValue.python.cpp
153+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/LimitedSingleLevelBreitWigner.python.cpp
154+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/LimitedMultiLevelBreitWigner.python.cpp
155+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/ShortRangeBreitWignerBlock.python.cpp
156+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/ShortRangeReichMooreBlock.python.cpp
157+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/ShortRangeRMatrixLimitedBlock.python.cpp
158+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/ReichMooreScatteringRadiusUncertainties.python.cpp
159+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/LCOMP1/ResonanceParameters.python.cpp
160+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/LCOMP1/CovarianceMatrix.python.cpp
161+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/GeneralSingleLevelBreitWigner.python.cpp
162+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/GeneralMultiLevelBreitWigner.python.cpp
163+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/GeneralReichMoore.python.cpp
164+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/GeneralRMatrixLimited.python.cpp
165+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/CompactCorrelationMatrix.python.cpp
166+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/CompactBreitWignerUncertainties.python.cpp
167+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/CompactReichMooreUncertainties.python.cpp
168+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/CompactSingleLevelBreitWigner.python.cpp
169+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/CompactMultiLevelBreitWigner.python.cpp
170+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/CompactReichMoore.python.cpp
171+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/LCOMP2/ParticlePairs.python.cpp
172+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/LCOMP2/ResonanceChannels.python.cpp
173+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/LCOMP2/ResonanceParameters.python.cpp
174+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/LCOMP2/SpinGroup.python.cpp
175+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/CompactRMatrixLimitedUncertainties.python.cpp
176+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/CompactRMatrixLimited.python.cpp
177+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/UnresolvedCovarianceMatrix.python.cpp
178+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/UnresolvedLValue.python.cpp
179+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/UnresolvedRelativeCovariances.python.cpp
180+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/ResonanceRange.python.cpp
181+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/32/151/Isotope.python.cpp
144182
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/4.python.cpp
145183
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/4/Isotropic.python.cpp
146184
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/4/LegendreCoefficients.python.cpp
@@ -194,6 +232,8 @@ if( ENDFtk.python )
194232
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/7/4/AnalyticalFunctions.python.cpp
195233
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/7/4/TabulatedFunctions.python.cpp
196234
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/7/4/ScatteringFunction.python.cpp
235+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/7/451.python.cpp
236+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/7/451/ElementInformation.python.cpp
197237
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/8/FissionYieldData.python.cpp
198238
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/8/454.python.cpp
199239
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/8/457.python.cpp
@@ -227,19 +267,15 @@ if( ENDFtk.python )
227267
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/15/TabulatedSpectrum.python.cpp
228268
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/15/Probability.python.cpp
229269
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/15/PartialDistribution.python.cpp
270+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/31.python.cpp
230271
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/33.python.cpp
231-
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/33/DerivedRedundant.python.cpp
232-
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/33/DerivedRatioToStandard.python.cpp
233-
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/33/CovariancePairs.python.cpp
234-
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/33/SquareMatrix.python.cpp
235-
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/33/ReactionBlock.python.cpp
236-
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/33/RectangularMatrix.python.cpp
237272
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/34.python.cpp
238-
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/34/CovariancePairs.python.cpp
239273
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/34/LegendreBlock.python.cpp
240274
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/34/ReactionBlock.python.cpp
241-
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/34/RectangularMatrix.python.cpp
242-
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/34/SquareMatrix.python.cpp
275+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/35.python.cpp
276+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/35/SquareMatrix.python.cpp
277+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/40.python.cpp
278+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/section/40/LevelBlock.python.cpp
243279
${CMAKE_CURRENT_SOURCE_DIR}/python/src/file/1.python.cpp
244280
${CMAKE_CURRENT_SOURCE_DIR}/python/src/file/2.python.cpp
245281
${CMAKE_CURRENT_SOURCE_DIR}/python/src/file/3.python.cpp
@@ -258,8 +294,12 @@ if( ENDFtk.python )
258294
${CMAKE_CURRENT_SOURCE_DIR}/python/src/file/26.python.cpp
259295
${CMAKE_CURRENT_SOURCE_DIR}/python/src/file/27.python.cpp
260296
${CMAKE_CURRENT_SOURCE_DIR}/python/src/file/28.python.cpp
297+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/file/31.python.cpp
298+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/file/32.python.cpp
261299
${CMAKE_CURRENT_SOURCE_DIR}/python/src/file/33.python.cpp
262300
${CMAKE_CURRENT_SOURCE_DIR}/python/src/file/34.python.cpp
301+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/file/35.python.cpp
302+
${CMAKE_CURRENT_SOURCE_DIR}/python/src/file/40.python.cpp
263303
${CMAKE_CURRENT_SOURCE_DIR}/python/src/Material.python.cpp
264304
${CMAKE_CURRENT_SOURCE_DIR}/python/src/tree/Section.python.cpp
265305
${CMAKE_CURRENT_SOURCE_DIR}/python/src/tree/File.python.cpp

‎cmake/develop_dependencies.cmake

-7
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@ FetchContent_Declare( disco
2323
GIT_SHALLOW TRUE
2424
)
2525

26-
FetchContent_Declare( hana-adapter
27-
GIT_REPOSITORY https://github.com/njoy/hana-adapter
28-
GIT_TAG origin/master
29-
GIT_SHALLOW TRUE
30-
)
31-
3226
FetchContent_Declare( header-utilities
3327
GIT_REPOSITORY https://github.com/njoy/header-utilities
3428
GIT_TAG origin/master
@@ -53,7 +47,6 @@ FetchContent_MakeAvailable(
5347
Log
5448
catch-adapter
5549
disco
56-
hana-adapter
5750
header-utilities
5851
range-v3
5952
pybind11

‎cmake/release_dependencies.cmake

-6
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ FetchContent_Declare( disco
1515
GIT_TAG 2606933a854bb0269c4ec37143e1236797e27838
1616
)
1717

18-
FetchContent_Declare( hana-adapter
19-
GIT_REPOSITORY https://github.com/njoy/hana-adapter
20-
GIT_TAG f58e8973c9a614dc4f3720b5581a762c61bdbb40
21-
)
22-
2318
FetchContent_Declare( header-utilities
2419
GIT_REPOSITORY https://github.com/njoy/header-utilities
2520
GIT_TAG cc2610fee15e255c151e8e22aca1e8b3d1a96b39
@@ -53,7 +48,6 @@ set( SPDLOG_BUILD_TESTING CACHE BOOL OFF )
5348
FetchContent_MakeAvailable(
5449
catch-adapter
5550
disco
56-
hana-adapter
5751
header-utilities
5852
Log
5953
pybind11

‎cmake/unit_testing.cmake

+46-9
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ add_subdirectory( src/ENDFtk/record/Sequence/test )
3333
add_subdirectory( src/ENDFtk/record/Tail/test )
3434
add_subdirectory( src/ENDFtk/record/Zipper/test )
3535
add_subdirectory( src/ENDFtk/record/test )
36+
add_subdirectory( src/ENDFtk/section/CovariancePairs/test )
37+
add_subdirectory( src/ENDFtk/section/RectangularMatrix/test )
38+
add_subdirectory( src/ENDFtk/section/SquareMatrix/test )
39+
add_subdirectory( src/ENDFtk/section/DerivedRatioToStandard/test )
40+
add_subdirectory( src/ENDFtk/section/DerivedRedundant/test )
41+
add_subdirectory( src/ENDFtk/section/ReactionBlock/test )
3642
add_subdirectory( src/ENDFtk/section/1/451/test )
3743
add_subdirectory( src/ENDFtk/section/1/452/test )
3844
add_subdirectory( src/ENDFtk/section/1/455/DecayConstants/test )
@@ -118,26 +124,55 @@ add_subdirectory( src/ENDFtk/section/28/SubshellData/Transition/test )
118124
add_subdirectory( src/ENDFtk/section/28/SubshellData/test )
119125
add_subdirectory( src/ENDFtk/section/28/test )
120126
add_subdirectory( src/ENDFtk/section/3/test )
121-
add_subdirectory( src/ENDFtk/section/33/CovariancePairs/test )
122-
add_subdirectory( src/ENDFtk/section/33/DerivedRatioToStandard/test )
123-
add_subdirectory( src/ENDFtk/section/33/DerivedRedundant/test )
124-
add_subdirectory( src/ENDFtk/section/33/ReactionBlock/test )
125-
add_subdirectory( src/ENDFtk/section/33/RectangularMatrix/test )
126-
add_subdirectory( src/ENDFtk/section/33/SquareMatrix/test )
127+
add_subdirectory( src/ENDFtk/section/31/test )
128+
add_subdirectory( src/ENDFtk/section/32/151/ScatteringRadiusCovariances/test )
129+
add_subdirectory( src/ENDFtk/section/32/151/LimitedBreitWignerLValue/Resonance/test )
130+
add_subdirectory( src/ENDFtk/section/32/151/LimitedBreitWignerLValue/test )
131+
add_subdirectory( src/ENDFtk/section/32/151/LimitedSingleLevelBreitWigner/test )
132+
add_subdirectory( src/ENDFtk/section/32/151/LimitedMultiLevelBreitWigner/test )
133+
add_subdirectory( src/ENDFtk/section/32/151/ShortRangeBreitWignerBlock/test )
134+
add_subdirectory( src/ENDFtk/section/32/151/ShortRangeReichMooreBlock/test )
135+
add_subdirectory( src/ENDFtk/section/32/151/ShortRangeRMatrixLimitedBlock/ResonanceParameters/test )
136+
add_subdirectory( src/ENDFtk/section/32/151/ShortRangeRMatrixLimitedBlock/CovarianceMatrix/test )
137+
add_subdirectory( src/ENDFtk/section/32/151/ShortRangeRMatrixLimitedBlock/test )
138+
add_subdirectory( src/ENDFtk/section/32/151/ReichMooreScatteringRadiusUncertainties/test )
139+
add_subdirectory( src/ENDFtk/section/32/151/GeneralMultiLevelBreitWigner/test )
140+
add_subdirectory( src/ENDFtk/section/32/151/GeneralReichMoore/test )
141+
add_subdirectory( src/ENDFtk/section/32/151/GeneralSingleLevelBreitWigner/test )
142+
add_subdirectory( src/ENDFtk/section/32/151/GeneralRMatrixLimited/test )
143+
add_subdirectory( src/ENDFtk/section/32/151/CompactCorrelationMatrix/test )
144+
add_subdirectory( src/ENDFtk/section/32/151/CompactBreitWignerUncertainties/Resonance/test )
145+
add_subdirectory( src/ENDFtk/section/32/151/CompactBreitWignerUncertainties/test )
146+
add_subdirectory( src/ENDFtk/section/32/151/CompactReichMooreUncertainties/Resonance/test )
147+
add_subdirectory( src/ENDFtk/section/32/151/CompactReichMooreUncertainties/test )
148+
add_subdirectory( src/ENDFtk/section/32/151/CompactSingleLevelBreitWigner/test )
149+
add_subdirectory( src/ENDFtk/section/32/151/CompactMultiLevelBreitWigner/test )
150+
add_subdirectory( src/ENDFtk/section/32/151/CompactReichMoore/test )
151+
add_subdirectory( src/ENDFtk/section/32/151/CompactRMatrixLimitedUncertainties/ParticlePairs/test )
152+
add_subdirectory( src/ENDFtk/section/32/151/CompactRMatrixLimitedUncertainties/ResonanceChannels/test )
153+
add_subdirectory( src/ENDFtk/section/32/151/CompactRMatrixLimitedUncertainties/ResonanceParameters/test )
154+
add_subdirectory( src/ENDFtk/section/32/151/CompactRMatrixLimitedUncertainties/SpinGroup/test )
155+
add_subdirectory( src/ENDFtk/section/32/151/CompactRMatrixLimitedUncertainties/test )
156+
add_subdirectory( src/ENDFtk/section/32/151/CompactRMatrixLimited/test )
157+
add_subdirectory( src/ENDFtk/section/32/151/UnresolvedRelativeCovariances/JValue/test )
158+
add_subdirectory( src/ENDFtk/section/32/151/UnresolvedRelativeCovariances/LValue/test )
159+
add_subdirectory( src/ENDFtk/section/32/151/UnresolvedRelativeCovariances/CovarianceMatrix/test )
160+
add_subdirectory( src/ENDFtk/section/32/151/UnresolvedRelativeCovariances/test )
127161
add_subdirectory( src/ENDFtk/section/33/test )
128-
add_subdirectory( src/ENDFtk/section/34/CovariancePairs/test )
129162
add_subdirectory( src/ENDFtk/section/34/LegendreBlock/test )
130163
add_subdirectory( src/ENDFtk/section/34/ReactionBlock/test )
131-
add_subdirectory( src/ENDFtk/section/34/RectangularMatrix/test )
132-
add_subdirectory( src/ENDFtk/section/34/SquareMatrix/test )
133164
add_subdirectory( src/ENDFtk/section/34/test )
165+
add_subdirectory( src/ENDFtk/section/35/SquareMatrix/test )
166+
add_subdirectory( src/ENDFtk/section/35/test )
134167
add_subdirectory( src/ENDFtk/section/4/Isotropic/test )
135168
add_subdirectory( src/ENDFtk/section/4/LegendreCoefficients/test )
136169
add_subdirectory( src/ENDFtk/section/4/LegendreDistributions/test )
137170
add_subdirectory( src/ENDFtk/section/4/MixedDistributions/test )
138171
add_subdirectory( src/ENDFtk/section/4/TabulatedDistribution/test )
139172
add_subdirectory( src/ENDFtk/section/4/TabulatedDistributions/test )
140173
add_subdirectory( src/ENDFtk/section/4/test )
174+
add_subdirectory( src/ENDFtk/section/40/LevelBlock/test )
175+
add_subdirectory( src/ENDFtk/section/40/test )
141176
add_subdirectory( src/ENDFtk/section/5/DistributionFunction/test )
142177
add_subdirectory( src/ENDFtk/section/5/EffectiveTemperature/test )
143178
add_subdirectory( src/ENDFtk/section/5/EvaporationSpectrum/test )
@@ -186,6 +221,8 @@ add_subdirectory( src/ENDFtk/section/7/4/ScatteringLawConstants/test )
186221
add_subdirectory( src/ENDFtk/section/7/4/TabulatedFunctions/ScatteringFunction/test )
187222
add_subdirectory( src/ENDFtk/section/7/4/TabulatedFunctions/test )
188223
add_subdirectory( src/ENDFtk/section/7/4/test )
224+
add_subdirectory( src/ENDFtk/section/7/451/ElementInformation/test )
225+
add_subdirectory( src/ENDFtk/section/7/451/test )
189226
add_subdirectory( src/ENDFtk/section/8/454/test )
190227
add_subdirectory( src/ENDFtk/section/8/457/AverageDecayEnergies/test )
191228
add_subdirectory( src/ENDFtk/section/8/457/ContinuousSpectrum/test )

0 commit comments

Comments
 (0)