Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
c509240
Added the MF9 section, updated code for file 9
whaeck Feb 17, 2021
75b23d1
Added MF9 python bindings
whaeck Feb 17, 2021
1e2294a
Bound MF9 in darkness
whaeck Feb 18, 2021
ae6f914
Started Base for GENDF section and added GENDF DataRecord.
nathangibson14 Feb 18, 2021
dd08c56
Added MF10 coding
whaeck Feb 18, 2021
3364cf1
Small updates to MF9
whaeck Feb 18, 2021
35e6f9f
Added DataRecords to SectionBase.
nathangibson14 Feb 18, 2021
a240345
Added documentation.
nathangibson14 Feb 18, 2021
64a196a
MF10 has been bound in darkness
whaeck Feb 18, 2021
531d351
Renamed MF9 Multiplicity to ReactionProduct
whaeck Feb 18, 2021
4aaacc6
Added CrossSection as a GENDF section.
nathangibson14 Feb 18, 2021
9e851ed
Replaced the MF9 and MF10 subsection by ReactionProduct subsections, …
whaeck Feb 18, 2021
3032650
Added some missing documentation.
nathangibson14 Feb 19, 2021
88ddfa7
Updates after Wim's comments.
nathangibson14 Feb 19, 2021
932e8de
Trying to debug SegFault on ENDFtk.gendf.CrossSection.test.
nathangibson14 Feb 20, 2021
4c8873c
Fixed that SegFault.
nathangibson14 Feb 20, 2021
53a8f6e
Added FissionYielData and FissionProduct, main components of MF8 MT45…
whaeck Feb 23, 2021
d9350a5
Added python bindings for FissionYieldData
whaeck Feb 23, 2021
143c412
Some updates to the previous components
whaeck Feb 23, 2021
1966aed
More changes to the interface
whaeck Feb 23, 2021
5262e3e
Finished MF8 MT454
whaeck Feb 24, 2021
bca97e8
Bound MF8 MT454 in darkness
whaeck Feb 27, 2021
6d84121
MF8 MT459 has been bound in darkness
whaeck Feb 27, 2021
2ffff73
Added the LI flag for fully isotropic angular distributions to MF4 co…
whaeck Feb 27, 2021
6cd2452
Added Isotropic angular distributions
whaeck Mar 15, 2021
2ebe1e3
Added the isotropic angular distribution for a discrete photon
whaeck Mar 15, 2021
cccab26
Added Legendre and tabulated angular distribution components
whaeck Mar 15, 2021
6009ed3
Added Legendre angular distributions for a specific discrete photon
whaeck Mar 16, 2021
04c97b9
Saving work
whaeck Mar 17, 2021
4a59dd5
Finished coding MF14, on to testing
whaeck Mar 17, 2021
2686f29
Almost done ...
whaeck Mar 17, 2021
9f0b9e4
Forgot to update some tests following interface changes
whaeck Mar 17, 2021
ea44ab4
Updated MF14 coding, works now, still needs MF14 section test
whaeck Mar 18, 2021
0459e2d
Bound MF14 in darkness
whaeck Mar 22, 2021
54b2176
Update to latest develop
whaeck Mar 31, 2021
bd736a0
Update to latest develop
whaeck Mar 31, 2021
ecd8570
Update to latest develop
whaeck Mar 31, 2021
ba5aef7
Update to latest develop
whaeck Mar 31, 2021
96681dc
Started work on MF15
whaeck Mar 31, 2021
040714f
Added PartialDistribution to MF15
whaeck Apr 6, 2021
8478722
Finished C++ side of MF15
whaeck Apr 6, 2021
134a45b
Started binding MF15
whaeck Apr 6, 2021
8948bb2
Merged MF8 branch
whaeck Apr 6, 2021
4790ba3
Merged MF10 branch
whaeck Apr 6, 2021
915a054
Forgot to put MF14 object back in variant.
whaeck Apr 6, 2021
37118f4
Merged MF14 branch
whaeck Apr 6, 2021
1b604b4
MF15 was bound in darkness
whaeck Apr 6, 2021
4b0f6fc
Updated basic ENDF record interfaces to range-v3 0.11.0
whaeck Apr 7, 2021
3c44cd8
Updated MF1 sections
whaeck Apr 7, 2021
93cbe24
Updated MF1
whaeck Apr 7, 2021
66505a6
Updated MF2 sections
whaeck Apr 7, 2021
f6a6d09
Updated MF7 sections
whaeck Apr 7, 2021
7595d0d
Updated MF9 and MF10 sections
whaeck Apr 7, 2021
c4770a7
Updated MF3, MF4 and MF5 sections
whaeck Apr 7, 2021
2163335
Updated MF12, MF13, MF14 and MF15
whaeck Apr 7, 2021
4136d55
Updated MF8 sections
whaeck Apr 7, 2021
a9c43ff
Updated MF6 section, the ENDFtk tree and Material and Tape
whaeck Apr 7, 2021
fe04b4d
Updated python bindings
whaeck Apr 7, 2021
dbf04fd
Adding g++-9 to actions again
whaeck Apr 8, 2021
23b1847
Some more cpp20 namespace updates
whaeck Apr 15, 2021
b166bc4
Oops ...
whaeck Apr 15, 2021
f100c41
Updated build system files
whaeck Apr 15, 2021
4302afc
Moving range-v3 update to gendf work
whaeck Apr 16, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updated python bindings
  • Loading branch information
