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.

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

Update i/o routines for new surface coldstart file. #698

Merged
merged 28 commits into from
Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
fc9c8dc
Update read of surface restart file to make the surface-specific
GeorgeGayno-NOAA Jun 28, 2023
9da8ce4
Update some comments.
GeorgeGayno-NOAA Jun 28, 2023
ede603f
Merge branch 'develop' into sfc_coldstart
GeorgeGayno-NOAA Aug 4, 2023
bfd2417
Point to correct ccpp/physics and upp tags.
GeorgeGayno-NOAA Aug 4, 2023
99cc1ce
Fix syntax error.
GeorgeGayno-NOAA Aug 4, 2023
7ffdcbe
Merge branch 'develop' into sfc_coldstart
GeorgeGayno-NOAA Sep 11, 2023
aba1b3c
Update logic to read either an 'old' style surface coldstart
GeorgeGayno-NOAA Sep 13, 2023
b5db890
Merge branch 'develop' into sfc_coldstart
GeorgeGayno-NOAA Sep 14, 2023
52b5e52
Merge remote-tracking branch 'george/develop' into sfc_coldstart
GeorgeGayno-NOAA Oct 2, 2023
11e45bf
Merge branch 'develop' into sfc_coldstart
GeorgeGayno-NOAA Oct 6, 2023
d9b51ea
Add some diagnostic print.
GeorgeGayno-NOAA Oct 16, 2023
cba3774
Merge branch 'develop' into sfc_coldstart
GeorgeGayno-NOAA Oct 16, 2023
35cefaa
Merge branch 'develop' into sfc_coldstart
GeorgeGayno-NOAA Oct 18, 2023
cf0e185
Merge branch 'develop' into sfc_coldstart
GeorgeGayno-NOAA Oct 27, 2023
2f9860c
Merge branch 'develop' into sfc_coldstart
GeorgeGayno-NOAA Nov 2, 2023
3a01a98
Merge branch 'develop' into sfc_coldstart
GeorgeGayno-NOAA Nov 17, 2023
cad8d4a
Merge branch 'develop' into sfc_coldstart
GeorgeGayno-NOAA Dec 4, 2023
e2f4f31
Merge branch 'develop' into sfc_coldstart
GeorgeGayno-NOAA Dec 14, 2023
9b0698b
Merge branch 'develop' into sfc_coldstart
GeorgeGayno-NOAA Dec 27, 2023
b027e3b
Remove temporary diagnostic print.
GeorgeGayno-NOAA Jan 4, 2024
49364d1
Merge branch 'develop' into sfc_coldstart
GeorgeGayno-NOAA Jan 4, 2024
cd3acbd
Merge branch 'develop' into sfc_coldstart
GeorgeGayno-NOAA Jan 16, 2024
31285f9
Merge branch 'develop' into sfc_coldstart
GeorgeGayno-NOAA Jan 18, 2024
5777d8b
Merge branch 'develop' into sfc_coldstart
GeorgeGayno-NOAA Jan 25, 2024
10036ab
Merge branch 'develop' into sfc_coldstart
GeorgeGayno-NOAA Jan 29, 2024
2d19c2a
Merge branch 'develop' into sfc_coldstart
GeorgeGayno-NOAA Jan 30, 2024
8ccaf59
Merge branch 'develop' into sfc_coldstart
GeorgeGayno-NOAA Jan 31, 2024
6a42a57
Merge branch 'develop' into sfc_coldstart
GeorgeGayno-NOAA Feb 2, 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
19 changes: 17 additions & 2 deletions io/fv3atm_restart_io.F90
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ module fv3atm_restart_io_mod
register_axis, register_restart_field, &
register_variable_attribute, register_field, &
read_restart, write_restart, write_data, &
get_global_io_domain_indices, get_dimension_size
get_global_io_domain_indices, get_dimension_size, &
global_att_exists, get_global_attribute
use mpp_domains_mod, only: domain2d
use fv3atm_common_io, only: create_2d_field_and_add_to_bundle, &
create_3d_field_and_add_to_bundle, copy_from_gfs_data, axis_type
Expand Down Expand Up @@ -515,6 +516,7 @@ subroutine sfc_prop_restart_read (Sfcprop, Atm_block, Model, fv_domain, warm_sta
!--- directory of the input files
character(5) :: indir='INPUT'
character(37) :: infile
character(2) :: file_ver
!--- fms2_io file open logic
logical :: amiopen
logical :: override_frac_grid
Expand Down Expand Up @@ -644,8 +646,21 @@ subroutine sfc_prop_restart_read (Sfcprop, Atm_block, Model, fv_domain, warm_sta
amiopen=open_file(Sfc_restart, trim(infile), "read", domain=fv_domain, is_restart=.true., dont_add_res_to_filename=.true.)
if( .not.amiopen ) call mpp_error(FATAL, 'Error opening file'//trim(infile))

if (global_att_exists(Sfc_restart, "file_version")) then
call get_global_attribute(Sfc_restart, "file_version", file_ver)
if (file_ver == "V2") then
sfc%is_v2_file=.true.
endif
endif

print*,'^^^^ process sfc file ',sfc%is_v2_file
BrianCurtis-NOAA marked this conversation as resolved.
Show resolved Hide resolved

if(sfc%allocate_arrays(Model, Atm_block, .true., warm_start)) then
call sfc%fill_2d_names(Model, warm_start)
if (sfc%is_v2_file) then
call sfc%fill_2d_names_v2(Model, warm_start)
else
call sfc%fill_2d_names(Model, warm_start)
endif
call sfc%register_axes(Model, Sfc_restart, .true., warm_start)

! Tell CLM Lake to allocate data, and register its axes and fields
Expand Down
Loading