From a52f54a9a00a8b5996fb3dac61d62e372ec960b6 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 21 Feb 2018 14:37:02 +0100 Subject: [PATCH] fixed typo in prime number list and extended to 1600 values source https://people.sc.fsu.edu/~jburkardt/f_src/halton/halton.f90 --- src/math.f90 | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/math.f90 b/src/math.f90 index 2eda31097..b6e3658e9 100644 --- a/src/math.f90 +++ b/src/math.f90 @@ -2447,7 +2447,7 @@ subroutine halton_memory (action_halton, name_halton, ndim, value_halton) implicit none integer(pInt), intent(in) :: n !< index of the desired prime number - integer(pInt), dimension(0:1500), parameter :: & + integer(pInt), dimension(0:1600), parameter :: & npvec = int([& 1, & 2, 3, 5, 7, 11, 13, 17, 19, 23, 29, & @@ -2595,7 +2595,7 @@ subroutine halton_memory (action_halton, name_halton, ndim, value_halton) ! 1301:1400 10663, 10667, 10687, 10691, 10709, 10711, 10723, 10729, 10733, 10739, & 10753, 10771, 10781, 10789, 10799, 10831, 10837, 10847, 10853, 10859, & - 10861, 10867, 10883, 10889, 10891, 10903, 10909, 19037, 10939, 10949, & + 10861, 10867, 10883, 10889, 10891, 10903, 10909, 10937, 10939, 10949, & 10957, 10973, 10979, 10987, 10993, 11003, 11027, 11047, 11057, 11059, & 11069, 11071, 11083, 11087, 11093, 11113, 11117, 11119, 11131, 11149, & 11159, 11161, 11171, 11173, 11177, 11197, 11213, 11239, 11243, 11251, & @@ -2613,8 +2613,19 @@ subroutine halton_memory (action_halton, name_halton, ndim, value_halton) 12227, 12239, 12241, 12251, 12253, 12263, 12269, 12277, 12281, 12289, & 12301, 12323, 12329, 12343, 12347, 12373, 12377, 12379, 12391, 12401, & 12409, 12413, 12421, 12433, 12437, 12451, 12457, 12473, 12479, 12487, & - 12491, 12497, 12503, 12511, 12517, 12527, 12539, 12541, 12547, 12553],pInt) - + 12491, 12497, 12503, 12511, 12517, 12527, 12539, 12541, 12547, 12553, & + ! 1501:1600 + 12569, 12577, 12583, 12589, 12601, 12611, 12613, 12619, 12637, 12641, & + 12647, 12653, 12659, 12671, 12689, 12697, 12703, 12713, 12721, 12739, & + 12743, 12757, 12763, 12781, 12791, 12799, 12809, 12821, 12823, 12829, & + 12841, 12853, 12889, 12893, 12899, 12907, 12911, 12917, 12919, 12923, & + 12941, 12953, 12959, 12967, 12973, 12979, 12983, 13001, 13003, 13007, & + 13009, 13033, 13037, 13043, 13049, 13063, 13093, 13099, 13103, 13109, & + 13121, 13127, 13147, 13151, 13159, 13163, 13171, 13177, 13183, 13187, & + 13217, 13219, 13229, 13241, 13249, 13259, 13267, 13291, 13297, 13309, & + 13313, 13327, 13331, 13337, 13339, 13367, 13381, 13397, 13399, 13411, & + 13417, 13421, 13441, 13451, 13457, 13463, 13469, 13477, 13487, 13499],pInt) + if (n < size(npvec)) then prime = npvec(n) else