Skip to content

Cherrypick PR283 from dev/emc to main #296

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
laurenchilutti merged 3 commits into from
Oct 19, 2023
Merged

Cherrypick PR283 from dev/emc to main #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50fc492
Write netcdf axis variables using the same real kind as data variables
DusanJovic-NOAA Sep 11, 2023
eae88b4
more axis_type changes
laurenchilutti Sep 14, 2023
0759d86
more hard coded double precision register_fields corrected in fv_regi…
laurenchilutti Oct 16, 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
16 changes: 9 additions & 7 deletions model/fv_regional_bc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,10 @@ module fv_regional_mod

#ifdef OVERLOAD_R4
real, parameter:: real_snan=real(Z'FFBFFFFF')
character(len=5), parameter :: axis_type = 'float'
#else
real, parameter:: real_snan=real(Z'FFF7FFFFFFFFFFFF')
character(len=6), parameter :: axis_type = 'double'
#endif
real(kind=R_GRID), parameter:: dbl_snan=real(Z'FFF7FFFFFFFFFFFF',kind=R_GRID)

Expand Down Expand Up @@ -5785,23 +5787,23 @@ subroutine dump_field_3d (domain, name, field, isd, ied, jsd, jed, nlev, stag)

if (open_file(fileobj, fname, "overwrite", domain)) then
call register_axis(fileobj, "grid_xt", nxg)
call register_field(fileobj, "grid_xt", "double", (/"grid_xt"/))
call register_field(fileobj, "grid_xt", axis_type, (/"grid_xt"/))
call register_variable_attribute(fileobj, "grid_xt", "axis", "X", str_len=1)
call register_variable_attribute(fileobj, "grid_xt", "units", "km", str_len=len("km"))
call register_variable_attribute(fileobj, "grid_xt", "long_name", "X distance", str_len=len("X distance"))
call register_variable_attribute(fileobj, "grid_xt", "cartesian", "X", str_len=1)
call write_data(fileobj, "grid_xt", (/(i*1.0,i=1,nxg)/))

call register_axis(fileobj, "grid_yt", nyg)
call register_field(fileobj, "grid_yt", "double", (/"grid_yt"/))
call register_field(fileobj, "grid_yt", axis_type, (/"grid_yt"/))
call register_variable_attribute(fileobj, "grid_yt", "axis", "Y", str_len=1)
call register_variable_attribute(fileobj, "grid_yt", "units", "km", str_len=len("km"))
call register_variable_attribute(fileobj, "grid_yt", "long_name", "Y distance", str_len=len("Y distance"))
call register_variable_attribute(fileobj, "grid_yt", "cartesian", "Y", str_len=1)
call write_data(fileobj, "grid_yt", (/(j*1.0,j=1,nyg)/))

call register_axis(fileobj, "lev", nz)
call register_field(fileobj, "lev", "double", (/"lev"/))
call register_field(fileobj, "lev", axis_type, (/"lev"/))
call register_variable_attribute(fileobj, "lev", "axis", "Z", str_len=1)
call register_variable_attribute(fileobj, "lev", "units", "km", str_len=len("km"))
call register_variable_attribute(fileobj, "lev", "long_name", "Z distance", str_len=len("Z distance"))
Expand All @@ -5821,7 +5823,7 @@ subroutine dump_field_3d (domain, name, field, isd, ied, jsd, jed, nlev, stag)
call register_global_attribute(fileobj, "jhalo_shift", halo )
call register_global_attribute(fileobj, "hstagger", stagname )

call register_field(fileobj, name, "double", dim_names_3d)
call register_field(fileobj, name, axis_type, dim_names_3d)

call write_data(fileobj, name, glob_field)

Expand Down Expand Up @@ -5904,15 +5906,15 @@ subroutine dump_field_2d (domain, name, field, isd, ied, jsd, jed, stag)

if (open_file(fileobj, fname, "overwrite", domain)) then
call register_axis(fileobj, "grid_xt", nxg)
call register_field(fileobj, "grid_xt", "double", (/"grid_xt"/))
call register_field(fileobj, "grid_xt", axis_type, (/"grid_xt"/))
call register_variable_attribute(fileobj, "grid_xt", "axis", "X", str_len=1)
call register_variable_attribute(fileobj, "grid_xt", "units", "km", str_len=len("km"))
call register_variable_attribute(fileobj, "grid_xt", "long_name", "X distance", str_len=len("X distance"))
call register_variable_attribute(fileobj, "grid_xt", "cartesian", "X", str_len=1)
call write_data(fileobj, "grid_xt", (/(i*1.0,i=1,nxg)/))

call register_axis(fileobj, "grid_yt", nyg)
call register_field(fileobj, "grid_yt", "double", (/"grid_yt"/))
call register_field(fileobj, "grid_yt", axis_type, (/"grid_yt"/))
call register_variable_attribute(fileobj, "grid_yt", "axis", "Y", str_len=1)
call register_variable_attribute(fileobj, "grid_yt", "units", "km", str_len=len("km"))
call register_variable_attribute(fileobj, "grid_yt", "long_name", "Y distance", str_len=len("Y distance"))
Expand All @@ -5933,7 +5935,7 @@ subroutine dump_field_2d (domain, name, field, isd, ied, jsd, jed, stag)
call register_global_attribute(fileobj, "jhalo_shift", halo )
call register_global_attribute(fileobj, "hstagger", stagname )

