Skip to content

Commit 6373e1a

Browse files
whaeckwhaeck
committed
Renamed file properly, corrected unit test config
1 parent 914d02a commit 6373e1a

4 files changed

Lines changed: 71 additions & 69 deletions

File tree

‎python/src/ACEtk.python.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ namespace block {
106106
void wrapPhotoatomicElectronCrossSectionBlock( python::module&, python::module& );
107107
void wrapPhotoatomicElectronExcitationBlock( python::module&, python::module& );
108108
void wrapPhotoatomicElectronBremsstrahlungBlock( python::module&, python::module& );
109+
void wrapPhotoelectricCrossSectionBlock( python::module&, python::module& );
109110
}
110111

111112
// declarations - ACE table types
@@ -238,6 +239,7 @@ PYBIND11_MODULE( ACEtk, module ) {
238239
block::wrapPhotoatomicElectronCrossSectionBlock( module, viewmodule );
239240
block::wrapPhotoatomicElectronExcitationBlock( module, viewmodule );
240241
block::wrapPhotoatomicElectronBremsstrahlungBlock( module, viewmodule );
242+
block::wrapPhotoelectricCrossSectionBlock( module, viewmodule );
241243

242244
// wrap ACE table types
243245
wrapContinuousEnergyTable( module, viewmodule );

‎python/test/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,6 @@ add_test( NAME ACEtk.python.block.PhotoatomicElectronSubshellBlock COMMAND ${PYT
7474
add_test( NAME ACEtk.python.block.PhotoatomicElectronCrossSectionBlock COMMAND ${PYTHON_EXECUTABLE} -m unittest -v test/block/Test_ACEtk_PhotoatomicElectronCrossSectionBlock.py WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/python )
7575
add_test( NAME ACEtk.python.block.PhotoatomicElectronExcitationBlock COMMAND ${PYTHON_EXECUTABLE} -m unittest -v test/block/Test_ACEtk_PhotoatomicElectronExcitationBlock.py WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/python )
7676
add_test( NAME ACEtk.python.block.PhotoatomicElectronBremsstrahlungBlock COMMAND ${PYTHON_EXECUTABLE} -m unittest -v test/block/Test_ACEtk_PhotoatomicElectronExcitationBlock.py WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/python )
77-
add_test( NAME ACEtk.python.block.PhotoelectricCrossSectionBlock COMMAND ${PYTHON_EXECUTABLE} -m unittest -v test/block/Test_ACEtk_PhotoatomicElectronCrossSectionBlock.py WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/python )
77+
add_test( NAME ACEtk.python.block.PhotoelectricCrossSectionBlock COMMAND ${PYTHON_EXECUTABLE} -m unittest -v test/block/Test_ACEtk_PhotoelectricCrossSectionBlock.py WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/python )
7878
add_test( NAME ACEtk.python.block.PhotonuclearPrincipalCrossSectionBlock COMMAND ${PYTHON_EXECUTABLE} -m unittest -v test/block/Test_ACEtk_PhotonuclearPrincipalCrossSectionBlock.py WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/python )
7979
add_test( NAME ACEtk.python.block.PhotonuclearSecondaryParticleLocatorBlock COMMAND ${PYTHON_EXECUTABLE} -m unittest -v test/block/Test_ACEtk_PhotonuclearSecondaryParticleLocatorBlock.py WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/python )

‎python/test/block/Test_ACEtk_PhotelectricCrossSectionBlock.py‎

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎python/test/block/Test_ACEtk_PhotoelectricCrossSectionBlock.py‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# standard imports
2+
import unittest
3+
4+
# third party imports
5+
6+
# local imports
7+
from ACEtk import PhotoelectricCrossSectionBlock
8+
9+
class Test_ACEtk_PhotoelectricCrossSectionBlock( unittest.TestCase ) :
10+
"""Unit test for the PhotoelectricCrossSectionBlock class."""
11+
12+
chunk = [ 1., 2., 3., 4., 5.,
13+
6., 7., 8., 9., 10.,
14+
11., 12., 13., 14., 15. ]
15+
16+
def test_component( self ) :
17+
18+
def verify_chunk( self, chunk ) :
19+
20+
# verify content
21+
self.assertEqual( False, chunk.empty )
22+
self.assertEqual( 15, chunk.length )
23+
self.assertEqual( "SPHEL", chunk.name )
24+
25+
self.assertEqual( 15, len( chunk.xss_array ) )
26+
27+
self.assertEqual( 5, chunk.NES )
28+
self.assertEqual( 5, chunk.number_energy_points )
29+
self.assertEqual( 3, chunk.NSSH )
30+
self.assertEqual( 3, chunk.number_electron_subshells )
31+
32+
self.assertEqual( 5, len( chunk.photoelectric( 1 ) ) )
33+
self.assertEqual( 5, len( chunk.photoelectric( 2 ) ) )
34+
self.assertEqual( 5, len( chunk.photoelectric( 2 ) ) )
35+
36+
self.assertAlmostEqual( 1., chunk.photoelectric(1)[0] )
37+
self.assertAlmostEqual( 2., chunk.photoelectric(1)[1] )
38+
self.assertAlmostEqual( 3., chunk.photoelectric(1)[2] )
39+
self.assertAlmostEqual( 4., chunk.photoelectric(1)[3] )
40+
self.assertAlmostEqual( 5., chunk.photoelectric(1)[4] )
41+
self.assertAlmostEqual( 6., chunk.photoelectric(2)[0] )
42+
self.assertAlmostEqual( 7., chunk.photoelectric(2)[1] )
43+
self.assertAlmostEqual( 8., chunk.photoelectric(2)[2] )
44+
self.assertAlmostEqual( 9., chunk.photoelectric(2)[3] )
45+
self.assertAlmostEqual( 10., chunk.photoelectric(2)[4] )
46+
self.assertAlmostEqual( 11., chunk.photoelectric(3)[0] )
47+
self.assertAlmostEqual( 12., chunk.photoelectric(3)[1] )
48+
self.assertAlmostEqual( 13., chunk.photoelectric(3)[2] )
49+
self.assertAlmostEqual( 14., chunk.photoelectric(3)[3] )
50+
self.assertAlmostEqual( 15., chunk.photoelectric(3)[4] )
51+
52+
# verify the xss array
53+
xss = chunk.xss_array
54+
for index in range( chunk.length ) :
55+
56+
self.assertAlmostEqual( self.chunk[index], xss[index] )
57+
58+
# the data is given explicitly
59+
chunk = PhotoelectricCrossSectionBlock(
60+
photoelectric = [ [ 1., 2., 3., 4., 5. ],
61+
[ 6., 7., 8., 9., 10. ],
62+
[ 11., 12., 13., 14., 15. ] ] )
63+
64+
verify_chunk( self, chunk )
65+
66+
if __name__ == '__main__' :
67+
68+
unittest.main()

0 commit comments

Comments
 (0)