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

merge mixed mode updates into main #1366

Merged
merged 58 commits into from
Sep 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
a22e194
Revert "feat: emc mixedmode support (#997)"
Nov 23, 2022
95287f5
Add back in constants4 files from emc revert
Nov 23, 2022
61ac8a9
chore: add include files for easier reviews (#1086)
mlee03 Dec 8, 2022
38b5143
Merge remote-tracking branch 'origin/main' into mixedmode
Jan 10, 2023
4dbd23c
Merge remote-tracking branch 'origin/main' into mixedmode
Jan 23, 2023
fcaca04
chore: copy over changes from modules to includes (#1115)
rem1776 Jan 24, 2023
2456a41
fix: add class(*) back to diag_manager (#1123)
mlee03 Feb 7, 2023
17a5359
Update mixedmode to main (#1143)
mlee03 Mar 8, 2023
24760ee
update the mixedmode branch to main (#1153)
mlee03 Mar 15, 2023
8376481
update mixedmode to main (#1171)
mlee03 Mar 29, 2023
2edc3dc
feat: mixed precision axis_utils2 (#1104)
mcallic2 Mar 29, 2023
6b3855a
feat: mixed precision fms_mod (#1147)
J-Lentz Mar 29, 2023
cdabf07
feat: horiz interp mixed precision (#1067)
rem1776 Mar 29, 2023
7b3906c
mixed precision sat_vapor_pressure (#1095)
mlee03 Mar 29, 2023
f1adb5e
feat: add mixed precision axis_utils unit tests (#1172)
J-Lentz Mar 30, 2023
e6c6e38
merge _base into mixedmode branch (#1180)
rem1776 Apr 6, 2023
66c1297
fix: move type definitions to before first usage to fix nvhpc bug (#1…
rem1776 Apr 10, 2023
be8473d
fix: change allocatable type for intel errors (#1221)
rem1776 May 24, 2023
b3aca89
feat: eliminate use of real numbers for mixed precision in `block_con…
J-Lentz May 24, 2023
4cb3f69
chore: merge mixedmode_base into mixedmode (#1235)
rem1776 May 24, 2023
d5980a8
fix: private routines in libFMS.F90 (#1241)
mlee03 Jun 1, 2023
c036f90
feat: mixed precision field_manager (#1205)
mlee03 Jun 7, 2023
9f3c791
feat: mixed precision random_numbers_mod (#1191)
J-Lentz Jun 7, 2023
f655759
feat: mixed precision time_manager reals to r8 and clean up (#1196)
rem1776 Jun 7, 2023
9340a5d
feat: mixed Precision tracer_manager (#1212)
mlee03 Jun 7, 2023
ba97253
fix duplicate test directory from merge
Jun 7, 2023
d2733bb
chore: Update mixedmode (#1304)
mlee03 Jul 27, 2023
7f8abc2
Mixed precision monin_obukhov (#1116)
mcallic2 Jul 28, 2023
f7b7544
Mixed precision: `monin_obukhov` unit tests (#1272)
J-Lentz Jul 28, 2023
0e0956c
mixed-precision diag_integral_mod (#1217)
mlee03 Aug 3, 2023
0501ed2
mixed precision time_interp (#1252)
rem1776 Aug 3, 2023
82e2674
mixed precision interpolator_mod (#1305)
mlee03 Aug 18, 2023
54b5a21
Mixed precision astronomy (#1092)
mcallic2 Aug 18, 2023
be5c138
fix: add floor function back to astronomy_mod(#1350)
mlee03 Aug 23, 2023
73d0461
merge mixed mode base into mixedmode (#1352)
rem1776 Aug 25, 2023
b582419
remove renamed CI file missed in merge (#1356)
mlee03 Aug 28, 2023
dffe74b
Mixed precision `data_override_mod` (#1323)
J-Lentz Aug 30, 2023
0d0f604
mixed precision exchange (#1341)
mcallic2 Aug 30, 2023
3dbcd7e
coupler mixed precision (#1353)
rem1776 Aug 30, 2023
b737eb2
bring in parser changes from main (#1359)
mlee03 Aug 31, 2023
497ab46
Mixed precision topography_mod (#1250)
mcallic2 Aug 31, 2023
9983ce3
mixed precision remove cp fileobj in interpolator_type_eq (#1358)
mlee03 Aug 31, 2023
34db486
Merge remote-tracking branch 'upstream/main' into HEAD
Sep 14, 2023
7fb3367
remove un-updated include files
Sep 14, 2023
385a698
fix build
Sep 15, 2023
fa05256
fixes for review comments
Sep 18, 2023
f6f9364
fixes for whitespace
Sep 18, 2023
8d8fadf
replace kind in error messages for get_data_type_string
Sep 18, 2023
ebbcedb
add rm diag_integral.out to test script
Sep 19, 2023
a145d4b
add newlines for added files
Sep 19, 2023
d74c608
add kind to static reals in time_interp test
Sep 19, 2023
045018e
add comments for load_record r8 read
Sep 19, 2023
9fb1a62
add seconds per day parameters to get_cal_time
Sep 19, 2023
98d5ee3
fix comments in gaussian_topog.F90
Sep 19, 2023
aa84fd7
Merge pull request #92 from mlee03/mixedmode-alpha3-mlee03
rem1776 Sep 19, 2023
70a2be8
fix types used in get_calendar_time
Sep 19, 2023
7583db7
delete out file appropriately
Sep 19, 2023
1485874
Merge pull request #93 from mlee03/mixedmode-alpha3-mlee03
rem1776 Sep 19, 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: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ sequential patch number (starting from `01`).
- LIBFMS: The libFMS.F90 file (module name `fms`) meant to provide global access has been updated to include 'fms' and it's module/subdirectory name as prefixes for all names. This will only affect external codes that are already using the global module (via `use fms`) and not individual modules.
- MIXED PRECISION: Updates the axis_utils2, horiz_interp, sat_vapor_pressure, and axis_utils subdirectories to support mixed precision real values.
- FMS2_IO: Added in mpp_scatter and mpp_gather performance changes from the 2023.01.01 patch. See below for more details.
- FMS2_IO: Improved error messages to give more debugging information
- FMS2_IO: Improved error messages to give more debugging information
- FMS_MOD: Changed fms_init to include a system call to set the stack size to unlimited, removed previously added stack size fixes
- MONIN_OBUKHOV: Restructures the subroutines in `stable_mix` interface so that 1d calls the underlying implementation, and 2 and 3d call it on 1d slices of the data as opposed to passing in mismatched arrays.
- MPP: Updates from JEDI for ajoint version the mpp halo filling (mpp_do_update_ad.fh), adds checkpoint for forward buffer information.
Expand Down
32 changes: 30 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -305,12 +305,26 @@ foreach(kind ${kinds})
fms2_io/include
string_utils/include
mpp/include
column_diagnostics/include
monin_obukhov/include
sat_vapor_pres/include
horiz_interp/include
diag_integral/include
random_numbers/include
diag_manager/include
constants4
topography/include
axis_utils/include
mosaic2/include
constants
axis_utils/include)
astronomy/include
field_manager/include
time_interp/include
tracer_manager/include
interpolator/include
coupler/include
data_override/include)

target_compile_definitions(${libTgt}_f PRIVATE "${fms_defs}")
target_compile_definitions(${libTgt}_f PRIVATE "${${kind}_defs}")

Expand Down Expand Up @@ -346,11 +360,25 @@ 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}/column_diagnostics/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/astronomy/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/monin_obukhov/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/sat_vapor_pres/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/field_manager/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/horiz_interp/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/mosaic2/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>)
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/diag_manager/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/topography/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}/tracer_manager/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/interpolator/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/coupler/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/mosaic2/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/data_override/include>)

target_include_directories(${libTgt} INTERFACE
$<BUILD_INTERFACE:${moduleDir}>
Expand Down
13 changes: 11 additions & 2 deletions astronomy/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,23 @@
# 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)/astronomy/include
AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)

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

# The convenience library depends on its source.
libastronomy_la_SOURCES = astronomy.F90
libastronomy_la_SOURCES = \
astronomy.F90 \
include/astronomy_r4.fh \
include/astronomy_r8.fh \
include/astronomy.inc

astronomy.$(FC_MODEXT): \
include/astronomy_r4.fh \
include/astronomy_r8.fh \
include/astronomy.inc

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