call register_field(fileobj, name, "double", dim_names_3d)
call register_field(fileobj, name, axis_type, dim_names_3d)

call write_data(fileobj, name, glob_field)

Expand Down
18 changes: 12 additions & 6 deletions tools/fv_io.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,12 @@ module fv_io_mod
integer ::grid_xtdimid, grid_ytdimid, haloid, pfullid !For writing BCs
integer ::grid_xtstagdimid, grid_ytstagdimid, oneid

#ifdef OVERLOAD_R4
character(len=5), parameter :: axis_type = 'float'
#else
character(len=6), parameter :: axis_type = 'double'
#endif

contains

!#####################################################################
Expand Down Expand Up @@ -128,7 +134,7 @@ subroutine fv_io_register_axis(file_obj, numx, xpos, numy, ypos, numz, zsize)
axisname = 'xaxis_'//suffix
call register_axis(file_obj, axisname, 'X', domain_position=xpos(i))
if (.not. file_obj%is_readonly) then !if writing file
call register_field(file_obj, axisname, "double", (/axisname/))
call register_field(file_obj, axisname, axis_type, (/axisname/))
call register_variable_attribute(file_obj,axisname, "long_name", axisname, str_len=len(axisname))
call register_variable_attribute(file_obj,axisname, "units", "none", str_len=len("none"))
call register_variable_attribute(file_obj,axisname, "cartesian_axis", "X", str_len=1)
Expand All @@ -144,7 +150,7 @@ subroutine fv_io_register_axis(file_obj, numx, xpos, numy, ypos, numz, zsize)
axisname = 'yaxis_'//suffix
call register_axis(file_obj, axisname, 'Y', domain_position=ypos(i))
if (.not. file_obj%is_readonly) then !if writing file
call register_field(file_obj, axisname, "double", (/axisname/))
call register_field(file_obj, axisname, axis_type, (/axisname/))
call register_variable_attribute(file_obj,axisname, "long_name", axisname, str_len=len(axisname))
call register_variable_attribute(file_obj,axisname, "units", "none", str_len=len("none"))
call register_variable_attribute(file_obj,axisname, "cartesian_axis", "Y", str_len=1)
Expand All @@ -160,7 +166,7 @@ subroutine fv_io_register_axis(file_obj, numx, xpos, numy, ypos, numz, zsize)
axisname = 'zaxis_'//suffix
call register_axis(file_obj, axisname, zsize(i))
if (.not. file_obj%is_readonly) then !if writing file
call register_field(file_obj, axisname, "double", (/axisname/))
call register_field(file_obj, axisname, axis_type, (/axisname/))
call register_variable_attribute(file_obj,axisname, "long_name", axisname, str_len=len(axisname))
call register_variable_attribute(file_obj,axisname, "units", "none", str_len=len("none"))
call register_variable_attribute(file_obj,axisname, "cartesian_axis", "Z", str_len=1)
Expand All @@ -177,7 +183,7 @@ subroutine fv_io_register_axis(file_obj, numx, xpos, numy, ypos, numz, zsize)

call register_axis(file_obj, "Time", unlimited)
if (.not. file_obj%is_readonly) then !if writing file
call register_field(file_obj, "Time", "double", (/"Time"/))
call register_field(file_obj, "Time", axis_type, (/"Time"/))
call register_variable_attribute(file_obj, "Time", "long_name", "Time", &
str_len=len("Time"))
call register_variable_attribute(file_obj, "Time", "units", "time level", &
Expand Down Expand Up @@ -244,7 +250,7 @@ subroutine fv_io_register_restart(Atm)
call register_axis(Atm%Fv_restart, "xaxis_1", size(Atm%ak(:), 1))
call register_axis(Atm%Fv_restart, "Time", unlimited)
if (.not. Atm%Fv_restart%is_readonly) then !if writing file
call register_field(Atm%Fv_restart, dim_names_2d(1), "double", (/dim_names_2d(1)/))
call register_field(Atm%Fv_restart, dim_names_2d(1), axis_type, (/dim_names_2d(1)/))
call register_variable_attribute(Atm%Fv_restart, dim_names_2d(1), "long_name", dim_names_2d(1), str_len=len(dim_names_2d(1)))
call register_variable_attribute(Atm%Fv_restart, dim_names_2d(1), "units", "none", str_len=len("none"))
call register_variable_attribute(Atm%Fv_restart, dim_names_2d(1), "cartesian_axis", "X", str_len=1)
Expand All @@ -255,7 +261,7 @@ subroutine fv_io_register_restart(Atm)
end do
call write_data(Atm%Fv_restart, dim_names_2d(1), buffer)
deallocate(buffer)
call register_field(Atm%Fv_restart, dim_names_2d(2), "double", (/dim_names_2d(2)/))
call register_field(Atm%Fv_restart, dim_names_2d(2), axis_type, (/dim_names_2d(2)/))
call register_variable_attribute(Atm%Fv_restart, dim_names_2d(2), "long_name", dim_names_2d(2), str_len=len(dim_names_2d(2)))
call register_variable_attribute(Atm%Fv_restart, dim_names_2d(2), "units", "time level", str_len=len("time level"))
call register_variable_attribute(Atm%Fv_restart, dim_names_2d(2), "cartesian_axis", "T", str_len=1)
Expand Down