whaeck committed Apr 7, 2021
commit fe04b4d07c9c185aa90db8846ee1f6c6308c12aa
2 changes: 1 addition & 1 deletion python/src/section/1/451.python.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ void wrapSection_1_451( python::module& module, python::module& viewmodule ) {

"description",
[] ( const Section& type ) -> std::string
{ return type.description(); },
{ return ranges::to< std::string >( type.description() ); },
"The descriptive information"
)
.def_property_readonly(
Expand Down
2 changes: 1 addition & 1 deletion python/src/section/8/457/DecayModes.python.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ void wrapDecayModes( python::module& module, python::module& ) {

"decay_modes",
[] ( const Component& self ) -> std::vector< DecayMode >
{ return self.decayModes(); },
{ return ranges::to< std::vector< DecayMode > >( self.decayModes() ); },
"The decay mode information"
);

Expand Down
6 changes: 3 additions & 3 deletions python/src/tree/File.python.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

// local includes
#include "ENDFtk/tree/Tape.hpp"
#include "range/v3/utility/iterator.hpp"
#include "range/v3/range/operations.hpp"
#include "views.hpp"

// namespace aliases
Expand Down Expand Up @@ -105,7 +105,7 @@ void wrapTreeFile( python::module& module, python::module& viewmodule ) {

"section_numbers",
[] ( const File& self ) -> std::vector< int >
{ return self.sectionNumbers(); },
{ return ranges::to< std::vector< int > >( self.sectionNumbers() ); },
"All section numbers in the file"
)
.def_property_readonly(
Expand Down Expand Up @@ -169,7 +169,7 @@ void wrapTreeFile( python::module& module, python::module& viewmodule ) {

"content",
[] ( const File& self ) -> std::string
{ return self.buffer(); },
{ return ranges::to< std::string >( self.buffer() ); },
"The content of the file"
);
}
6 changes: 3 additions & 3 deletions python/src/tree/Material.python.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// local includes
#include "ENDFtk/Material.hpp"
#include "ENDFtk/tree/Tape.hpp"
#include "range/v3/utility/iterator.hpp"
#include "range/v3/range/operations.hpp"
#include "views.hpp"

// namespace aliases
Expand Down Expand Up @@ -80,7 +80,7 @@ void wrapTreeMaterial( python::module& module, python::module& viewmodule ) {

"file_numbers",
[] ( const Material& self ) -> std::vector< int >
{ return self.fileNumbers(); },
{ return ranges::to< std::vector< int > >( self.fileNumbers() ); },
"All file numbers in the material"
)
.def_property_readonly(
Expand All @@ -94,7 +94,7 @@ void wrapTreeMaterial( python::module& module, python::module& viewmodule ) {

"content",
[] ( const Material& self ) -> std::string
{ return self.buffer(); },
{ return ranges::to< std::string >( self.buffer() ); },
"The content of the material"
)
.def(
Expand Down
4 changes: 2 additions & 2 deletions python/src/tree/Section.python.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

// local includes
#include "ENDFtk/tree/Tape.hpp"
#include "range/v3/utility/iterator.hpp"
#include "range/v3/range/operations.hpp"
#include "views.hpp"

// namespace aliases
Expand Down Expand Up @@ -193,7 +193,7 @@ void wrapTreeSection( python::module& module, python::module& ) {

"content",
[] ( const Section& self ) -> std::string
{ return self.buffer(); },
{ return ranges::to< std::string >( self.buffer() ); },
"The content of the section"
);
}
3 changes: 2 additions & 1 deletion python/src/tree/Tape.python.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "ENDFtk/tree/Tape.hpp"
#include "ENDFtk/tree/makeTape.hpp"
#include "ENDFtk/tree/fromFile.hpp"
#include "range/v3/range/operations.hpp"
#include "views.hpp"

// namespace aliases
Expand Down Expand Up @@ -141,7 +142,7 @@ void wrapTreeTape( python::module& module, python::module& viewmodule ) {

"content",
[] ( const Tape& self ) -> std::string
{ return self.buffer(); },
{ return ranges::to< std::string >( self.buffer() ); },
"The content of the tape"
)
.def_static(
Expand Down
15 changes: 6 additions & 9 deletions python/src/views.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@
#include <pybind11/stl.h>
#include <pybind11/complex.h>
#include "range/v3/view/any_view.hpp"
#include "range/v3/distance.hpp"
#include "range/v3/index.hpp"
#include "range/v3/front.hpp"
#include "range/v3/utility/iterator.hpp"
#include "range/v3/to_container.hpp"
#include "range/v3/range/conversion.hpp"
#include "range/v3/range/operations.hpp"

namespace python = pybind11;

Expand Down Expand Up @@ -92,13 +89,13 @@ void wrapBasicBidirectionalAnyViewOf( python::module& module, const std::string&
.def( "to_list",
[] ( BasicBidirectionalAnyView< Element >& view )
-> std::vector< Element >
{ return view; },
{ return ranges::to< std::vector< Element > >( view ); },
"Convert the sequence to a list (this is a deep copy for primitive\n"
"types (like integer and floats) and a shallow copy for custom types" )
.def( "copy",
[] ( BasicRandomAccessAnyView< Element >& view )
-> std::vector< CopyElement >
{ return view; },
{ return ranges::to< std::vector< CopyElement > >( view ); },
"Copy the sequence to a list (this is a deep copy for both primitive\n"
"types (like integer and floats) and custom types" );
}
Expand Down Expand Up @@ -178,13 +175,13 @@ void wrapBasicRandomAccessAnyViewOf( python::module& module, const std::string&
.def( "to_list",
[] ( BasicRandomAccessAnyView< Element >& view )
-> std::vector< Element >
{ return view; },
{ return ranges::to< std::vector< Element > >( view ); },
"Convert the sequence to a list (this is a deep copy for primitive\n"
"types (like integer and floats) and a shallow copy for custom types" )
.def( "copy",
[] ( BasicRandomAccessAnyView< Element >& view )
-> std::vector< CopyElement >
{ return view; },
{ return ranges::to< std::vector< CopyElement > >( view ); },
"Copy the sequence to a list (this is a deep copy for both primitive\n"
"types (like integer and floats) and custom types" );
}
Expand Down
4 changes: 2 additions & 2 deletions src/ENDFtk/test/isRedundant.test.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ SCENARIO( "Testing if MT number is a redundant ENDF reaction" ) {
const std::vector< int > redundantMTs{
1, 3, 4, 16, 18, 27, 101, 103, 104, 105, 106, 107
};
auto nonRedundantMTs = ranges::view::iota( 1, 999 )
| ranges::view::remove_if(
auto nonRedundantMTs = ranges::cpp20::views::iota( 1, 999 )
| ranges::views::remove_if(
[&](int MT ){ return ranges::binary_search( redundantMTs, MT ); } );

for( auto MT : nonRedundantMTs ){
Expand Down