refactor malloc (cherry pick from fm/task/UNST-9773_meteo_reader) #761
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Contributor
There was a problem hiding this comment. Did you see src\test\utils_lgpl\deltares_common\packages\test_deltares_common\src\test_malloc.f90? It has the FTNunit tests that I added in my first month. It's a part of https://issuetracker.deltares.nl/browse/UNST-8998 to port these to F90TW |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| module test_malloc | ||
| use assertions_gtest | ||
| use m_alloc | ||
| use precision, only: sp, dp | ||
| use ISO_C_BINDING | ||
|
|
||
| implicit none(type, external) | ||
|
|
||
| contains | ||
|
|
||
| !$f90tw TESTCODE(TEST, test_deltares_common_gtest, test_realloc_unallocated_with_fill, test_realloc_unallocated_with_fill, | ||
| !> Realloc on unallocated array should allocate and apply fill | ||
| subroutine test_realloc_unallocated_with_fill() bind(C) | ||
| real(dp), allocatable :: arr(:) | ||
| call realloc(arr, 5, fill=-999.0d0) | ||
| call f90_expect_true(allocated(arr)) | ||
| call f90_expect_eq(size(arr), 5) | ||
| call f90_expect_true(all(arr == -999.0d0)) | ||
|
Contributor
There was a problem hiding this comment. Please check if they are close, floating point comparisons can be really unstable |
||
| end subroutine test_realloc_unallocated_with_fill | ||
| !$f90tw) | ||
|
|
||
| !$f90tw TESTCODE(TEST, test_deltares_common_gtest, test_realloc_grow_keeps_existing, test_realloc_grow_keeps_existing, | ||
| !> Growing an array preserves existing data and fills new elements | ||
| subroutine test_realloc_grow_keeps_existing() bind(C) | ||
| real(dp), allocatable :: arr(:) | ||
| call realloc(arr, 3, fill=0.0d0) | ||
| arr(1) = 1.0d0; arr(2) = 2.0d0; arr(3) = 3.0d0 | ||
|
Contributor
There was a problem hiding this comment. I see semicolons, you can run the fortran_styler |
||
| call realloc(arr, 5, fill=-1.0d0, keepExisting=.true.) | ||
| call f90_expect_eq(size(arr), 5) | ||
| call f90_expect_true(arr(1) == 1.0d0 .and. arr(2) == 2.0d0 .and. arr(3) == 3.0d0) | ||
|
Contributor
There was a problem hiding this comment. You can use integers if you want to test for equality |
||
| call f90_expect_true(arr(4) == -1.0d0 .and. arr(5) == -1.0d0) | ||
| end subroutine test_realloc_grow_keeps_existing | ||
| !$f90tw) | ||
|
|
||
| !$f90tw TESTCODE(TEST, test_deltares_common_gtest, test_realloc_shrink_keeps_existing, test_realloc_shrink_keeps_existing, | ||
| !> Shrinking an array preserves data up to new size | ||
| subroutine test_realloc_shrink_keeps_existing() bind(C) | ||
| real(dp), allocatable :: arr(:) | ||
| call realloc(arr, 5, fill=0.0d0) | ||
| arr(1) = 1.0d0; arr(2) = 2.0d0; arr(3) = 3.0d0 | ||
| call realloc(arr, 2, keepExisting=.true.) | ||
| call f90_expect_eq(size(arr), 2) | ||
| call f90_expect_true(arr(1) == 1.0d0 .and. arr(2) == 2.0d0) | ||
| end subroutine test_realloc_shrink_keeps_existing | ||
| !$f90tw) | ||
|
|
||
| !$f90tw TESTCODE(TEST, test_deltares_common_gtest, test_realloc_same_bounds_no_keepexisting_fill, test_realloc_same_bounds_no_keepexisting_fill, | ||
| !> Same bounds + keepExisting=.false. + fill should overwrite in-place without reallocation | ||
| subroutine test_realloc_same_bounds_no_keepexisting_fill() bind(C) | ||
| real(dp), allocatable, target :: arr(:) | ||
| real(dp), pointer :: ptr_before | ||
| call realloc(arr, 3, fill=1.0d0) | ||
|
Contributor
There was a problem hiding this comment. I am seeing 1.0d0. Can you run the fortran_styler on this file? |
||
| ptr_before => arr(1) | ||
| call realloc(arr, 3, fill=-999.0d0, keepExisting=.false.) | ||
| call f90_expect_true(all(arr == -999.0d0)) | ||
| call f90_expect_true(associated(ptr_before, arr(1))) | ||
|
Contributor
There was a problem hiding this comment. That's nice, my first thought would be to compare the loc(arr) directly, but this is neat as well and perhaps even more meaningful |
||
| end subroutine test_realloc_same_bounds_no_keepexisting_fill | ||
| !$f90tw) | ||
|
|
||
| !$f90tw TESTCODE(TEST, test_deltares_common_gtest, test_realloc_same_bounds_no_fill_unchanged, test_realloc_same_bounds_no_fill_unchanged, | ||
| !> Same bounds and no fill should return early leaving array untouched | ||
| subroutine test_realloc_same_bounds_no_fill_unchanged() bind(C) | ||
| real(dp), allocatable, target :: arr(:) | ||
| real(dp), pointer :: ptr_before | ||
| call realloc(arr, 3, fill=1.0d0) | ||
| arr(2) = 42.0d0 | ||
| ptr_before => arr(1) | ||
| call realloc(arr, 3) | ||
| call f90_expect_true(arr(2) == 42.0d0) | ||
| call f90_expect_true(associated(ptr_before, arr(1))) | ||
| end subroutine test_realloc_same_bounds_no_fill_unchanged | ||
| !$f90tw) | ||
|
|
||
| !$f90tw TESTCODE(TEST, test_deltares_common_gtest, test_realloc_shift, test_realloc_shift, | ||
| !> Shift moves existing data to new position in grown array | ||
| subroutine test_realloc_shift() bind(C) | ||
| real(dp), allocatable :: arr(:) | ||
| call realloc(arr, 3, fill=0.0d0) | ||
| arr(1) = 10.0d0; arr(2) = 20.0d0; arr(3) = 30.0d0 | ||
|
|
||
| call realloc(arr, 5, fill=-1.0d0, shift=2, keepExisting=.true.) | ||
| call f90_expect_eq(size(arr), 5) | ||
| call f90_expect_true(arr(1) == -1.0d0 .and. arr(2) == -1.0d0) | ||
| call f90_expect_true(arr(3) == 10.0d0 .and. arr(4) == 20.0d0 .and. arr(5) == 30.0d0) | ||
| end subroutine test_realloc_shift | ||
| !$f90tw) | ||
|
|
||
| !$f90tw TESTCODE(TEST, test_deltares_common_gtest, test_realloc_nondefault_lindex, test_realloc_nondefault_lindex, | ||
| !> Non-default lower index produces correct bounds | ||
| subroutine test_realloc_nondefault_lindex() bind(C) | ||
| real(dp), allocatable :: arr(:) | ||
| call realloc(arr, 5, lindex=0, fill=1.0d0) | ||
| call f90_expect_eq(lbound(arr, 1), 0) | ||
| call f90_expect_eq(ubound(arr, 1), 5) | ||
| call f90_expect_true(all(arr == 1.0d0)) | ||
| end subroutine test_realloc_nondefault_lindex | ||
| !$f90tw) | ||
|
|
||
| !$f90tw TESTCODE(TEST, test_deltares_common_gtest, test_realloc_rank2_fixed_first_dim, test_realloc_rank2_fixed_first_dim, | ||
| !> Rank 2: growing only second dimension preserves all data (regression for neighbour_nodes_obs bug) | ||
| subroutine test_realloc_rank2_fixed_first_dim() bind(C) | ||
| integer, allocatable :: arr(:,:) | ||
| call realloc(arr, [3, 2], fill=0) | ||
| arr(1,1) = 1; arr(2,1) = 2; arr(3,1) = 3 | ||
| arr(1,2) = 4; arr(2,2) = 5; arr(3,2) = 6 | ||
|
Contributor
There was a problem hiding this comment. To fill these arrays, I think that it is nicer to say arr = reshape([1, 2, 3, 4, 5, 6], [3, 2]) or even reshape(iota_initialize(6), shape(arr)) (if you take iota_initialize from the other unit tests file) |
||
| call realloc(arr, [3, 4], fill=-1, keepExisting=.true.) | ||
| call f90_expect_eq(size(arr, 1), 3) | ||
| call f90_expect_eq(size(arr, 2), 4) | ||
| call f90_expect_true(arr(1,1) == 1 .and. arr(2,1) == 2 .and. arr(3,1) == 3) | ||
| call f90_expect_true(arr(1,2) == 4 .and. arr(2,2) == 5 .and. arr(3,2) == 6) | ||
| call f90_expect_true(arr(1,3) == -1 .and. arr(1,4) == -1) | ||
| end subroutine test_realloc_rank2_fixed_first_dim | ||
| !$f90tw) | ||
|
|
||
| !$f90tw TESTCODE(TEST, test_deltares_common_gtest, test_reallocp_unassociated, test_reallocp_unassociated, | ||
| !> Pointer realloc on unassociated pointer should allocate without crash | ||
| subroutine test_reallocp_unassociated() bind(C) | ||
| real(dp), pointer :: arr(:) | ||
| nullify(arr) | ||
| call reallocp(arr, 5, fill=-999.0d0) | ||
| call f90_expect_true(associated(arr)) | ||
| call f90_expect_eq(size(arr), 5) | ||
| call f90_expect_true(all(arr == -999.0d0)) | ||
| deallocate(arr) | ||
| end subroutine test_reallocp_unassociated | ||
| !$f90tw) | ||
|
|
||
| !$f90tw TESTCODE(TEST, test_deltares_common_gtest, test_reallocp_grow_keeps_existing, test_reallocp_grow_keeps_existing, | ||
| !> Pointer realloc grow preserves existing data | ||
| subroutine test_reallocp_grow_keeps_existing() bind(C) | ||
| real(dp), pointer :: arr(:) | ||
| nullify(arr) | ||
| call reallocp(arr, 3, fill=0.0d0) | ||
| arr(1) = 1.0d0; arr(2) = 2.0d0; arr(3) = 3.0d0 | ||
| call reallocp(arr, 5, fill=-1.0d0, keepExisting=.true.) | ||
| call f90_expect_eq(size(arr), 5) | ||
| call f90_expect_true(arr(1) == 1.0d0 .and. arr(2) == 2.0d0 .and. arr(3) == 3.0d0) | ||
| call f90_expect_true(arr(4) == -1.0d0 .and. arr(5) == -1.0d0) | ||
| deallocate(arr) | ||
| end subroutine test_reallocp_grow_keeps_existing | ||
| !$f90tw) | ||
|
|
||
| end module test_malloc | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.