Skip to content

Bug fix: Allocatable argument 'x' is not allocated #472 #474

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

Merged
merged 7 commits into from
Jul 25, 2021
Merged

Bug fix: Allocatable argument 'x' is not allocated #472 #474

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2374acb
Bug fix: Allocatable argument 'x' is not allocated #472
14NGiestas Jul 23, 2021
28ff356
Bug fix: Allocatable argument 'x' is not allocated #472
14NGiestas Jul 23, 2021
6364bc2
Bug fix: Allocatable argument 'x' is not allocated #472
14NGiestas Jul 23, 2021
f018414
Replace merge(n, 0, n > 0) by max(n, 0)
14NGiestas Jul 25, 2021
a0d2a03
Replace merge(n, 0, n > 0) by max(n, 0)
14NGiestas Jul 25, 2021
b66a7b3
Replace merge(n, 0, n > 0) by max(n, 0)
14NGiestas Jul 25, 2021
04f293d
Bug fix: Allocatable argument 'x' is not allocated #472
14NGiestas Jul 25, 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
24 changes: 12 additions & 12 deletions src/stdlib_math.fypp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ module stdlib_math
${t1}$, intent(in) :: end
integer, intent(in) :: n

${t1}$ :: res(n)
${t1}$ :: res(max(n, 0))
end function ${RName}$
#:endfor

Expand All @@ -77,7 +77,7 @@ module stdlib_math
${t1}$, intent(in) :: end
integer, intent(in) :: n

real(dp) :: res(n)
real(dp) :: res(max(n, 0))
end function ${RName}$
#:endfor

Expand Down Expand Up @@ -127,7 +127,7 @@ module stdlib_math
${t1}$, intent(in) :: end
integer, intent(in) :: n

${t1}$ :: res(n)
${t1}$ :: res(max(n, 0))
end function ${RName}$
#:endfor
#! Integer support
Expand Down Expand Up @@ -159,7 +159,7 @@ module stdlib_math
integer, intent(in) :: n
${t1}$, intent(in) :: base
! real(${k1}$) endpoints + real(${k1}$) base = real(${k1}$) result
${t1}$ :: res(n)
${t1}$ :: res(max(n, 0))
end function ${RName}$

#:set RName = rname("logspace", 1, t1, k1, "n_cbase")
Expand All @@ -169,7 +169,7 @@ module stdlib_math
integer, intent(in) :: n
complex(${k1}$), intent(in) :: base
! real(${k1}$) endpoints + complex(${k1}$) base = complex(${k1}$) result
${t1}$ :: res(n)
${t1}$ :: res(max(n, 0))
end function ${RName}$

#:set RName = rname("logspace", 1, t1, k1, "n_ibase")
Expand All @@ -179,7 +179,7 @@ module stdlib_math
integer, intent(in) :: n
integer, intent(in) :: base
! real(${k1}$) endpoints + integer base = real(${k1}$) result
${t1}$ :: res(n)
${t1}$ :: res(max(n, 0))
end function ${RName}$
#:endfor
#! ========================================================
Expand All @@ -196,7 +196,7 @@ module stdlib_math
integer, intent(in) :: n
real(${k1}$), intent(in) :: base
! complex(${k1}$) endpoints + real(${k1}$) base = complex(${k1}$) result
${t1}$ :: res(n)
${t1}$ :: res(max(n, 0))
end function ${RName}$

#:set RName = rname("logspace", 1, t1, k1, "n_cbase")
Expand All @@ -206,7 +206,7 @@ module stdlib_math
integer, intent(in) :: n
complex(${k1}$), intent(in) :: base
! complex(${k1}$) endpoints + complex(${k1}$) base = complex(${k1}$) result
${t1}$ :: res(n)
${t1}$ :: res(max(n, 0))
end function ${RName}$

