Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DT majorant #106

Merged
merged 13 commits into from
Feb 6, 2024
Merged

DT majorant #106

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
35c9503
Adding majorant precalculation for DT
Jan 17, 2024
435aab7
Adjusting intTests adding majorant precalculation
Jan 17, 2024
18fbe55
Addressing comments
Jan 18, 2024
66efce6
Update aceNeutronDatabase_class.f90
valeriaRaffuzzi Jan 18, 2024
8c82ffb
Speeding up unionised majorant cross section pre calculation
Jan 24, 2024
acaebe0
Merge branch 'DTmajorant' of https://github.com/valeriaRaffuzzi/SCONE…
Jan 24, 2024
aa804fa
Merge branch 'main' into DTmajorant
valeriaRaffuzzi Jan 29, 2024
cb9a623
Remove unused procedures in aceNeutronDatabase
valeriaRaffuzzi Jan 29, 2024
0072e91
Typos and small fixes to DT majorant
Jan 31, 2024
efca20d
Merge branch 'DTmajorant' of https://github.com/valeriaRaffuzzi/SCONE…
Jan 31, 2024
04a3774
Add routines to calculate majorant also with ures on
Feb 5, 2024
b97e613
Typos and preventing out of bound array access
Feb 5, 2024
a651001
Typos
Feb 5, 2024
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
11 changes: 10 additions & 1 deletion NuclearData/ceNeutronData/aceDatabase/Tests/aceNeutronDatabase_iTest.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ subroutine test_aceNeutronDatabase()
! Initialise data
ptr => data
call data % init(dataDict, ptr, silent = .true.)
call data % activate([1,2])
call data % activate([1,2], silent = .true.)

!!<><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
!! Perform tests
Expand Down Expand Up @@ -223,6 +223,15 @@ subroutine test_aceNeutronDatabase()
p % E = 19.9_defReal
@assertEqual(ONE, data % getMajorantXS(p)/0.21869599644_defReal , TOL)

! Check that results are the same with on-the-fly majorant
data % hasMajorant = .false.

p % E = 1.1E-6_defReal
@assertEqual(ONE, data % getMajorantXS(p) /4.4149556129495560_defReal , TOL)

p % E = 19.9_defReal
@assertEqual(ONE, data % getMajorantXS(p)/0.21869599644_defReal , TOL)

!<><><><><><><><><><><><><><><><><><><><>
! Test getting Macroscopic XSs
!
Expand Down
2 changes: 1 addition & 1 deletion NuclearData/ceNeutronData/aceDatabase/Tests/thermalScatteringData_iTest.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ subroutine test_thermalScatteringData()
! Initialise data
ptr => data
call data % init(dataDict, ptr, silent = .true.)
call data % activate(([1,2]))
call data % activate(([1,2]), silent = .true.)

!!<><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
!! Perform tests
Expand Down
2 changes: 1 addition & 1 deletion NuclearData/ceNeutronData/aceDatabase/Tests/urrProbabilityTables_iTest.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ subroutine test_urrProbabilityTables()
! Initialise data
ptr => data
call data % init(dataDict, ptr, silent = .true.)
call data % activate([1])
call data % activate([1], silent = .true.)

!!<><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
!! Perform tests
Expand Down
Loading
Loading