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

horiz interp mixed precision #1067

Merged
merged 71 commits into from
Mar 29, 2023
Merged

horiz interp mixed precision #1067

Show file tree
Hide file tree
Changes from 65 commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
0f24cdf
extend derived type and add overloads to bicubic
Oct 26, 2022
b631819
add parameterized derived type for reals
Nov 3, 2022
e8316ee
add missed macros
Nov 3, 2022
945e149
add allocation checks
Nov 3, 2022
ee812a3
rename routines to all caps, add test
Nov 4, 2022
2141ff1
remove parameterized type for gnu and add to cmake
Nov 8, 2022
8d1c8af
clean up comments
Nov 8, 2022
fc7e297
add include files to makefile, change brackets to quotes
Nov 15, 2022
0fc55af
add license header and doxygen comments for includes
Nov 28, 2022
b5cd82c
Merge remote-tracking branch 'upstream/mixedmode' into horiz_interp_m…
Nov 28, 2022
1c0f739
remove whitespace
Nov 28, 2022
449b839
add real casts to any loose reals
Dec 8, 2022
ead452a
Merge remote-tracking branch 'upstream/mixedmode' into horiz_interp_m…
Dec 8, 2022
be4b399
add include directory, headers and comments
Dec 9, 2022
f734c08
rm whitespace
Dec 9, 2022
ea3fa83
gcc fix for old data block assignment
Dec 9, 2022
35aac33
line lengths
Dec 9, 2022
5422672
update cmake paths
Dec 9, 2022
e806f45
missed some headers in makefile
Dec 12, 2022
ca37853
Change macros to add trailing underscore
Dec 21, 2022
54a7aa0
address review comments
Dec 21, 2022
14fd854
line length and typo fixes
Dec 22, 2022
f102556
missed a &
Dec 22, 2022
378ce98
change real module parameters to r8
Dec 22, 2022
5f4f954
comment fixes, rename some macros
Jan 18, 2023
857bdca
Merge remote-tracking branch 'upstream/mixedmode' into horiz_interp_m…
Jan 24, 2023
b2e1974
fix any left over pointer usage
Jan 24, 2023
9d6edf4
Merge remote-tracking branch 'upstream/mixedmode' into horiz_interp_m…
Jan 24, 2023
aa85a0b
add any needed interfaces for helper routines
Jan 24, 2023
7d03c40
remove whitespace
Jan 24, 2023
0f45fc8
add missed interfaces
Jan 24, 2023
b2cc73d
white space fix
Jan 25, 2023
a6ca348
address comments and add missed interfaces
Feb 2, 2023
dcccb1c
adds in basic tests for other methods
Feb 7, 2023
04e91d6
first round of bilinear tests
Feb 10, 2023
264d7af
add in some real fixes, test updates
Feb 10, 2023
e633a01
Merge pull request #65 from mlee03/mixedmode_hi
rem1776 Feb 10, 2023
98abbff
Merge remote-tracking branch 'myrepo/horiz_interp_mixed' into horiz_i…
Feb 10, 2023
79ef90d
add 2dx2d test that is failing
Feb 13, 2023
63e20b0
add more bilinear tests
Feb 17, 2023
47adf99
undo commented out code
Feb 17, 2023
f6247cf
column>121
Feb 17, 2023
9e750e7
add macros for test
Feb 21, 2023
9fcc2d3
Merge branch 'horiz_interp_mixed' into mixedmode_hi
rem1776 Feb 21, 2023
05a8c55
Merge pull request #68 from mlee03/mixedmode_hi
rem1776 Feb 21, 2023
a892e29
change some casts to use the underscore notation, add tests
Feb 28, 2023
5c6ed4f
changes from review
Mar 1, 2023
0c156c6
add tests
Mar 6, 2023
46d8e44
Update mixedmode_base branch to main (#1144)
mlee03 Mar 8, 2023
dde0b88
update the mixedmode_base branch to main (#1154)
mlee03 Mar 15, 2023
2dfe8a0
finish up tests, address some review comments
Mar 16, 2023
d3ac5c0
Merge remote-tracking branch 'upstream/mixedmode_base' into horiz_int…
Mar 16, 2023
2d29150
Merge branch 'mixedmode' into horiz_interp_mixed
rem1776 Mar 16, 2023
1bf7064
fix gnu issues, whitespace
Mar 17, 2023
e5cdc90
change type name
Mar 17, 2023
d402cc9
Merge branch 'horiz_interp_mixed' of github.com:rem1776/FMS into hori…
Mar 17, 2023
9705003
linter + test type names
Mar 17, 2023
95fd9df
linter fixes
Mar 17, 2023
489b6c5
fix stack size issues with nml change, add some clocks
Mar 21, 2023
9ede143
ci + whitespace
Mar 21, 2023
cea5bd1
update error checking for CI failures
Mar 22, 2023
f537bf6
fix last ci gnu issue (hopefully)+typo in dim size
Mar 23, 2023
187fe83
linter
Mar 23, 2023
215ce93
missed r8 check
Mar 23, 2023
497f255
missed review changes
Mar 23, 2023
093f303
add dealloc checks
Mar 23, 2023
a0c996f
updates for review comments
Mar 24, 2023
847fd85
finish the rest of the comments
Mar 24, 2023
8af3295
change ints to reals
Mar 24, 2023
92ee422
fix any lingering warnings
Mar 24, 2023
31bea03
linter and missing casts
Mar 27, 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 CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ foreach(kind ${kinds})
fms2_io/include
string_utils/include
mpp/include
horiz_interp/include
diag_manager/include
constants4
constants)
Expand Down Expand Up @@ -333,6 +334,7 @@ foreach(kind ${kinds})
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/fms>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/fms2_io/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/horiz_interp/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/string_utils/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/mpp/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/diag_manager/include>)
Expand Down
1 change: 1 addition & 0 deletions diag_manager/diag_manager.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1473,6 +1473,7 @@ LOGICAL FUNCTION send_data_3d(diag_field_id, field, time, is_in, js_in, ks_in, &
ie_in=ie_in, je_in=je_in, ke_in=ke_in, weight=weight, err_msg=err_msg)
endif
END FUNCTION send_data_3d

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

