Skip to content

Resolves #269. Any variable that was named pos is now named domain_position #270

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

Merged
colingladueNOAA merged 3 commits into from
Feb 13, 2020
Merged

Resolves #269. Any variable that was named pos is now named domain_position #270

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd31b78
Resolves #269. Any variable that was named `pos` is now named `domai…
thomas-robinson Jan 30, 2020
0261560
Sets EAST, NORTH, and CENTER as public through diag_manager_mod
thomas-robinson Feb 7, 2020
9e77c35
Adds updates required for diag_axis_init to the CHANGELOG.md file
thomas-robinson Feb 7, 2020
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
18 changes: 9 additions & 9 deletions diag_manager/diag_axis.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ MODULE diag_axis_mod
! </IN>
! <IN NAME="tile_count" TYPE="INTEGER, OPTIONAL" />
INTEGER FUNCTION diag_axis_init(name, DATA, units, cart_name, long_name, direction,&
& set_name, edges, Domain, Domain2, DomainU, aux, req, tile_count, pos)
& set_name, edges, Domain, Domain2, DomainU, aux, req, tile_count, domain_position )
CHARACTER(len=*), INTENT(in) :: name
REAL, DIMENSION(:), INTENT(in) :: DATA
CHARACTER(len=*), INTENT(in) :: units
Expand All @@ -166,7 +166,7 @@ INTEGER FUNCTION diag_axis_init(name, DATA, units, cart_name, long_name, directi
TYPE(domainUG), INTENT(in), OPTIONAL :: DomainU
CHARACTER(len=*), INTENT(in), OPTIONAL :: aux, req
INTEGER, INTENT(in), OPTIONAL :: tile_count
INTEGER, INTENT(in), OPTIONAL :: pos
INTEGER, INTENT(in), OPTIONAL :: domain_position


TYPE(domain1d) :: domain_x, domain_y
Expand Down Expand Up @@ -299,15 +299,15 @@ INTEGER FUNCTION diag_axis_init(name, DATA, units, cart_name, long_name, directi
ELSE
Axes(diag_axis_init)%req = 'none'
END IF
IF ( PRESENT(pos) ) THEN
if (pos == NORTH .or. pos == EAST .or. pos == CENTER) then
Axes(diag_axis_init)%pos = pos
IF ( PRESENT(domain_position) ) THEN
if (domain_position == NORTH .or. domain_position == EAST .or. domain_position == CENTER) then
Axes(diag_axis_init)%domain_position = domain_position
else
CALL error_mesg('diag_axis_mod::diag_axis_init', "Position must be NORTH, EAST, or CENTER" ,&
FATAL)
endif
ELSE
Axes(diag_axis_init)%pos = CENTER
Axes(diag_axis_init)%domain_position = CENTER
END IF

!---- axis direction (-1, 0, or +1) ----
Expand Down Expand Up @@ -536,7 +536,7 @@ END FUNCTION diag_subaxes_init
! Array of coordinate values for this axis.
! </OUT>
SUBROUTINE get_diag_axis(id, name, units, long_name, cart_name,&
& direction, edges, Domain, DomainU, DATA, num_attributes, attributes, pos)
& direction, edges, Domain, DomainU, DATA, num_attributes, attributes, domain_position)
CHARACTER(len=*), INTENT(out) :: name, units, long_name, cart_name
INTEGER, INTENT(in) :: id
TYPE(domain1d), INTENT(out) :: Domain
Expand All @@ -545,7 +545,7 @@ SUBROUTINE get_diag_axis(id, name, units, long_name, cart_name,&
REAL, DIMENSION(:), INTENT(out) :: DATA
INTEGER, INTENT(out), OPTIONAL :: num_attributes
TYPE(diag_atttype), ALLOCATABLE, DIMENSION(:), INTENT(out), OPTIONAL :: attributes
INTEGER, INTENT(out), OPTIONAL :: pos
INTEGER, INTENT(out), OPTIONAL :: domain_position

INTEGER :: i, j, istat

Expand All @@ -558,7 +558,7 @@ SUBROUTINE get_diag_axis(id, name, units, long_name, cart_name,&
edges = Axes(id)%edges
Domain = Axes(id)%Domain
DomainU = Axes(id)%DomainUG
if (present(pos)) pos = Axes(id)%pos
if (present(domain_position)) domain_position = Axes(id)%domain_position
IF ( Axes(id)%length > SIZE(DATA(:)) ) THEN
! <ERROR STATUS="FATAL">array data is too small.</ERROR>
CALL error_mesg('diag_axis_mod::get_diag_axis', 'array data is too small', FATAL)
Expand Down
2 changes: 1 addition & 1 deletion diag_manager/diag_data.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ MODULE diag_data_mod
INTEGER :: tile_count
TYPE(diag_atttype), _ALLOCATABLE, dimension(:) :: attributes _NULL
INTEGER :: num_attributes
INTEGER :: pos !< The position in the doman (NORTH or EAST or CENTER)
INTEGER :: domain_position !< The position in the doman (NORTH or EAST or CENTER)
END TYPE diag_axis_type
! </TYPE>

Expand Down
2 changes: 1 addition & 1 deletion diag_manager/diag_output.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ SUBROUTINE write_axis_meta_data(file_unit, axes, fileob, time_ops, time_axis_reg

CALL get_diag_axis(id_axis, axis_name, axis_units, axis_long_name,&
& axis_cart_name, axis_direction, axis_edges, Domain, DomainU, axis_data,&
& num_attributes, attributes, pos=axis_pos)
& num_attributes, attributes, domain_position=axis_pos)

IF ( Domain .NE. null_domain1d ) THEN
IF ( length > 0 ) THEN
Expand Down