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

Bring mixedmode_base up to date #1173

Merged
merged 16 commits into from
Apr 5, 2023
Merged

Bring mixedmode_base up to date #1173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
485d631
fix: misspellings and rename variable in yaml_parser.F90 (#1127)
J-Lentz Feb 1, 2023
35a5f2a
fix: module and local variable name conflicts in time_interp (#1125)
mlee03 Feb 1, 2023
ba9c712
docs: Correct instructions to build without MPI (#1128)
J-Lentz Feb 1, 2023
15df841
fix: pointer to allocatable in amip_interp_type (#1106)
ganganoaa Feb 9, 2023
f0e8cab
feat: log_diag_field_info updates from diag rewrite (#1117)
rem1776 Feb 14, 2023
ec2020a
fix: remove implied save for valid_types variables in sat_vapor_pres_…
uramirez8707 Feb 16, 2023
4526cc9
revert: log_diag_field_info argument changes (#1136)
rem1776 Feb 16, 2023
6255971
feat: refactored send_data math (field buffer update) functions. (#1131)
ngs333 Feb 23, 2023
74d8e73
fix: adds tags to nested do loops in fms_diag_fieldbuff.fh to fix his…
ngs333 Feb 27, 2023
9b83c8c
fix - gnu and pgi issue with class(*) in send_data3d (#1149)
nikizadehgfdl Mar 9, 2023
9339b88
feat: extend `string` interface in `fms_string_utils_mod` (#1142)
J-Lentz Mar 9, 2023
0ff254e
fix: add omp directives for race condition in tridiagonal (#1109)
ganganoaa Mar 9, 2023
6362657
fix: missing if statement in PR #1149 (#1155)
nikizadehgfdl Mar 13, 2023
7188e3a
fix: time_manager missing changes from year to yr, month to mo, day t…
mlee03 Mar 28, 2023
3f6d6d5
bring in main
Mar 29, 2023
08943c7
remove extra space
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
1 change: 0 additions & 1 deletion diag_manager/diag_manager.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1473,7 +1473,6 @@ 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

!> @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
6 changes: 3 additions & 3 deletions time_interp/include/time_interp.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ contains
! mid point of current month in seconds
mid_month = days_in_month(Time) * halfday
! time into current month in seconds
cur_month = second + secmin*minute + sechour*hour + secday*(day-1)
cur_month = second + secmin*minute + sechour*hour + secday*(dy-1)

if ( cur_month >= mid_month ) then
! current time is after mid point of current month
Expand Down Expand Up @@ -466,8 +466,8 @@ contains
endif
else
! current time is before mid point of day
year2 = year; month2 = month; day2 = day
year1 = year; month1 = month; day1 = day - 1
year2 = yr; month2 = mo ; day2 = dy
year1 = yr; month1 = mo; day1 = dy - 1
weight = real(sday + halfday) / real(secday)

if (day1 < 1) then
Expand Down
6 changes: 3 additions & 3 deletions time_interp/time_interp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ subroutine time_interp_month ( Time, weight, year1, year2, month1, month2 )
! mid point of current month in seconds
mid_month = days_in_month(Time) * halfday
! time into current month in seconds
cur_month = second + secmin*minute + sechour*hour + secday*(day-1)
cur_month = second + secmin*minute + sechour*hour + secday*(dy-1)

if ( cur_month >= mid_month ) then
! current time is after mid point of current month
Expand Down Expand Up @@ -466,8 +466,8 @@ subroutine time_interp_day ( Time, weight, year1, year2, month1, month2, day1, d
endif
else
! current time is before mid point of day
year2 = year; month2 = month; day2 = day
year1 = year; month1 = month; day1 = day - 1
year2 = yr; month2 = mo ; day2 = dy
year1 = yr; month1 = mo; day1 = dy - 1
weight = real(sday + halfday) / real(secday)

if (day1 < 1) then
Expand Down