Skip to content

Commit

Permalink
Merge develop in to branch
Browse files Browse the repository at this point in the history
PR MPAS-Dev#1089 fixed some of the issues in the tests so that they aren't included in
a relatively unrealated PR. This merge will update the test routines and fix
the two errors described in PR MPAS-Dev#1089 that caused the fields tests to
arbitrarily fail.
  • Loading branch information
Matthew Dimond committed Jun 30, 2023
2 parents 41b2bef + 96e9904 commit 85c116e
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/framework/mpas_attlist.F
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@ subroutine mpas_modify_att_int0d(attList, attName, attValue, ierr)!{{{
do while (associated(cursor))
if (trim(cursor % attName) == trim(attName)) then
if (cursor % attType == MPAS_ATT_INT) then
if (present(ierr)) ierr = 0
cursor % attValueInt = attValue
end if
return
Expand Down Expand Up @@ -375,13 +376,14 @@ subroutine mpas_modify_att_int1d(attList, attName, attValue, ierr)!{{{
do while (associated(cursor))
if (trim(cursor % attName) == trim(attName)) then
if (cursor % attType == MPAS_ATT_INTA) then
if (present(ierr)) ierr = 0
cursor % attValueIntA(:) = attValue(:)
end if
return
end if
cursor => cursor % next
end do

end subroutine mpas_modify_att_int1d!}}}

!***********************************************************************
Expand Down Expand Up @@ -415,6 +417,7 @@ subroutine mpas_modify_att_real0d(attList, attName, attValue, ierr)!{{{
do while (associated(cursor))
if (trim(cursor % attName) == trim(attName)) then
if (cursor % attType == MPAS_ATT_REAL) then
if (present(ierr)) ierr = 0
cursor % attValueReal = attValue
end if
return
Expand Down Expand Up @@ -455,6 +458,7 @@ subroutine mpas_modify_att_real1d(attList, attName, attValue, ierr)!{{{
do while (associated(cursor))
if (trim(cursor % attName) == trim(attName)) then
if (cursor % attType == MPAS_ATT_REALA) then
if (present(ierr)) ierr = 0
cursor % attValueRealA(:) = attValue(:)
end if
return
Expand Down

0 comments on commit 85c116e

Please sign in to comment.