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

Esm4 maintenance fms2io #56

Merged
merged 2 commits into from
Jan 6, 2022
+7 −5
Merged

Esm4 maintenance fms2io #56

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
02228ad
This is the minimum required update to use 2020.01 FMS & FMScoupler
nikizadehgfdl Mar 23, 2020
8791525
Work with FMS2021.02
nikizadehgfdl Mar 31, 2021
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
2 changes: 2 additions & 0 deletions config_src/coupled_driver/ocean_model_MOM.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ module ocean_model_mod
use coupler_types_mod, only : coupler_type_set_diags, coupler_type_send_data
use mpp_domains_mod, only : domain2d, mpp_get_layout, mpp_get_global_domain
use mpp_domains_mod, only : mpp_define_domains, mpp_get_compute_domain, mpp_get_data_domain
use mpp_domains_mod, only : mpp_define_io_domain
use atmos_ocean_fluxes_mod, only : aof_set_coupler_flux
use fms_mod, only : stdout
use mpp_mod, only : mpp_chksum
Expand Down Expand Up @@ -759,6 +760,7 @@ subroutine initialize_ocean_public_type(input_domain, Ocean_sfc, diag, maskmap,
else
call mpp_define_domains((/1,xsz,1,ysz/),layout,Ocean_sfc%Domain)
endif
call mpp_define_io_domain(Ocean_sfc%Domain, (/1, 1/))
call mpp_get_compute_domain(Ocean_sfc%Domain, isc, iec, jsc, jec)

allocate ( Ocean_sfc%t_surf (isc:iec,jsc:jec), &
Expand Down
10 changes: 5 additions & 5 deletions src/framework/MOM_diag_mediator.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module MOM_diag_mediator
use diag_axis_mod, only : get_diag_axis_name
use diag_data_mod, only : null_axis_id
use diag_manager_mod, only : diag_manager_init, diag_manager_end
use diag_manager_mod, only : send_data, diag_axis_init, diag_field_add_attribute
use diag_manager_mod, only : send_data, diag_axis_init, EAST, NORTH, diag_field_add_attribute
! The following module is needed for PGI since the following line does not compile with PGI 6.5.0
! was: use diag_manager_mod, only : register_diag_field_fms=>register_diag_field
use MOM_diag_manager_wrapper, only : register_diag_field_fms
Expand Down Expand Up @@ -257,14 +257,14 @@ subroutine set_axes_info(G, GV, param_file, diag_cs, set_vertical)

if (G%symmetric) then
id_xq = diag_axis_init('xq', G%gridLonB(G%isgB:G%iegB), G%x_axis_units, 'x', &
'q point nominal longitude', Domain2=G%Domain%mpp_domain)
'q point nominal longitude', Domain2=G%Domain%mpp_domain, domain_position=EAST)
id_yq = diag_axis_init('yq', G%gridLatB(G%jsgB:G%jegB), G%y_axis_units, 'y', &
'q point nominal latitude', Domain2=G%Domain%mpp_domain)
'q point nominal latitude', Domain2=G%Domain%mpp_domain, domain_position=NORTH)
else
id_xq = diag_axis_init('xq', G%gridLonB(G%isg:G%ieg), G%x_axis_units, 'x', &
'q point nominal longitude', Domain2=G%Domain%mpp_domain)
'q point nominal longitude', Domain2=G%Domain%mpp_domain, domain_position=EAST)
id_yq = diag_axis_init('yq', G%gridLatB(G%jsg:G%jeg), G%y_axis_units, 'y', &
'q point nominal latitude', Domain2=G%Domain%mpp_domain)
'q point nominal latitude', Domain2=G%Domain%mpp_domain, domain_position=NORTH)
endif
id_xh = diag_axis_init('xh', G%gridLonT(G%isg:G%ieg), G%x_axis_units, 'x', &
'h point nominal longitude', Domain2=G%Domain%mpp_domain)
Expand Down