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.

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

mixed precision sat_vapor_pressure #1095

Merged
merged 74 commits into from
Mar 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
d9e4c59
fms_svp_kind
mlee03 Dec 16, 2022
f8401ff
edit sat_vap_pres.* files
mlee03 Dec 19, 2022
c4d1755
fix make files
mlee03 Dec 19, 2022
3852113
fix typo in cmakelist
mlee03 Dec 19, 2022
f1b2e17
fix line longer than 121
mlee03 Dec 19, 2022
d733b9c
-I.
mlee03 Dec 19, 2022
dcd0a72
fix makefile.am
mlee03 Dec 20, 2022
4322e20
further corrections to makefile.am
mlee03 Dec 20, 2022
4ba9806
add license
mlee03 Dec 20, 2022
025abcb
typo tmin instead of tminl
mlee03 Dec 20, 2022
13b4306
correct potentially catastrophic mistakes
mlee03 Dec 20, 2022
7549ec4
redo table calculation
mlee03 Jan 12, 2023
a70ee0d
pass r8 to k init
mlee03 Jan 12, 2023
41e6198
add more r8
mlee03 Jan 12, 2023
46430f0
lint pass
mlee03 Jan 12, 2023
6571eed
Merge remote-tracking branch 'fms/mixedmode' into mixedmode_satvap
Jan 24, 2023
8c63b20
Merge remote-tracking branch 'fms/mixedmode' into mixedmode_satvap
Jan 24, 2023
802b466
number precision
Jan 26, 2023
1c8e297
number precision 2
Jan 26, 2023
19b0ae6
add mixing fms_svp_kind_ and r8_kind
Jan 26, 2023
f2d6f2f
add missing fms_svp_kind_ and r8_kind
Jan 26, 2023
7f9dec6
first round of satvap unit tests
Jan 27, 2023
324eb9d
typo in makefile.am
mlee03 Jan 27, 2023
8c787c8
second round of unit tests
Feb 1, 2023
a28143e
fixes satvappres unit test?
Feb 1, 2023
b05574d
MISSED real(FMS_SVP_KIND)
Feb 1, 2023
8d1114e
extra parenthesis. sorry
Feb 1, 2023
6c0a53f
another missed svpkind
Feb 2, 2023
e36e05a
third round of unit tests
Feb 2, 2023
303eba8
add compute_tables
Feb 2, 2023
c464ad7
round 4 of unit tests
Feb 2, 2023
03f7025
more unit test edits
Feb 2, 2023
0c2eec8
add a bit more comment to testing
Feb 2, 2023
7a2b7e2
change 1 to :
Feb 2, 2023
b87f2c0
Merge remote-tracking branch 'fms/mixedmode' into mixedmode_satvap
Feb 14, 2023
4d5d84b
add more comments to test 1
Mar 1, 2023
4350a01
add missing real conversion
Mar 1, 2023
068ba41
add missing real
Mar 1, 2023
e6297a5
add for safety
Mar 1, 2023
e73cec8
another missing real
Mar 1, 2023
f78dc66
another missing real. thank you unit test.
Mar 1, 2023
83756bd
another one
Mar 1, 2023
9fba385
push tests before losing them
Mar 1, 2023
13128c7
dont lose comments
Mar 1, 2023
fa419c2
goodbye for today
Mar 1, 2023
e1a6db7
add TODO
Mar 2, 2023
989280a
edit to test r4 and r8
Mar 2, 2023
9f8b805
add comments to sat_vapor_pres_k.inc
Mar 2, 2023
190f0b1
add comments, fix mistakes
Mar 2, 2023
ba11b7b
more comments to test
Mar 2, 2023
d5dc449
replace d0 with _lkind
Mar 2, 2023
a6ad080
minor changes to sat_vapor_pres_k.inc
Mar 6, 2023
12027d0
remove misc files
Mar 6, 2023
170bae9
changes to test
Mar 6, 2023
ccefadb
modify comments
Mar 6, 2023
24720d4
remove .I
Mar 6, 2023
4111210
update to main
Mar 10, 2023
d812efa
sorry
Mar 10, 2023
191dc88
add comments
Mar 13, 2023
15d5e44
doxygenize
Mar 13, 2023
341896c
fix comment mistakes
Mar 13, 2023
e14e160
fix mistakes
Mar 13, 2023
39795fc
doxygenize test
Mar 13, 2023
7be8446
Merge remote-tracking branch 'origin/mixedmode_satvap_comments' into …
Mar 13, 2023
3ef7cd2
update to main
Mar 15, 2023
2dcae1b
add missing interfaces
Mar 24, 2023
c00ed68
catch some real misses
Mar 24, 2023
702bb3e
test2
Mar 27, 2023
026c977
test
Mar 27, 2023
d27174f
testing still
Mar 27, 2023
3afe607
get rid of extra indentation
Mar 29, 2023
114a3af
make unit number a variable
Mar 29, 2023
ff72300
move comments
Mar 29, 2023
99531f6
Merge branch 'mixedmode' into mixedmode_satvap
rem1776 Mar 29, 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
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ foreach(kind ${kinds})
fms2_io/include
string_utils/include
mpp/include
sat_vapor_pres/include
horiz_interp/include
diag_manager/include
constants4
Expand Down Expand Up @@ -337,6 +338,7 @@ foreach(kind ${kinds})
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/fms>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/fms/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/fms2_io/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/sat_vapor_pres/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>
Expand Down
1 change: 1 addition & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,7 @@ AC_CONFIG_FILES([
test_fms/coupler/Makefile
test_fms/parser/Makefile
test_fms/string_utils/Makefile
test_fms/sat_vapor_pres/Makefile
FMS.pc
])

