Unstructured grid files axis #1114
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -138,9 +138,11 @@ INTEGER FUNCTION diag_axis_init(name, DATA, units, cart_name, long_name, directi | |
| ENDIF | ||
|
|
||
| if (use_modern_diag) then | ||
| !TODO Passing in the axis_length because of a gnu issue where inside fms_diag_axis_init, the size of DATA | ||
| !was 2 which was causing the axis_data to not be written correctly... | ||
| diag_axis_init = fms_diag_object%fms_diag_axis_init(name, DATA, units, cart_name, long_name=long_name,& | ||
| & direction=direction, set_name=set_name, edges=edges, Domain=Domain, Domain2=Domain2, DomainU=DomainU, & | ||
| & aux=aux, req=req, tile_count=tile_count, domain_position=domain_position, axis_length=size(DATA(:)) ) | ||
|
Contributor
Author
There was a problem hiding this comment. @rem1776 @thomas-robinson FYI i saw this with gnu 9.3. Let me know if you have a better fix for this. If I were to print the size(DATA(:)) here it gave me the correct answers, but inside fms_diag_axis_init it was equal to 2
Member
There was a problem hiding this comment. We discussed this, and it sounded good when we discussed it. |
||
| return | ||
| endif | ||
| IF ( PRESENT(tile_count)) THEN | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -49,7 +49,7 @@ module fms_diag_axis_object_mod | |
| public :: fmsDiagAxis_type, fms_diag_axis_object_init, fms_diag_axis_object_end, & | ||
| & get_domain_and_domain_type, diagDomain_t, & | ||
| & DIAGDOMAIN2D_T, fmsDiagSubAxis_type, fmsDiagAxisContainer_type, fmsDiagFullAxis_type, DIAGDOMAINUG_T | ||
| public :: define_new_axis, define_subaxis, parse_compress_att, get_axis_id_from_name | ||
|
|
||
| !> @} | ||
|
|
||
|
|
@@ -95,6 +95,9 @@ module fms_diag_axis_object_mod | |
| procedure :: get_subaxes_id | ||
| procedure :: write_axis_metadata | ||
| procedure :: write_axis_data | ||
| procedure :: add_structured_axis_ids | ||
| procedure :: get_structured_axis | ||
| procedure :: is_unstructured_grid | ||
| END TYPE fmsDiagAxis_type | ||
|
|
||
| !> @brief Type to hold the subaxis | ||
|
|
@@ -137,6 +140,8 @@ module fms_diag_axis_object_mod | |
| TYPE(fmsDiagAttribute_type),allocatable , private :: attributes(:) !< Array to hold user definable attributes | ||
| INTEGER , private :: num_attributes !< Number of defined attibutes | ||
| INTEGER , private :: domain_position !< The position in the doman (NORTH, EAST or CENTER) | ||
| integer , private :: structured_ids(2) !< If the axis is in the unstructured grid, | ||
|
Member
There was a problem hiding this comment. these are the mappings from unstructured to structured, correct?
Contributor
Author
There was a problem hiding this comment. these are not mappings, they are the axis IDs of the original structured axis |
||
| !! this is the axis ids of the structured axis | ||
|
|
||
| contains | ||
|
|
||
|
|
@@ -160,7 +165,7 @@ module fms_diag_axis_object_mod | |
| !!!!!!!!!!!!!!!!! DIAG AXIS PROCEDURES !!!!!!!!!!!!!!!!! | ||
| !> @brief Initialize the axis | ||
| subroutine register_diag_axis_obj(this, axis_name, axis_data, units, cart_name, long_name, direction,& | ||
| & set_name, Domain, Domain2, DomainU, aux, req, tile_count, domain_position, axis_length ) | ||
| class(fmsDiagFullAxis_type),INTENT(out) :: this !< Diag_axis obj | ||
| CHARACTER(len=*), INTENT(in) :: axis_name !< Name of the axis | ||
| class(*), INTENT(in) :: axis_data(:) !< Array of coordinate values | ||
|
|
@@ -177,6 +182,7 @@ subroutine register_diag_axis_obj(this, axis_name, axis_data, units, cart_name, | |
| CHARACTER(len=*), INTENT(in), OPTIONAL :: req !< Required field names. | ||
| INTEGER, INTENT(in), OPTIONAL :: tile_count !< Number of tiles | ||
| INTEGER, INTENT(in), OPTIONAL :: domain_position !< Domain position, "NORTH" or "EAST" | ||
| integer, intent(in), optional :: axis_length !< The length of the axis size(axis_data(:)) | ||
|
|
||
| this%axis_name = trim(axis_name) | ||
| this%units = trim(units) | ||
|
|
@@ -187,12 +193,14 @@ subroutine register_diag_axis_obj(this, axis_name, axis_data, units, cart_name, | |
|
|
||
| select type (axis_data) | ||
| type is (real(kind=r8_kind)) | ||
| allocate(real(kind=r8_kind) :: this%axis_data(axis_length)) | ||
| this%axis_data = axis_data | ||
| this%length = axis_length | ||
|
uramirez8707 marked this conversation as resolved.
|
||
| this%type_of_data = "double" !< This is what fms2_io expects in the register_field call | ||
| type is (real(kind=r4_kind)) | ||
| allocate(real(kind=r4_kind) :: this%axis_data(axis_length)) | ||
| this%axis_data = axis_data | ||
| this%length = axis_length | ||
|
Member
There was a problem hiding this comment. This is optional. What happens if it's not included?
Contributor
Author
There was a problem hiding this comment. Changed it to a required argument FMS/diag_manager/diag_axis.F90 Lines 143 to 145 in cf55696 |
||
| this%type_of_data = "float" !< This is what fms2_io expects in the register_field call | ||
| class default | ||
| call mpp_error(FATAL, "The axis_data in your diag_axis_init call is not a supported type. & | ||
|
|
@@ -226,8 +234,6 @@ subroutine register_diag_axis_obj(this, axis_name, axis_data, units, cart_name, | |
| if (present(domain_position)) this%domain_position = domain_position | ||
| call check_if_valid_domain_position(this%domain_position) | ||
|
|
||
| this%direction = 0 | ||
| if (present(direction)) this%direction = direction | ||
| call check_if_valid_direction(this%direction) | ||
|
|
@@ -237,6 +243,7 @@ subroutine register_diag_axis_obj(this, axis_name, axis_data, units, cart_name, | |
|
|
||
| this%nsubaxis = 0 | ||
| this%num_attributes = 0 | ||
| this%structured_ids = diag_null | ||
|
Member
There was a problem hiding this comment. Can this be allocatable instead of used for every axis? Or should we make a new type that extends the fmsDiagFullAxis_type
Contributor
Author
There was a problem hiding this comment. Changed this to allocatables |
||
| end subroutine register_diag_axis_obj | ||
|
|
||
| !> @brief Add an attribute to an axis | ||
|
|
@@ -304,13 +311,13 @@ subroutine write_axis_metadata(this, fileobj, parent_axis) | |
| end select | ||
| type is (FmsNetcdfUnstructuredDomainFile_t) | ||
| select case (diag_axis%type_of_domain) | ||
| case (UG_DOMAIN) | ||
| !< Here the axis is in a unstructured domain | ||
| call register_axis(fileobj, axis_name) | ||
| case default | ||
| !< Here the fileobj is in the unstructured domain, but the axis is not | ||
| !< Unstructured domain fileobjs can have axis that are not unstructured (i.e "Z" axis) | ||
| call register_axis(fileobj, axis_name, axis_length) | ||
| end select | ||
| end select | ||
|
|
||
|
|
@@ -377,6 +384,43 @@ subroutine write_axis_data(this, fileobj, parent_axis) | |
| end select | ||
| end subroutine write_axis_data | ||
|
|
||
| !< @brief Determine if the axis is in the unstructured grid | ||
| !! @return .True. if the axis is in unstructured grid | ||
| pure logical function is_unstructured_grid(this) | ||
| class(fmsDiagAxis_type), target, INTENT(in) :: this !< diag_axis obj | ||
|
|
||
| is_unstructured_grid = .false. | ||
| select type (this) | ||
| type is (fmsDiagFullAxis_type) | ||
| is_unstructured_grid = trim(this%cart_name) .eq. "U" | ||
| end select | ||
| end function is_unstructured_grid | ||
|
|
||
| !< @brief Adds the structured axis ids to the axis object | ||
| subroutine add_structured_axis_ids(this, axis_ids) | ||
| class(fmsDiagAxis_type), target, INTENT(inout) :: this !< diag_axis obj | ||
| integer, intent(in) :: axis_ids(2) !< axis ids to add to the axis object | ||
|
|
||
| select type (this) | ||
| type is (fmsDiagFullAxis_type) | ||
| this%structured_ids = axis_ids | ||
|
Member
There was a problem hiding this comment. this%structured_ids should be allocated here and then set to axis_ids. |
||
| end select | ||
| end subroutine add_structured_axis_ids | ||
|
|
||
| !< @brief Get the structured axis ids from the axis object | ||
| !! @return the structured axis ids | ||
| pure function get_structured_axis(this) & | ||
| result(rslt) | ||
| class(fmsDiagAxis_type), target, INTENT(in) :: this !< diag_axis obj | ||
| integer :: rslt(2) | ||
|
|
||
| rslt = diag_null | ||
| select type (this) | ||
| type is (fmsDiagFullAxis_type) | ||
| rslt = this%structured_ids | ||
| end select | ||
| end function get_structured_axis | ||
|
|
||
| !> @brief Get the starting and ending indices of the global io domain of the axis | ||
| subroutine get_global_io_domain(this, global_io_index) | ||
| class(fmsDiagFullAxis_type), intent(in) :: this !< diag_axis obj | ||
|
|
@@ -951,6 +995,48 @@ pure function get_subaxes_id(this) & | |
|
|
||
| end function | ||
|
|
||
| !< @brief Parses the "compress" attribute to get the names of the two axis | ||
| !! @return the names of the structured axis | ||
| pure function parse_compress_att(compress_att) & | ||
| result(axis_names) | ||
| class(*), intent(in) :: compress_att(:) !< The compress attribute to parse | ||
| character(len=120) :: axis_names(2) | ||
|
|
||
| integer :: ios !< Errorcode after parsting the compress attribute | ||
|
Member
There was a problem hiding this comment. should say "after parsing" |
||
|
|
||
| select type (compress_att) | ||
| type is (character(len=*)) | ||
| read(compress_att(1),*, iostat=ios) axis_names | ||
| if (ios .ne. 0) axis_names = "" | ||
| class default | ||
| axis_names = "" | ||
| end select | ||
| end function parse_compress_att | ||
|
|
||
| !< @brief Determine the axis id of a axis | ||
| !! @return Axis id | ||
| pure function get_axis_id_from_name(axis_name, diag_axis, naxis) & | ||
| result(axis_id) | ||
| class(fmsDiagAxisContainer_type), intent(in) :: diag_axis(:) !< Array of axis object | ||
| character(len=*), intent(in) :: axis_name !< Name of the axis | ||
| integer, intent(in) :: naxis !< Number of axis that have been registered | ||
| integer :: axis_id | ||
|
|
||
| integer :: i !< For do loops | ||
|
|
||
| axis_id = diag_null | ||
| do i = 1, naxis | ||
| select type(axis => diag_axis(i)%axis) | ||
| type is (fmsDiagFullAxis_type) | ||
| if (trim(axis%axis_name) .eq. trim(axis_name)) then | ||
| axis_id = i | ||
| return | ||
| endif | ||
| end select | ||
| enddo | ||
|
|
||
| end function get_axis_id_from_name | ||
|
|
||
| #endif | ||
| end module fms_diag_axis_object_mod | ||
| !> @} | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If this is a bug with a SPECIFIC gnu version, do we need to fix it or can we just say it's not compatible with that version? Is this a C5, CI, or dev box compiler?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The version of gnu is what we used in the CI
I can also reproduce in the dev box.