Skip to content

Commit 7642bea

Browse files
whaeckwhaeck
committed
More moving around things
1 parent 7fc1f6e commit 7642bea

115 files changed

Lines changed: 433 additions & 407 deletions

File tree

Some content is hidden

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

‎CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ if(ACEtk.python)
8383
python/src/ReferenceFrame.python.cpp
8484
python/src/AngularDistributionType.python.cpp
8585
python/src/EnergyDistributionType.python.cpp
86+
python/src/continuous.python.cpp
8687
python/src/continuous/InterpolationData.python.cpp
8788
python/src/continuous/CrossSectionData.python.cpp
8889
python/src/continuous/PrincipalCrossSectionBlock.python.cpp

‎cmake/unit_testing_python.cmake‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,64 @@ endfunction()
2222

2323
message( STATUS "Adding ACEtk Python unit testing" )
2424

25+
add_python_test( continuous.TwoBodyTransferDistribution continuous/Test_ACEtk_continuous_TwoBodyTransferDistribution )
26+
add_python_test( continuous.TabulatedSecondaryParticleMultiplicity continuous/Test_ACEtk_continuous_TabulatedSecondaryParticleMultiplicity )
27+
add_python_test( continuous.TabulatedMultiplicity continuous/Test_ACEtk_continuous_TabulatedMultiplicity )
28+
add_python_test( continuous.TabulatedKalbachMannDistribution continuous/Test_ACEtk_continuous_TabulatedKalbachMannDistribution )
29+
add_python_test( continuous.TabulatedFissionMultiplicity continuous/Test_ACEtk_continuous_TabulatedFissionMultiplicity )
30+
add_python_test( continuous.TabulatedEnergyDistribution continuous/Test_ACEtk_continuous_TabulatedEnergyDistribution )
31+
add_python_test( continuous.TabulatedEnergyAngleDistribution continuous/Test_ACEtk_continuous_TabulatedEnergyAngleDistribution )
32+
add_python_test( continuous.TabulatedAngularDistributionWithProbability continuous/Test_ACEtk_continuous_TabulatedAngularDistributionWithProbability )
33+
add_python_test( continuous.TabulatedAngularDistribution continuous/Test_ACEtk_continuous_TabulatedAngularDistribution )
34+
add_python_test( continuous.TabulatedAngleEnergyDistribution continuous/Test_ACEtk_continuous_TabulatedAngleEnergyDistribution )
35+
add_python_test( continuous.SimpleMaxwellianFissionSpectrum continuous/Test_ACEtk_continuous_SimpleMaxwellianFissionSpectrum )
36+
add_python_test( continuous.SecondaryParticleTypeBlock continuous/Test_ACEtk_continuous_SecondaryParticleTypeBlock )
37+
add_python_test( continuous.SecondaryParticleProductionCrossSectionBlock continuous/Test_ACEtk_continuous_SecondaryParticleProductionCrossSectionBlock )
38+
add_python_test( continuous.SecondaryParticleProductionBlock continuous/Test_ACEtk_continuous_SecondaryParticleProductionBlock )
39+
add_python_test( continuous.SecondaryParticleLocatorBlock continuous/Test_ACEtk_continuous_SecondaryParticleLocatorBlock )
40+
add_python_test( continuous.SecondaryParticleInformationBlock continuous/Test_ACEtk_continuous_SecondaryParticleInformationBlock )
41+
add_python_test( continuous.SecondaryParticleEnergyDistributionBlock continuous/Test_ACEtk_continuous_SecondaryParticleEnergyDistributionBlock )
42+
add_python_test( continuous.SecondaryParticleAngularDistributionBlock continuous/Test_ACEtk_continuous_SecondaryParticleAngularDistributionBlock )
43+
add_python_test( continuous.ReactionQValueBlock continuous/Test_ACEtk_continuous_ReactionQValueBlock )
44+
add_python_test( continuous.ReactionNumberBlock continuous/Test_ACEtk_continuous_ReactionNumberBlock )
45+
add_python_test( continuous.ProbabilityTableBlock continuous/Test_ACEtk_continuous_ProbabilityTableBlock )
46+
add_python_test( continuous.ProbabilityTable continuous/Test_ACEtk_continuous_ProbabilityTable )
47+
add_python_test( continuous.PrincipalCrossSectionBlock continuous/Test_ACEtk_continuous_PrincipalCrossSectionBlock )
48+
add_python_test( continuous.PolynomialFissionMultiplicity continuous/Test_ACEtk_continuous_PolynomialFissionMultiplicity )
49+
add_python_test( continuous.PhotonProductionCrossSectionData continuous/Test_ACEtk_continuous_PhotonProductionCrossSectionData )
50+
add_python_test( continuous.PhotonProductionCrossSectionBlock continuous/Test_ACEtk_continuous_PhotonProductionCrossSectionBlock )
51+
add_python_test( continuous.PhotonProductionBlock continuous/Test_ACEtk_continuous_PhotonProductionBlock )
52+
add_python_test( continuous.ParameterData continuous/Test_ACEtk_continuous_ParameterData )
53+
add_python_test( continuous.OutgoingEnergyDistributionData continuous/Test_ACEtk_continuous_OutgoingEnergyDistributionData )
54+
add_python_test( continuous.NBodyPhaseSpaceDistribution continuous/Test_ACEtk_continuous_NBodyPhaseSpaceDistribution )
55+
add_python_test( continuous.MultiplicityReactionNumberBlock continuous/Test_ACEtk_continuous_MultiplicityReactionNumberBlock )
56+
add_python_test( continuous.MultiDistributionData continuous/Test_ACEtk_continuous_MultiDistributionData )
57+
add_python_test( continuous.LevelScatteringDistribution continuous/Test_ACEtk_continuous_LevelScatteringDistribution )
58+
add_python_test( continuous.KalbachMannDistributionData continuous/Test_ACEtk_continuous_KalbachMannDistributionData )
59+
add_python_test( continuous.IsotropicAngularDistribution continuous/Test_ACEtk_continuous_IsotropicAngularDistribution )
60+
add_python_test( continuous.InterpolationData continuous/Test_ACEtk_continuous_InterpolationData )
61+
add_python_test( continuous.GeneralEvaporationSpectrum continuous/Test_ACEtk_continuous_GeneralEvaporationSpectrum )
62+
add_python_test( continuous.FullyIsotropicDistribution continuous/Test_ACEtk_continuous_FullyIsotropicDistribution )
63+
add_python_test( continuous.FrameAndMultiplicityBlock continuous/Test_ACEtk_continuous_FrameAndMultiplicityBlock )
64+
add_python_test( continuous.FissionMultiplicityBlock continuous/Test_ACEtk_continuous_FissionMultiplicityBlock )
65+
add_python_test( continuous.EvaporationSpectrum continuous/Test_ACEtk_continuous_EvaporationSpectrum )
66+
add_python_test( continuous.EquiprobableOutgoingEnergyBins continuous/Test_ACEtk_continuous_EquiprobableOutgoingEnergyBins )
67+
add_python_test( continuous.EquiprobableOutgoingEnergyBinData continuous/Test_ACEtk_continuous_EquiprobableOutgoingEnergyBinData )
68+
add_python_test( continuous.EquiprobableAngularBins continuous/Test_ACEtk_continuous_EquiprobableAngularBins )
69+
add_python_test( continuous.EnergyDistributionBlock continuous/Test_ACEtk_continuous_EnergyDistributionBlock )
70+
add_python_test( continuous.EnergyDependentWattSpectrum continuous/Test_ACEtk_continuous_EnergyDependentWattSpectrum )
71+
add_python_test( continuous.EnergyAngleDistributionData continuous/Test_ACEtk_continuous_EnergyAngleDistributionData )
72+
add_python_test( continuous.DistributionProbability continuous/Test_ACEtk_continuous_DistributionProbability )
73+
add_python_test( continuous.DistributionGivenElsewhere continuous/Test_ACEtk_continuous_DistributionGivenElsewhere )
74+
add_python_test( continuous.DiscretePhotonDistribution continuous/Test_ACEtk_continuous_DiscretePhotonDistribution )
75+
add_python_test( continuous.DelayedNeutronPrecursorData continuous/Test_ACEtk_continuous_DelayedNeutronPrecursorData )
76+
add_python_test( continuous.DelayedNeutronPrecursorBlock continuous/Test_ACEtk_continuous_DelayedNeutronPrecursorBlock )
77+
add_python_test( continuous.CrossSectionData continuous/Test_ACEtk_continuous_CrossSectionData )
78+
add_python_test( continuous.CrossSectionBlock continuous/Test_ACEtk_continuous_CrossSectionBlock )
79+
add_python_test( continuous.AngularDistributionData continuous/Test_ACEtk_continuous_AngularDistributionData )
80+
add_python_test( continuous.AngularDistributionBlock continuous/Test_ACEtk_continuous_AngularDistributionBlock )
81+
add_python_test( continuous.AngleEnergyDistributionData continuous/Test_ACEtk_continuous_AngleEnergyDistributionData )
82+
2583
add_python_test( photonuclear.PrincipalCrossSectionBlock photonuclear/Test_ACEtk_photonuclear_PrincipalCrossSectionBlock.py )
2684
add_python_test( photonuclear.SecondaryParticleLocatorBlock photonuclear/Test_ACEtk_photonuclear_SecondaryParticleLocatorBlock.py )
2785