extra line in diag_manager

!> @return true if send is successful
LOGICAL FUNCTION diag_send_data(diag_field_id, field, time, is_in, js_in, ks_in, &
& mask, rmask, ie_in, je_in, ke_in, weight, err_msg)
Expand Down
22 changes: 20 additions & 2 deletions horiz_interp/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# Ed Hartnett 2/22/19

# Include .h and .mod files.
AM_CPPFLAGS = -I$(top_srcdir)/include
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/horiz_interp/include
AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)

# Build these uninstalled convenience libraries.
Expand All @@ -36,7 +36,25 @@ libhoriz_interp_la_SOURCES = \
horiz_interp_conserve.F90 \
horiz_interp.F90 \
horiz_interp_spherical.F90 \
horiz_interp_type.F90
horiz_interp_type.F90 \
include/horiz_interp_bicubic.inc \
include/horiz_interp_bilinear.inc \
include/horiz_interp_conserve.inc \
include/horiz_interp.inc \
include/horiz_interp_spherical.inc \
include/horiz_interp_type.inc \
include/horiz_interp_bicubic_r4.fh \
include/horiz_interp_bilinear_r4.fh \
include/horiz_interp_conserve_r4.fh \
include/horiz_interp_r4.fh \
include/horiz_interp_spherical_r4.fh \
include/horiz_interp_type_r4.fh \
include/horiz_interp_bicubic_r8.fh \
include/horiz_interp_bilinear_r8.fh \
include/horiz_interp_conserve_r8.fh \
include/horiz_interp_r8.fh \
include/horiz_interp_spherical_r8.fh \
include/horiz_interp_type_r8.fh

# Some mods are dependant on other mods in this dir.
horiz_interp_bicubic_mod.$(FC_MODEXT): horiz_interp_type_mod.$(FC_MODEXT)
Expand Down
Loading