From 611132731dd731b7f2f4d26bcde2188b218fafef Mon Sep 17 00:00:00 2001 From: Robert Hallberg Date: Sun, 3 Jan 2021 09:46:01 -0500 Subject: [PATCH] Use MOM_read_data in RGC_initialization Use MOM_read_data in place of read_data in RGC_initialization to match the routines used in other modules and facilitate migration to FMS2. All answers are bitwise identical. --- src/user/RGC_initialization.F90 | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/user/RGC_initialization.F90 b/src/user/RGC_initialization.F90 index 70b9fcd4dc..1600aca5bd 100644 --- a/src/user/RGC_initialization.F90 +++ b/src/user/RGC_initialization.F90 @@ -28,8 +28,7 @@ module RGC_initialization use MOM_file_parser, only : get_param, log_version, param_file_type use MOM_get_input, only : directories use MOM_grid, only : ocean_grid_type -use MOM_io, only : file_exists, read_data -use MOM_io, only : slasher +use MOM_io, only : file_exists, MOM_read_data, slasher use MOM_sponge, only : sponge_CS, set_up_sponge_field, initialize_sponge use MOM_sponge, only : set_up_sponge_ML_density use MOM_unit_scaling, only : unit_scale_type @@ -173,12 +172,12 @@ subroutine RGC_initialize_sponges(G, GV, US, tv, u, v, PF, use_ALE, CSp, ACSp) filename = trim(inputdir)//trim(state_file) if (.not.file_exists(filename, G%Domain)) & call MOM_error(FATAL, " RGC_initialize_sponges: Unable to open "//trim(filename)) - call read_data(filename,temp_var,T(:,:,:), domain=G%Domain%mpp_domain) - call read_data(filename,salt_var,S(:,:,:), domain=G%Domain%mpp_domain) + call MOM_read_data(filename, temp_var, T(:,:,:), G%Domain) + call MOM_read_data(filename, salt_var, S(:,:,:), G%Domain) if (use_ALE) then - call read_data(filename,h_var,h(:,:,:), domain=G%Domain%mpp_domain) + call MOM_read_data(filename, h_var, h(:,:,:), G%Domain) call pass_var(h, G%domain) !call initialize_ALE_sponge(Idamp, h, nz, G, PF, ACSp) @@ -201,7 +200,7 @@ subroutine RGC_initialize_sponges(G, GV, US, tv, u, v, PF, use_ALE, CSp, ACSp) else ! layer mode !read eta - call read_data(filename,eta_var,eta(:,:,:), domain=G%Domain%mpp_domain) + call MOM_read_data(filename, eta_var, eta(:,:,:), G%Domain) ! Set the inverse damping rates so that the model will know where to ! apply the sponges, along with the interface heights.