Expand Down
2 changes: 1 addition & 1 deletion libFMS.F90
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ module fms
lookup_es2, lookup_des2, lookup_es2_des2, &
lookup_es3, lookup_des3, lookup_es3_des3, &
lookup_es_des, compute_qs, compute_mrs, &
escomp, descomp
escomp, descomp, check_1d, check_2d, temp_check, show_all_bad
!> string_utils
use fms_string_utils_mod, only: string, fms_array_to_pointer, fms_pointer_to_array, fms_sort_this, &
fms_find_my_string, fms_find_unique, fms_c2f_string, fms_cstring2cpointer, &
Expand Down
26 changes: 20 additions & 6 deletions sat_vapor_pres/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,38 @@
# Ed Hartnett 2/28/19

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

# Build these uninstalled convenience library.
noinst_LTLIBRARIES = libsat_vapor_pres.la

# Each convenience library depends on its source.
libsat_vapor_pres_la_SOURCES = \
sat_vapor_pres.F90 \
sat_vapor_pres_k.F90
sat_vapor_pres.F90 \
include/sat_vapor_pres_r4.fh \
include/sat_vapor_pres_r8.fh \
include/sat_vapor_pres.inc \
sat_vapor_pres_k.F90 \
include/sat_vapor_pres_k_r4.fh \
include/sat_vapor_pres_k_r8.fh \
include/sat_vapor_pres_k.inc

# Some mods are dependant on other mods in this dir.
sat_vapor_pres_mod.$(FC_MODEXT): sat_vapor_pres_k_mod.$(FC_MODEXT)
sat_vapor_pres_mod.$(FC_MODEXT): \
sat_vapor_pres_k_mod.$(FC_MODEXT) \
include/sat_vapor_pres_r4.fh \
include/sat_vapor_pres_r8.fh \
include/sat_vapor_pres.inc
sat_vapor_pres_k_mod.$(FC_MODEXT): \
include/sat_vapor_pres_k_r4.fh \
include/sat_vapor_pres_k_r8.fh \
include/sat_vapor_pres_k.inc

# Mod files are built and then installed as headers.
MODFILES = \
sat_vapor_pres_k_mod.$(FC_MODEXT) \
sat_vapor_pres_mod.$(FC_MODEXT)
sat_vapor_pres_k_mod.$(FC_MODEXT) \
sat_vapor_pres_mod.$(FC_MODEXT)
BUILT_SOURCES = $(MODFILES)
nodist_include_HEADERS = $(MODFILES)

Expand Down
Loading