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 #3075 - propagate time-varying aspects of fields #3095

Merged
merged 2 commits into from
Oct 14, 2024
Merged

Fixes #3075 - propagate time-varying aspects of fields #3095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8249f4f
Fixes #3075
tclune Oct 12, 2024
5f2f64a
Missed updates to upstream code.
tclune Oct 13, 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
9 changes: 4 additions & 5 deletions GeomIO/SharedIO.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
#include "MAPL_Generic.h"
module mapl3g_SharedIO
use mapl_ErrorHandlingMod
use esmf
use mapl3g_InfoUtilities
use pfio
use gFTL2_StringVector
use mapl3g_geom_mgr
use MAPL_BaseMod
use mapl3g_UngriddedDims
use mapl3g_UngriddedDim
use mapl3g_FieldDimensionInfo
use esmf

implicit none

Expand Down Expand Up @@ -89,7 +90,6 @@ subroutine add_variable(metadata, field, rc)
character(len=:), allocatable :: dims
type(ESMF_TYPEKIND_FLAG) :: typekind
integer :: pfio_type
type(ESMF_Info) :: info
character(len=:), allocatable :: char
character(len=ESMF_MAXSTR) :: fname
type(MAPLGeom), pointer :: mapl_geom
Expand All @@ -112,10 +112,9 @@ subroutine add_variable(metadata, field, rc)
dims = dims//",time"
pfio_type = esmf_to_pfio_type(typekind ,_RC)
v = Variable(type=pfio_type, dimensions=dims)
call ESMF_InfoGetFromHost(field, info, _RC)
call ESMF_InfoGetCharAlloc(info, 'MAPL/units', char, _RC)
call MAPL_InfoGetInternal(field, 'units', char, _RC)
call v%add_attribute('units',char)
call ESMF_InfoGetCharAlloc(info, 'MAPL/standard_name', char, _RC)
call MAPL_InfoGetInternal(field, 'standard_name', char, _RC)
call v%add_attribute('long_name',char)
call metadata%add_variable(trim(fname), v, _RC)
_RETURN(_SUCCESS)
Expand Down
1 change: 1 addition & 0 deletions esmf_utils/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
esma_set_this (OVERRIDE MAPL.esmf_utils)

