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

Fixes #126 - STATEINTENT_INTERNAL #128

Merged
merged 2 commits into from
May 15, 2023
Merged

Fixes #126 - STATEINTENT_INTERNAL #128

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd5bd7c
Fixes #126 - STATEINTENT_INTERNAL
tclune Feb 18, 2023
b0b7e62
Fixed incorrect usage of new Internal option.
tclune Feb 28, 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
5 changes: 4 additions & 1 deletion src/Superstructure/State/src/ESMF_StateAPI.cppF90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,8 @@ StateAddRepListMacro(ESMF_State,State,nestedStateList,state,nestedStateList(i)%s
! \item[{[stateintent]}]
! Import or Export {\tt ESMF\_State}. Valid values are
! {\tt ESMF\_STATEINTENT\_IMPORT}, {\tt ESMF\_STATEINTENT\_EXPORT},
! or {\tt ESMF\_STATEINTENT\_UNSPECIFIED} The default
! {\tt ESMF\_STATEINTENT\_INTERNAL},
! or {\tt ESMF\_STATEINTENT\_UNSPECIFIED}. The default
! is {\tt ESMF\_STATEINTENT\_UNSPECIFIED}.
! \item[{[arrayList]}]
! A list (Fortran array) of {\tt ESMF\_Array}s.
Expand Down Expand Up @@ -1970,6 +1971,8 @@ type(ESMF_KeywordEnforcer), optional:: keywordEnforcer ! must use keywords below
msgbuf = "Import State"
case (ESMF_STATEINTENT_EXPORT%state)
msgbuf = "Export State"
case (ESMF_STATEINTENT_INTERNAL)
tclune marked this conversation as resolved.
Show resolved Hide resolved
msgbuf = "Internal State"
case (ESMF_STATEINTENT_UNSPECIFIED%state)
msgbuf = "Unspecified intent direction"
case (ESMF_STATEINTENT_INVALID%state)
Expand Down
6 changes: 4 additions & 2 deletions src/Superstructure/State/src/ESMF_StateItem.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,9 @@ module ESMF_StateItemMod
type(ESMF_StateIntent_Flag), parameter :: &
ESMF_STATEINTENT_IMPORT = ESMF_StateIntent_Flag(1), &
ESMF_STATEINTENT_EXPORT = ESMF_StateIntent_Flag(2), &
ESMF_STATEINTENT_UNSPECIFIED = ESMF_StateIntent_Flag(3), &
ESMF_STATEINTENT_INVALID = ESMF_StateIntent_Flag(4)
ESMF_STATEINTENT_INTERNAL = ESMF_StateIntent_Flag(3), &
ESMF_STATEINTENT_UNSPECIFIED = ESMF_StateIntent_Flag(4), &
ESMF_STATEINTENT_INVALID = ESMF_StateIntent_Flag(5)

!------------------------------------------------------------------------------
! ! ESMF_StateClass
Expand Down Expand Up @@ -276,6 +277,7 @@ module ESMF_StateItemMod
ESMF_STATEITEM_NOTFOUND
public ESMF_StateItemConstruct
public ESMF_StateIntent_Flag, ESMF_STATEINTENT_IMPORT, ESMF_STATEINTENT_EXPORT, &
ESMF_STATEINTENT_INTERNAL, &
ESMF_STATEINTENT_UNSPECIFIED
#if 0
public ESMF_NeededFlag, ESMF_NEEDED, &
Expand Down
1 change: 1 addition & 0 deletions src/Superstructure/State/src/ESMF_StateTypes.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ module ESMF_StateTypesMod
public ESMF_StateItemWrap
public ESMF_StateItemConstruct
public ESMF_StateIntent_Flag, ESMF_STATEINTENT_IMPORT, ESMF_STATEINTENT_EXPORT, &
ESMF_STATEINTENT_INTERNAL, &
ESMF_STATEINTENT_UNSPECIFIED
#if ESMF_ENABLE_NEEDED
public ESMF_NeededFlag, ESMF_NEEDED, &
Expand Down
2 changes: 2 additions & 0 deletions src/epilogue/src/ESMF_ComplianceIC.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1276,6 +1276,8 @@ recursive subroutine checkState(prefix, referenceName, state, rc)
tempString = "ESMF_STATEINTENT_IMPORT"
else if (stateintent==ESMF_STATEINTENT_EXPORT) then
tempString = "ESMF_STATEINTENT_EXPORT"
else if (stateintent==ESMF_STATEINTENT_INTERNAL) then
tempString = "ESMF_STATEINTENT_INTERNAL"
else if (stateintent==ESMF_STATEINTENT_UNSPECIFIED) then
tempString = "ESMF_STATEINTENT_UNSPECIFIED"
else
Expand Down