Skip to content

Revert 2c8363e057dde026e65ddcec1b62c18d5e260017 to allow compiler opt… #267

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
laurenchilutti merged 3 commits into from
Jun 6, 2023
Merged

Revert 2c8363e057dde026e65ddcec1b62c18d5e260017 to allow compiler opt… #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69568eb
Revert 2c8363e057dde026e65ddcec1b62c18d5e260017 to allow compiler opt…
Apr 21, 2023
f45f8f6
Switch range_check_2d to use minval/maxval intrinsics as requested
dkokron Apr 23, 2023
b012ecf
Merge remote-tracking branch 'upstream/dev/emc' into hafs-rangeCheck3d
dkokron Jun 2, 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
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@ add_library(FV3::fv3 ALIAS fv3)

set_property(SOURCE model/nh_utils.F90 APPEND_STRING PROPERTY COMPILE_FLAGS "${FAST}")
set_property(SOURCE model/fv_mapz.F90 APPEND_STRING PROPERTY COMPILE_FLAGS "${FAST}")
set_property(SOURCE tools/fv_diagnostics.F90 APPEND_STRING PROPERTY COMPILE_FLAGS "-O0")

set_target_properties(fv3 PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/fv3)
target_include_directories(fv3 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include/fv3>
Expand Down
28 changes: 4 additions & 24 deletions tools/fv_diagnostics.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4270,20 +4270,9 @@ subroutine range_check_3d(qname, q, is, ie, js, je, n_g, km, pos, q_low, q_hi, b
integer year, month, day, hour, minute, second

if ( present(bad_range) ) bad_range = .false.
qmin = q(is,js,1)
qmax = qmin

do k=1,km
do j=js,je
do i=is,ie
if( q(i,j,k) < qmin ) then
qmin = q(i,j,k)
elseif( q(i,j,k) > qmax ) then
qmax = q(i,j,k)
endif
enddo
enddo
enddo
qmin=minval(q(is:ie,js:je,1:km))
qmax=maxval(q(is:ie,js:je,1:km))

call mp_reduce_min(qmin)
call mp_reduce_max(qmax)
Expand Down Expand Up @@ -4337,18 +4326,9 @@ subroutine range_check_2d(qname, q, is, ie, js, je, n_g, pos, q_low, q_hi, bad_r
integer year, month, day, hour, minute, second

if ( present(bad_range) ) bad_range = .false.
qmin = q(is,js)
qmax = qmin

do j=js,je
do i=is,ie
if( q(i,j) < qmin ) then
qmin = q(i,j)
elseif( q(i,j) > qmax ) then
qmax = q(i,j)
endif
enddo
enddo
qmin=minval(q(is:ie,js:je))
qmax=maxval(q(is:ie,js:je))

call mp_reduce_min(qmin)
call mp_reduce_max(qmax)
Expand Down