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

Fixes #2433 Minor changes for gfortran-13. #2443

Merged
merged 3 commits into from
Nov 13, 2023
Merged

Fixes #2433 Minor changes for gfortran-13. #2443

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70a28cb
Minor changes for gfortran-13.
tclune Nov 11, 2023
4af41f2
Updated change log.
tclune Nov 11, 2023
89ac2f6
Remove print
mathomp4 Nov 11, 2023
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- [#2433] Implemented workarounds for gfortran-13

### Removed

### Deprecated
Expand Down
2 changes: 1 addition & 1 deletion base/MAPL_LatLonToLatLonRegridder.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ subroutine compute_binning_weights(Weight,Xin,Xout,HasPoles,rc)
dx = Xout(j_out+1)-Xin(j1)
ff = ff + dx
b(j1) = dx
b = b/ff
b(:) = b(:)/ff
end if

end associate
Expand Down
17 changes: 9 additions & 8 deletions profiler/tests/test_MeterNodeIterator.pf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ contains

class (AbstractMeterNodeIterator), allocatable :: iter_1
class (AbstractMeterNodeIterator), allocatable :: iter_2

print*,__FILE__,__LINE__
node = MeterNode('all', AdvancedMeter(MpiTimerGauge()))

iter_1 = node%begin()
iter_2 = node%begin()
allocate(iter_1, source=node%begin())
allocate(iter_2, source=node%begin())

@assertTrue(iter_1 == iter_2)
@assertFalse(iter_1 /= iter_2)
@assertTrue(iter_1 /= node%end())
Expand Down Expand Up @@ -46,8 +47,8 @@ contains
class (AbstractMeterNodeIterator), allocatable :: iter_2

node = MeterNode('all', AdvancedMeter(MpiTimerGauge()))
iter_1 = node%begin()
iter_2 = node%begin()
allocate(iter_1, source=node%begin())
allocate(iter_2, source=node%begin())

call node%add_child('a', AdvancedMeter(MpiTimerGauge()))

Expand All @@ -73,7 +74,7 @@ contains
node = MeterNode('all', AdvancedMeter(MpiTimerGauge()))

count = 0
iter = node%begin()
allocate(iter, source=node%begin())
do while (iter /= node%end())
count = count + 1
call iter%next()
Expand All @@ -98,7 +99,7 @@ contains
call node%add_child('c', AdvancedMeter(MpiTimerGauge()))

count = 0
iter = node%begin()
allocate(iter, source=node%begin())
do while (iter /= node%end())
count = count + 1
call iter%next()
Expand Down Expand Up @@ -162,7 +163,7 @@ contains


count = 0
iter = node%begin()
allocate(iter, source=node%begin())
do while (iter /= node%end())
count = count + 1
t => iter%get_meter()
Expand Down