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

Fixes #3096 - propagate time dependent changes #3119

Merged
merged 12 commits into from
Oct 28, 2024
Merged

Fixes #3096 - propagate time dependent changes #3119

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bc81715
Fixes #3096 - propagate time dependent changes
tclune Oct 13, 2024
761ee6f
Merge branch 'release/MAPL-v3' into feature/tclune/#3096-action-inval…
tclune Oct 24, 2024
6a53afc
Forgot to run some tests.
tclune Oct 24, 2024
4c4e6a1
Merge remote-tracking branch 'origin/feature/tclune/#3096-action-inva…
tclune Oct 24, 2024
2a02819
Update esmf_utils/UngriddedDims.F90
tclune Oct 24, 2024
8ff9c70
Update field_utils/FieldBundleDelta.F90
tclune Oct 24, 2024
4ab56bc
Update field_utils/FieldBundleDelta.F90
tclune Oct 24, 2024
2ef4cc3
Update field_utils/FieldBundleDelta.F90
tclune Oct 24, 2024
51de581
Fixed issue with non-present optional `ignore`.
tclune Oct 27, 2024
910e9b9
Merge branch 'release/MAPL-v3' into feature/tclune/#3096-action-inval…
tclune Oct 27, 2024
43a694a
Merge branch 'release/MAPL-v3' into feature/tclune/#3096-action-inval…
tclune Oct 28, 2024
925cda7
Removed print statements
tclune Oct 28, 2024
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
Prev Previous commit
Next Next commit
Fixed issue with non-present optional ignore. 
- Introduced local `ignore_` that always has a value.
  • Loading branch information
@tclune
tclune committed Oct 27, 2024
commit 51de5815daad24f750359a13ba3b53ec6b25313e
12 changes: 8 additions & 4 deletions field_utils/FieldDelta.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,10 +216,14 @@ subroutine update_field(this, field, ignore, rc)
integer, optional, intent(out) :: rc

integer :: status
darianboggs marked this conversation as resolved.
Show resolved Hide resolved
character(:), allocatable :: ignore_

ignore_ = ''
if (present(ignore)) ignore_ = ignore

call this%reallocate_field(field, ignore=ignore, _RC)
call this%reallocate_field(field, ignore=ignore_, _RC)

call update_num_levels(this%num_levels, field, ignore=ignore, _RC)
call update_num_levels(this%num_levels, field, ignore=ignore_, _RC)
call update_units(this%units, field, ignore=ignore, _RC)

_RETURN(_SUCCESS)
Expand All @@ -228,7 +232,7 @@ subroutine update_field(this, field, ignore, rc)
subroutine update_num_levels(num_levels, field, ignore, rc)
integer, optional, intent(in) :: num_levels
type(ESMF_Field), intent(inout) :: field
character(*), intent(in), optional :: ignore
character(*), intent(in) :: ignore
integer, optional, intent(out) :: rc

integer :: status
Expand All @@ -244,7 +248,7 @@ end subroutine update_num_levels
subroutine update_units(units, field, ignore, rc)
character(*), optional, intent(in) :: units
type(ESMF_Field), intent(inout) :: field
character(*), intent(in), optional :: ignore
character(*), intent(in) :: ignore
integer, optional, intent(out) :: rc

integer :: status
Expand Down
Loading