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

Jump to bottom

mixed-precision diag_integral_mod #1217

Merged
merged 42 commits into from
Aug 3, 2023
Merged

mixed-precision diag_integral_mod #1217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
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
bc9e4d9
Merge branch 'mixedmode' into mixedmode_base
rem1776 Apr 5, 2023
2977578
rm accidental empty line
Apr 5, 2023
b3374f6
chore: bring mixedmode_base up to date with main (#1173)
mlee03 Apr 5, 2023
75ae1ba
diag_integral mixedmode update
May 4, 2023
a35a730
fix ci
May 4, 2023
91a1171
diag_integral cmake fix
May 4, 2023
d7709bc
attempt to fix ci
May 4, 2023
886849e
fix ci?
May 4, 2023
18514e2
push fh files
May 4, 2023
94a1e86
add unit tests
May 10, 2023
7fe7c46
more unit testing
May 10, 2023
3e218ca
cleanup test
May 11, 2023
2b84cf3
fix diag_integral mixedmode updates
May 11, 2023
4cfea48
add test_sum_field_wght_3d
May 11, 2023
526eaf3
cleanup
May 11, 2023
ae9e29e
missed get_axis_time
May 11, 2023
f6b5506
forgot r8_kind, ci failed
May 11, 2023
cca0c7d
chore: update mixedmode_base to main (#1234)
mlee03 May 24, 2023
e3653f6
add hemi tests
Jul 6, 2023
4d0ce31
unit tests version 1
Jul 7, 2023
ea06581
simplify unit tests
Jul 7, 2023
07d83b8
add comments
Jul 7, 2023
c9ad0ce
add one more TODO
Jul 7, 2023
712330b
chore: merge main updates into mixedmode_base(#1267)
mlee03 Jul 7, 2023
dbdd8ab
change lkind to r8_kind in unit test
Jul 12, 2023
77fa219
Merge remote-tracking branch 'origin/mixedmode' into mixedmode-diagint
Jul 19, 2023
21eeb95
fix merge conflict in cmake
Jul 19, 2023
54762df
missed merge conflict issues in cmake
Jul 19, 2023
20a3b9a
merge main updates to mixedmode_base
Jul 19, 2023
313d032
spaces
Jul 19, 2023
c65263f
update to main
Jul 19, 2023
18fb872
fix configure.ac
Jul 19, 2023
670e6be
one more update to configure.ac
Jul 19, 2023
5922527
constants4
Jul 19, 2023
39949fe
constants4 debacle
Jul 24, 2023
995d198
update diag_integral
Jul 25, 2023
282bc99
forgot about Makefile.am
Jul 25, 2023
591114b
Merge remote-tracking branch 'origin/mixedmode' into mixedmode-diagint
Jul 31, 2023
6268731
fix changelog
Aug 2, 2023
8375aae
fix monin stable_mix_3d
Aug 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
5 changes: 3 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ foreach(kind ${kinds})
monin_obukhov/include
sat_vapor_pres/include
horiz_interp/include
diag_integral/include
random_numbers/include
diag_manager/include
constants4
Expand Down Expand Up @@ -356,9 +357,9 @@ foreach(kind ${kinds})
$<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}/random_numbers/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/diag_integral/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/diag_manager/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/field_manager/include>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Note to reviewers: field_manager was included twice. Hence this line was deleted in this PR

$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/random_numbers/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/tracer_manager/include>)


Expand Down
2 changes: 2 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,8 +496,10 @@ AC_CONFIG_FILES([
test_fms/parser/Makefile
test_fms/string_utils/Makefile
test_fms/sat_vapor_pres/Makefile
test_fms/diag_integral/Makefile
test_fms/tracer_manager/Makefile
test_fms/random_numbers/Makefile

FMS.pc
])

Expand Down
12 changes: 10 additions & 2 deletions diag_integral/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,22 @@
# 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)/diag_integral/include
AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)

# Build this uninstalled convenience library.
noinst_LTLIBRARIES = libdiag_integral.la

# The convenience library depends on its source.
libdiag_integral_la_SOURCES = diag_integral.F90
libdiag_integral_la_SOURCES = diag_integral.F90\
include/diag_integral.inc\
include/diag_integral_r4.fh\
include/diag_integral_r8.fh

diag_integral_mod.$(FC_MODEXT): include/diag_integral.inc\
include/diag_integral_r4.fh\
include/diag_integral_r8.fh


nodist_include_HEADERS = diag_integral_mod.$(FC_MODEXT)
BUILT_SOURCES = diag_integral_mod.$(FC_MODEXT)
Expand Down
Loading
Loading