set(srcs
InfoUtilities.F90
FieldDimensionInfo.F90
UngriddedDim.F90
UngriddedDims.F90
Expand Down
56 changes: 25 additions & 31 deletions esmf_utils/FieldDimensionInfo.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
#include "MAPL_Generic.h"
module mapl3g_FieldDimensionInfo

use mapl3g_InfoUtilities
use mapl3g_UngriddedDim
use mapl3g_UngriddedDimVector
use mapl3g_UngriddedDims
use mapl3g_esmf_info_keys
use gFTL2_StringVector
use esmf, only: ESMF_Field, ESMF_FieldBundle, ESMF_FieldBundleGet
use esmf, only: ESMF_Info, ESMF_InfoIsPresent
use esmf, only: ESMF_Info, ESMF_InfoIsPresent, ESMF_InfoGet
use esmf, only: ESMF_InfoDestroy, ESMF_InfoCreate
use esmf, only: ESMF_InfoGet, ESMF_InfoGetFromHost
use esmf, only: ESMF_InfoGetAlloc, ESMF_InfoPrint
use esmf, only: ESMF_MAXSTR, ESMF_SUCCESS
use esmf, only: ESMF_InfoPrint
use Mapl_ErrorHandling

implicit none
Expand Down Expand Up @@ -60,15 +58,15 @@ integer function get_num_levels_bundle(bundle, rc) result(num)

end function get_num_levels_bundle

integer function get_num_levels_bundle_info(info, rc) result(num)
type(ESMF_Info), intent(in) :: info(:)
integer function get_num_levels_bundle_info(infos, rc) result(num)
type(ESMF_Info), intent(in) :: infos(:)
integer, optional, intent(out) :: rc
integer :: status
integer :: i, n

num = 0
do i=1, size(info)
n = get_num_levels_info(info(i), _RC)
do i=1, size(infos)
n = get_num_levels_info(infos(i), _RC)
num = max(num, n)
if(n == 0) cycle
_ASSERT(n == num, 'Fields with vertical levels must have the same number of levels.')
Expand All @@ -83,10 +81,11 @@ integer function get_num_levels_field(field, rc) result(num)
integer :: status
type(ESMF_Info) :: info

call ESMF_InfoGetFromHost(field, info, _RC)
info = MAPL_InfoCreateFromInternal(field, _RC)
num = get_num_levels_info(info, _RC)
_RETURN(_SUCCESS)
call ESMF_InfoDestroy(info, _RC)

_RETURN(_SUCCESS)
end function get_num_levels_field

integer function get_num_levels_info(info, rc) result(num)
Expand All @@ -98,9 +97,9 @@ integer function get_num_levels_info(info, rc) result(num)
num = 0
spec_name = get_vertical_dim_spec_info(info, _RC)
_RETURN_IF(spec_name == VERT_DIM_NONE)
call ESMF_InfoGet(info, key=KEY_NUM_LEVELS, value=num, _RC)
_RETURN(_SUCCESS)
call MAPL_InfoGet(info, key=KEY_NUM_LEVELS, value=num, _RC)

_RETURN(_SUCCESS)
end function get_num_levels_info

function get_vertical_dim_spec_names_bundle(bundle, rc) result(names)
Expand Down Expand Up @@ -140,10 +139,11 @@ function get_vertical_dim_spec_name_field(field, rc) result(spec_name)
integer :: status
type(ESMF_Info) :: info

call ESMF_InfoGetFromHost(field, info, _RC)
info = MAPL_InfoCreateFromInternal(field, _RC)
spec_name = get_vertical_dim_spec_info(info, _RC)
_RETURN(_SUCCESS)
call ESMF_InfoDestroy(info, _RC)

_RETURN(_SUCCESS)
end function get_vertical_dim_spec_name_field

function get_vertical_dim_spec_info(info, rc) result(spec_name)
Expand All @@ -152,15 +152,11 @@ function get_vertical_dim_spec_info(info, rc) result(spec_name)
integer, optional, intent(out) :: rc
integer :: status
logical :: isPresent
character(len=ESMF_MAXSTR) :: raw

call MAPL_InfoGet(info, key=KEY_VLOC, value=spec_name, _RC)
isPresent = ESMF_InfoIsPresent(info, key=KEY_VLOC, _RC)
_ASSERT(isPresent, 'Failed to get vertical dim spec name.')
call ESMF_InfoGet(info, key=KEY_VLOC, value=raw, _RC)
spec_name = trim(adjustl(raw))

_RETURN(_SUCCESS)

end function get_vertical_dim_spec_info

function get_ungridded_dims_bundle(bundle, rc) result(dims)
Expand Down Expand Up @@ -201,10 +197,11 @@ function get_ungridded_dims_field(field, rc) result(ungridded)
integer :: status
type(ESMF_Info) :: info

call ESMF_InfoGetFromHost(field, info, _RC)
info = MAPL_InfoCreateFromInternal(field, _RC)
ungridded = make_ungridded_dims(info, _RC)
_RETURN(_SUCCESS)
call ESMF_InfoDestroy(info, _RC)

_RETURN(_SUCCESS)
end function get_ungridded_dims_field

function make_ungridded_dims(info, rc) result(dims)
Expand All @@ -215,7 +212,7 @@ function make_ungridded_dims(info, rc) result(dims)
integer :: num_dims, i
type(UngriddedDim) :: ungridded

call ESMF_InfoGet(info, key=KEY_NUM_UNGRID_DIMS, value=num_dims, _RC)
call MAPL_InfoGet(info, key=KEY_NUM_UNGRIDDED_DIMS, value=num_dims, _RC)
do i=1, num_dims
ungridded = make_ungridded_dim(info, i, _RC)
call dims%add_dim(ungridded, _RC)
Expand All @@ -231,7 +228,6 @@ function make_ungridded_dim(info, n, rc) result(ungridded_dim)
integer, optional, intent(out) :: rc
integer :: status
type(ESMF_Info) :: dim_info
character(len=ESMF_MAXSTR) :: raw
character(len=:), allocatable :: key
character(len=:), allocatable :: name
character(len=:), allocatable :: units
Expand All @@ -246,11 +242,9 @@ function make_ungridded_dim(info, n, rc) result(ungridded_dim)
_FAIL('Key ' // trim(key) // ' not found in ' // trim(json_repr))
end if
dim_info = ESMF_InfoCreate(info, key=key, _RC)
call ESMF_InfoGet(dim_info, key=KEY_UNGRIDDED_NAME, value=raw, _RC)
name = trim(adjustl(raw))
call ESMF_InfoGet(dim_info, key=KEY_UNGRIDDED_UNITS, value=raw, _RC)
units = trim(adjustl(raw))
call ESMF_InfoGetAlloc(dim_info, key=KEY_UNGRIDDED_COORD, values=coordinates, _RC)
call MAPL_InfoGet(dim_info, key=KEY_UNGRIDDED_NAME, value=name, _RC)
call MAPL_InfoGet(dim_info, key=KEY_UNGRIDDED_UNITS, value=units, _RC)
call MAPL_InfoGet(dim_info, key=KEY_UNGRIDDED_COORD, values=coordinates, _RC)
call ESMF_InfoDestroy(dim_info, _RC)
ungridded_dim = UngriddedDim(coordinates, name=name, units=units)
_RETURN(_SUCCESS)
Expand Down Expand Up @@ -311,6 +305,7 @@ function create_bundle_info(bundle, rc) result(bundle_info)
type(ESMF_Info), allocatable :: bundle_info(:)
type(ESMF_FieldBundle), intent(in) :: bundle
integer, optional, intent(out) :: rc

integer :: status
integer :: field_count, i
type(ESMF_Field), allocatable :: fields(:)
Expand All @@ -323,8 +318,7 @@ function create_bundle_info(bundle, rc) result(bundle_info)
call ESMF_FieldBundleGet(bundle, fieldList=fields, _RC)
allocate(bundle_info(field_count))
do i=1, field_count
call ESMF_InfoGetFromHost(fields(i), info, _RC)
bundle_info(i) = info
bundle_info(i) = MAPL_InfoCreateFromInternal(fields(i), _RC)
end do
_RETURN(_SUCCESS)

Expand Down
Loading