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

Parse non-scientific reals using exponents rather than factors #3067

Merged
merged 2 commits into from
Feb 27, 2024
Merged

Parse non-scientific reals using exponents rather than factors #3067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70fb106
Parse non-scientific reals using exponents rather than factors
timothy-nunn Feb 21, 2024
a44852e
Add tests for parsing real inputs in IN.DAT
timothy-nunn Feb 21, 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
8 changes: 4 additions & 4 deletions source/fortran/input.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4082,7 +4082,7 @@ subroutine string_to_real(string,length,rval,icode)

! Local variables

real(dp) :: valbdp,valadp,xfact
real(dp) :: valbdp,valadp,xexp
integer :: iptr,izero,iexpon
logical :: negatm,negate

Expand Down Expand Up @@ -4142,7 +4142,7 @@ subroutine string_to_real(string,length,rval,icode)
! *** Parse the mantissa - before the decimal point

valbdp = 0.0D0
xfact = 0.1D0
xexp = -1.0D0
20 continue
if ((string(iptr:iptr) >= '0').and.(string(iptr:iptr) <= '9')) then
valbdp = (valbdp * 10.0D0) + dble(ichar(string(iptr:iptr))-izero)
Expand All @@ -4163,8 +4163,8 @@ subroutine string_to_real(string,length,rval,icode)
valadp = 0.0D0
30 continue
if ((string(iptr:iptr) >= '0').and.(string(iptr:iptr) <= '9')) then
valadp = valadp + (dble(ichar(string(iptr:iptr))-izero)*xfact)
xfact = xfact * 0.1D0
valadp = valadp + (dble(ichar(string(iptr:iptr))-izero)*(10.0D0 ** xexp))
xexp = xexp - 1.0D0
iptr = iptr + 1
if (iptr > length) goto 50
goto 30
Expand Down
60 changes: 60 additions & 0 deletions tests/unit/test_input.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
import pytest
from process import fortran


def _create_input_file(directory, content: str):
file_location = directory / "IN.DAT"
with open(file_location, "w") as f:
f.write(content)

return str(file_location)


@pytest.mark.parametrize(
["epsvmc", "expected"],
[
(string, 1.0)
for string in [
"1.0",
"1.0D0",
"1.0d0",
"1.0e0",
"1.0E0",
"1.0D+0",
"1.0d+0",
"1.0e+0",
"1.0E+0",
"1.0D-0",
"1.0d-0",
"1.0e-0",
"1.0E-0",
"0.10D1",
"0.10d1",
"0.10E1",
"0.10e1",
"0.10D+1",
"0.10d+1",
"0.10E+1",
"0.10e+1",
"10.0D-1",
"10.0d-1",
"10.0E-1",
"10.0e-1",
]
]
+ [
(string, 0.0080000000000000002)
for string in ["0.008", "8.0E-3", "8.0D-3", "8.0d-3", "8.0e-3"]
],
)
def test_parse_real(epsvmc, expected, tmp_path):
"""Tests the parsing of real numbers into PROCESS.

Program to get the expected value for 0.008 provided at https://github.com/ukaea/PROCESS/pull/3067
"""
fortran.global_variables.fileprefix = _create_input_file(
tmp_path, f"epsvmc = {epsvmc}"
)
fortran.init_module.init()

assert fortran.numerics.epsvmc.item() == expected
Loading