Skip to content

New dimension nSnowLevels added #1

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

Open
mpaiao wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

New dimension nSnowLevels added #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions namelist/convert_mpas.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
nOznLevels = 59
nMonths = 12
nSoilLevels = 4
nSnowLevels = 3
nIsobaricLev= 27
/
7 changes: 4 additions & 3 deletions src/convert_mpas.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,10 @@ program convert_mpas
integer :: nOznLevels = 59
integer :: nMonths = 12
integer :: nSoilLevels = 4
integer :: nSnowLevels = 3
integer :: nIsobaricLev = 27
character(len=20) :: verticalCoord = ''
namelist /config_convert_mpas/ verticalCoord, nVertLevels, nOznLevels, nMonths, nSoilLevels, nIsobaricLev
namelist /config_convert_mpas/ verticalCoord, nVertLevels, nOznLevels, nMonths, nSoilLevels, nSnowLevels, nIsobaricLev

call timer_start(total_timer)

Expand Down Expand Up @@ -258,9 +259,9 @@ program convert_mpas
if (can_remap_field(field) .and. &
should_remap_field(field, include_field_list, exclude_field_list)) then
if (trim(verticalCoord) == 'Pressure') then
stat = remap_field_dryrun(nIsobaricLev, nOznLevels, nSoilLevels, remap_info, field, target_field)
stat = remap_field_dryrun(nIsobaricLev, nOznLevels, nSoilLevels, nSnowLevels, remap_info, field, target_field)
else if (trim(verticalCoord) == 'MPAS_Model') then
stat = remap_field_dryrun(nVertLevels, nOznLevels, nSoilLevels, remap_info, field, target_field)
stat = remap_field_dryrun(nVertLevels, nOznLevels, nSoilLevels, nSnowLevels, remap_info, field, target_field)
else
write (0, *) 'error at verticalCoord=', trim(verticalCoord)
stop 44
Expand Down
10 changes: 8 additions & 2 deletions src/remapper.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,11 +339,11 @@ logical function can_remap_field(field)

end function can_remap_field

integer function remap_field_dryrun(nVertLevels, nOznLevels, nSoilLevels, &
integer function remap_field_dryrun(nVertLevels, nOznLevels, nSoilLevels, nSnowLevels, &
remap_info, src_field, dst_field) result(stat)

implicit none
integer, intent(in) :: nVertLevels, nOznLevels, nSoilLevels
integer, intent(in) :: nVertLevels, nOznLevels, nSoilLevels, nSnowLevels
type(remap_info_type), intent(in) :: remap_info
type(input_field_type), intent(in) :: src_field
type(target_field_type), intent(out) :: dst_field
Expand Down Expand Up @@ -399,6 +399,9 @@ integer function remap_field_dryrun(nVertLevels, nOznLevels, nSoilLevels, &
else if (src_field%dimnames(idim) == 'nSoilLevels') then
dst_field%dimlens(2 + idim) = nSoilLevels
dst_field%dimnames(2 + idim) = 'level'
else if (src_field%dimnames(idim) == 'nSnowLevels') then
dst_field%dimlens(2 + idim) = nSnowLevels
dst_field%dimnames(2 + idim) = 'level'
else
dst_field%dimlens(2 + idim) = src_field%dimlens(idim)
dst_field%dimnames(2 + idim) = src_field%dimnames(idim)
Expand Down Expand Up @@ -427,6 +430,9 @@ integer function remap_field_dryrun(nVertLevels, nOznLevels, nSoilLevels, &
else if (src_field%dimnames(idim) == 'nSoilLevels') then
dst_field%dimlens(idim + 1) = nSoilLevels
dst_field%dimnames(idim + 1) = 'level'
else if (src_field%dimnames(idim) == 'nSnowLevels') then
dst_field%dimlens(idim + 1) = nSnowLevels
dst_field%dimnames(idim + 1) = 'level'
else
dst_field%dimlens(idim + 1) = src_field%dimlens(idim)
dst_field%dimnames(idim + 1) = src_field%dimnames(idim)
Expand Down
1 change: 1 addition & 0 deletions test/functional/convert_mpas.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
nOznLevels = 59
nMonths = 12
nSoilLevels = 4
nSnowLevels = 3
nIsobaricLev= 27
/