‎python/src/ACEtk.python.cpp‎

Lines changed: 2 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -24,76 +24,13 @@ void wrapAngularDistributionType( python::module&, python::module& );
2424
void wrapEnergyDistributionType( python::module&, python::module& );
2525

2626
// declarations - block and component subpackages
27+
void wrapContinuous( python::module&, python::module& );
2728
void wrapPhotoatomic( python::module&, python::module& );
2829
void wrapPhotonuclear( python::module&, python::module& );
2930
void wrapDosimetry( python::module&, python::module& );
3031
void wrapElectron( python::module&, python::module& );
3132
void wrapThermal( python::module&, python::module& );
3233

33-
namespace block {
34-
35-
// declarations - ACE data components
36-
void wrapInterpolationData( python::module&, python::module& );
37-
void wrapTabulatedFissionMultiplicity( python::module&, python::module& );
38-
void wrapPolynomialFissionMultiplicity( python::module&, python::module& );
39-
void wrapCrossSectionData( python::module&, python::module& );
40-
void wrapEquiprobableAngularBins( python::module&, python::module& );
41-
void wrapTabulatedAngularDistribution( python::module&, python::module& );
42-
void wrapTabulatedAngularDistributionWithProbability( python::module&, python::module& );
43-
void wrapIsotropicAngularDistribution( python::module&, python::module& );
44-
void wrapAngularDistributionData( python::module&, python::module& );
45-
void wrapFullyIsotropicDistribution( python::module&, python::module& );
46-
void wrapDistributionGivenElsewhere( python::module&, python::module& );
47-
void wrapEquiprobableOutgoingEnergyBins( python::module&, python::module& );
48-
void wrapEquiprobableOutgoingEnergyBinData( python::module&, python::module& );
49-
void wrapLevelScatteringDistribution( python::module&, python::module& );
50-
void wrapDiscretePhotonDistribution( python::module&, python::module& );
51-
void wrapTabulatedEnergyDistribution( python::module&, python::module& );
52-
void wrapOutgoingEnergyDistributionData( python::module&, python::module& );
53-
void wrapKalbachMannDistributionData( python::module&, python::module& );
54-
void wrapGeneralEvaporationSpectrum( python::module&, python::module& );
55-
void wrapSimpleMaxwellianFissionSpectrum( python::module&, python::module& );
56-
void wrapEvaporationSpectrum( python::module&, python::module& );
57-
void wrapParameterData( python::module&, python::module& );
58-
void wrapEnergyDependentWattSpectrum( python::module&, python::module& );
59-
void wrapTabulatedKalbachMannDistribution( python::module&, python::module& );
60-
void wrapNBodyPhaseSpaceDistribution( python::module&, python::module& );
61-
void wrapTwoBodyTransferDistribution( python::module&, python::module& );
62-
void wrapTabulatedEnergyAngleDistribution( python::module&, python::module& );
63-
void wrapEnergyAngleDistributionData( python::module&, python::module& );
64-
void wrapTabulatedAngleEnergyDistribution( python::module&, python::module& );
65-
void wrapAngleEnergyDistributionData( python::module&, python::module& );
66-
void wrapDistributionProbability( python::module&, python::module& );
67-
void wrapMultiDistributionData( python::module&, python::module& );
68-
void wrapTabulatedMultiplicity( python::module&, python::module& );
69-
void wrapTabulatedSecondaryParticleMultiplicity( python::module&, python::module& );
70-
void wrapPhotonProductionCrossSectionData( python::module&, python::module& );
71-
void wrapDelayedNeutronPrecursorData( python::module&, python::module& );
72-
void wrapProbabilityTable( python::module&, python::module& );
73-
74-
// declarations - ACE table blocks
75-
void wrapPrincipalCrossSectionBlock( python::module&, python::module& );
76-
void wrapFissionMultiplicityBlock( python::module&, python::module& );
77-
void wrapReactionNumberBlock( python::module&, python::module& );
78-
void wrapReactionQValueBlock( python::module&, python::module& );
79-
void wrapFrameAndMultiplicityBlock( python::module&, python::module& );
80-
void wrapCrossSectionBlock( python::module&, python::module& );
81-
void wrapPhotonProductionCrossSectionBlock( python::module&, python::module& );
82-
void wrapAngularDistributionBlock( python::module&, python::module& );
83-
void wrapSecondaryParticleAngularDistributionBlock( python::module&, python::module& );
84-
void wrapEnergyDistributionBlock( python::module&, python::module& );
85-
void wrapSecondaryParticleEnergyDistributionBlock( python::module&, python::module& );
86-
void wrapPhotonProductionBlock( python::module&, python::module& );
87-
void wrapMultiplicityReactionNumberBlock( python::module&, python::module& );
88-
void wrapDelayedNeutronPrecursorBlock( python::module&, python::module& );
89-
void wrapSecondaryParticleTypeBlock( python::module&, python::module& );
90-
void wrapSecondaryParticleInformationBlock( python::module&, python::module& );
91-
void wrapSecondaryParticleLocatorBlock( python::module&, python::module& );
92-
void wrapSecondaryParticleProductionBlock( python::module&, python::module& );
93-
void wrapSecondaryParticleProductionCrossSectionBlock( python::module&, python::module& );
94-
void wrapProbabilityTableBlock( python::module&, python::module& );
95-
}
96-
9734
// declarations - ACE table types
9835
void wrapContinuousEnergyTable( python::module&, python::module& );
9936
void wrapDosimetryTable( python::module&, python::module& );
@@ -143,68 +80,8 @@ PYBIND11_MODULE( ACEtk, module ) {
14380
wrapXsdirEntry( module, viewmodule );
14481
wrapXsdir( module, viewmodule );
14582

146-
// wrap data components
147-
block::wrapInterpolationData( module, viewmodule );
148-
block::wrapTabulatedFissionMultiplicity( module, viewmodule );
149-
block::wrapPolynomialFissionMultiplicity( module, viewmodule );
150-
block::wrapCrossSectionData( module, viewmodule );
151-
block::wrapEquiprobableAngularBins( module, viewmodule );
152-
block::wrapTabulatedAngularDistribution( module, viewmodule );
153-
block::wrapTabulatedAngularDistributionWithProbability( module, viewmodule );
154-
block::wrapIsotropicAngularDistribution( module, viewmodule );
155-
block::wrapAngularDistributionData( module, viewmodule );
156-
block::wrapFullyIsotropicDistribution( module, viewmodule );
157-
block::wrapDistributionGivenElsewhere( module, viewmodule );
158-
block::wrapLevelScatteringDistribution( module, viewmodule );
159-
block::wrapEquiprobableOutgoingEnergyBins( module, viewmodule );
160-
block::wrapEquiprobableOutgoingEnergyBinData( module, viewmodule );
161-
block::wrapDiscretePhotonDistribution( module, viewmodule );
162-
block::wrapTabulatedEnergyDistribution( module, viewmodule );
163-
block::wrapOutgoingEnergyDistributionData( module, viewmodule );
164-
block::wrapTabulatedKalbachMannDistribution( module, viewmodule );
165-
block::wrapGeneralEvaporationSpectrum( module, viewmodule );
166-
block::wrapSimpleMaxwellianFissionSpectrum( module, viewmodule );
167-
block::wrapEvaporationSpectrum( module, viewmodule );
168-
block::wrapParameterData( module, viewmodule );
169-
block::wrapEnergyDependentWattSpectrum( module, viewmodule );
170-
block::wrapKalbachMannDistributionData( module, viewmodule );
171-
block::wrapNBodyPhaseSpaceDistribution( module, viewmodule );
172-
block::wrapTwoBodyTransferDistribution( module, viewmodule );
173-
block::wrapTabulatedEnergyAngleDistribution( module, viewmodule );
174-
block::wrapEnergyAngleDistributionData( module, viewmodule );
175-
block::wrapTabulatedAngleEnergyDistribution( module, viewmodule );
176-
block::wrapAngleEnergyDistributionData( module, viewmodule );
177-
block::wrapDistributionProbability( module, viewmodule );
178-
block::wrapMultiDistributionData( module, viewmodule );
179-
block::wrapTabulatedSecondaryParticleMultiplicity( module, viewmodule );
180-
block::wrapTabulatedMultiplicity( module, viewmodule );
181-
block::wrapPhotonProductionCrossSectionData( module, viewmodule );
182-
block::wrapDelayedNeutronPrecursorData( module, viewmodule );
183-
block::wrapProbabilityTable( module, viewmodule );
184-
185-
// wrap ACE table blocks
186-
block::wrapPrincipalCrossSectionBlock( module, viewmodule );
187-
block::wrapFissionMultiplicityBlock( module, viewmodule );
188-
block::wrapReactionNumberBlock( module, viewmodule );
189-
block::wrapReactionQValueBlock( module, viewmodule );
190-
block::wrapFrameAndMultiplicityBlock( module, viewmodule );
191-
block::wrapCrossSectionBlock( module, viewmodule );
192-
block::wrapPhotonProductionCrossSectionBlock( module, viewmodule );
193-
block::wrapAngularDistributionBlock( module, viewmodule );
194-
block::wrapSecondaryParticleAngularDistributionBlock( module, viewmodule );
195-
block::wrapEnergyDistributionBlock( module, viewmodule );
196-
block::wrapPhotonProductionBlock( module, viewmodule );
197-
block::wrapMultiplicityReactionNumberBlock( module, viewmodule );
198-
block::wrapDelayedNeutronPrecursorBlock( module, viewmodule );
199-
block::wrapSecondaryParticleEnergyDistributionBlock( module, viewmodule );
200-
block::wrapSecondaryParticleTypeBlock( module, viewmodule );
201-
block::wrapSecondaryParticleInformationBlock( module, viewmodule );
202-
block::wrapSecondaryParticleLocatorBlock( module, viewmodule );
203-
block::wrapSecondaryParticleProductionBlock( module, viewmodule );
204-
block::wrapSecondaryParticleProductionCrossSectionBlock( module, viewmodule );
205-
block::wrapProbabilityTableBlock( module, viewmodule );
206-
20783
// component and block subpackages
84+
wrapContinuous( module, viewmodule );
20885
wrapPhotoatomic( module, viewmodule );
20986
wrapPhotonuclear( module, viewmodule );
21087
wrapDosimetry( module, viewmodule );

0 commit comments

Comments
 (0)