#:set RName = rname("logspace", 1, t1, k1, "n_ibase")
Expand All @@ -216,7 +216,7 @@ module stdlib_math
integer, intent(in) :: n
integer, intent(in) :: base
! complex(${k1}$) endpoints + integer base = complex(${k1}$) result
${t1}$ :: res(n)
${t1}$ :: res(max(n, 0))
end function ${RName}$
#:endfor
#! ========================================================
Expand All @@ -234,7 +234,7 @@ module stdlib_math
integer, intent(in) :: n
real(${k1}$), intent(in) :: base
! integer endpoints + real(${k1}$) base = real(${k1}$) result
real(${k1}$) :: res(n)
real(${k1}$) :: res(max(n, 0))
end function ${RName}$

#:set RName = rname("logspace", 1, "integer(int32)", "int32", "n_c" + str(k1) + "base")
Expand All @@ -244,7 +244,7 @@ module stdlib_math
integer, intent(in) :: n
complex(${k1}$), intent(in) :: base
! integer endpoints + complex(${k1}$) base = complex(${k1}$) result
complex(${k1}$) :: res(n)
complex(${k1}$) :: res(max(n, 0))
end function ${RName}$
#:endfor

Expand All @@ -255,7 +255,7 @@ module stdlib_math
integer, intent(in) :: n
integer, intent(in) :: base
! integer endpoints + integer base = integer result
integer :: res(n)
integer :: res(max(n, 0))
end function ${RName}$


Expand Down
4 changes: 2 additions & 2 deletions src/stdlib_math_linspace.fypp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ contains
${t1}$, intent(in) :: end
integer, intent(in) :: n

${t1}$ :: res(n)
${t1}$ :: res(merge(n, 0, n > 0))

integer :: i ! Looping index
${t1}$ :: interval ! Difference between adjacent elements
Expand Down Expand Up @@ -94,4 +94,4 @@ contains
end procedure ${RName}$
#:endfor

end submodule
end submodule
12 changes: 6 additions & 6 deletions src/stdlib_math_logspace.fypp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,21 @@ contains
#:for k1, t1 in RC_KINDS_TYPES
#:set RName = rname("logspace", 1, t1, k1, "n_rbase")
module procedure ${RName}$
${t1}$ :: exponents(n)
${t1}$ :: exponents(merge(n, 0, n > 0))
exponents = linspace(start, end, n)
res = base ** exponents
end procedure

#:set RName = rname("logspace", 1, t1, k1, "n_cbase")
module procedure ${RName}$
${t1}$ :: exponents(n)
${t1}$ :: exponents(merge(n, 0, n > 0))
exponents = linspace(start, end, n)
res = base ** exponents
end procedure

#:set RName = rname("logspace", 1, t1, k1, "n_ibase")
module procedure ${RName}$
${t1}$ :: exponents(n)
${t1}$ :: exponents(merge(n, 0, n > 0))
exponents = linspace(start, end, n)
res = base ** exponents
end procedure
Expand All @@ -69,22 +69,22 @@ contains
#:for k1 in REAL_KINDS
#:set RName = rname("logspace", 1, "integer(int32)", "int32", "n_r" + str(k1) + "base")
module procedure ${RName}$
integer :: exponents(n)
integer :: exponents(merge(n, 0, n > 0))
exponents = linspace(start, end, n)
res = base ** exponents
end procedure

#:set RName = rname("logspace", 1, "integer(int32)", "int32", "n_c" + str(k1) + "base")
module procedure ${RName}$
integer :: exponents(n)
integer :: exponents(merge(n, 0, n > 0))
exponents = linspace(start, end, n)
res = base ** exponents
end procedure
#:endfor

#:set RName = rname("logspace", 1, "integer(int32)", "int32", "n_ibase")
module procedure ${RName}$
integer :: exponents(n)
integer :: exponents(merge(n, 0, n > 0))
exponents = linspace(start, end, n)
res = base ** exponents
end procedure
Expand Down