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

Rename modules in NUOPC and MCT #113

Merged
merged 5 commits into from
Jul 31, 2019
Merged

Rename modules in NUOPC and MCT #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1305e73
Rename modules in MCT
gustavo-marques Jul 29, 2019
3b2ad3f
Rename modules in NUOPC
gustavo-marques Jul 29, 2019
8a04b99
Rename modules for MCT
gustavo-marques Jul 30, 2019
fc55c36
Rename modules for NUOPC
gustavo-marques Jul 30, 2019
a34bdf4
Capitalize MOM inside MCT modules
gustavo-marques Jul 30, 2019
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: 8 additions & 8 deletions config_src/mct_driver/MOM_ocean_model.F90 → ...ig_src/mct_driver/mom_ocean_model_mct.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
!> Top-level module for the MOM6 ocean model in coupled mode.
module MOM_ocean_model
module MOM_ocean_model_mct

! This file is part of MOM6. See LICENSE.md for the license.

Expand Down Expand Up @@ -35,10 +35,10 @@ module MOM_ocean_model
use MOM_marine_ice, only : iceberg_forces, iceberg_fluxes, marine_ice_init, marine_ice_CS
use MOM_restart, only : MOM_restart_CS, save_restart
use MOM_string_functions, only : uppercase
use MOM_surface_forcing, only : surface_forcing_init, convert_IOB_to_fluxes
use MOM_surface_forcing, only : convert_IOB_to_forces, ice_ocn_bnd_type_chksum
use MOM_surface_forcing, only : ice_ocean_boundary_type, surface_forcing_CS
use MOM_surface_forcing, only : forcing_save_restart
use MOM_surface_forcing_mct, only : surface_forcing_init, convert_IOB_to_fluxes
use MOM_surface_forcing_mct, only : convert_IOB_to_forces, ice_ocn_bnd_type_chksum
use MOM_surface_forcing_mct, only : ice_ocean_boundary_type, surface_forcing_CS
use MOM_surface_forcing_mct, only : forcing_save_restart
use MOM_time_manager, only : time_type, get_time, set_time, operator(>)
use MOM_time_manager, only : operator(+), operator(-), operator(*), operator(/)
use MOM_time_manager, only : operator(/=), operator(<=), operator(>=)
Expand Down Expand Up @@ -263,7 +263,7 @@ subroutine ocean_model_init(Ocean_sfc, OS, Time_init, Time_in, gas_fields_ocn, i
type(param_file_type) :: param_file !< A structure to parse for run-time parameters
logical :: use_temperature

call callTree_enter("ocean_model_init(), ocean_model_MOM.F90")
call callTree_enter("ocean_model_init(), MOM_ocean_model_mct.F90")
if (associated(OS)) then
call MOM_error(WARNING, "ocean_model_init called with an associated "// &
"ocean_state_type structure. Model is already initialized.")
Expand Down Expand Up @@ -477,7 +477,7 @@ subroutine update_ocean_model(Ice_ocean_boundary, OS, Ocean_sfc, &
integer :: secs, days
integer :: is, ie, js, je

call callTree_enter("update_ocean_model(), MOM_ocean_model.F90")
call callTree_enter("update_ocean_model(), MOM_ocean_model_mct.F90")
call get_time(Ocean_coupling_time_step, secs, days)
dt_coupling = 86400.0*real(days) + real(secs)

Expand Down Expand Up @@ -1187,4 +1187,4 @@ subroutine get_ocean_grid(OS, Gridp)
return
end subroutine get_ocean_grid

end module MOM_ocean_model
end module MOM_ocean_model_mct
6 changes: 3 additions & 3 deletions ...ig_src/mct_driver/MOM_surface_forcing.F90 → ...rc/mct_driver/mom_surface_forcing_mct.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module MOM_surface_forcing
module MOM_surface_forcing_mct

! This file is part of MOM6. See LICENSE.md for the license.

Expand Down Expand Up @@ -1006,7 +1006,7 @@ subroutine surface_forcing_init(Time, G, US, param_file, diag, CS, restore_salt,
character(len=200) :: TideAmp_file, gust_file, salt_file, temp_file ! Input file names.
! This include declares and sets the variable "version".
#include "version_variable.h"
character(len=40) :: mdl = "MOM_surface_forcing" ! This module's name.
character(len=40) :: mdl = "MOM_surface_forcing_mct" ! This module's name.
character(len=48) :: stagger
character(len=48) :: flnam
character(len=240) :: basin_file
Expand Down Expand Up @@ -1378,4 +1378,4 @@ subroutine ice_ocn_bnd_type_chksum(id, timestep, iobt)

end subroutine ice_ocn_bnd_type_chksum

end module MOM_surface_forcing
end module MOM_surface_forcing_mct
16 changes: 8 additions & 8 deletions config_src/mct_driver/ocn_cap_methods.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
module ocn_cap_methods

use ESMF, only: ESMF_clock, ESMF_time, ESMF_ClockGet, ESMF_TimeGet
use MOM_ocean_model, only: ocean_public_type, ocean_state_type
use MOM_surface_forcing, only: ice_ocean_boundary_type
use MOM_grid, only: ocean_grid_type
use MOM_domains, only: pass_var
use MOM_error_handler, only: is_root_pe
use mpp_domains_mod, only: mpp_get_compute_domain
use ocn_cpl_indices, only: cpl_indices_type
use ESMF, only: ESMF_clock, ESMF_time, ESMF_ClockGet, ESMF_TimeGet
use MOM_ocean_model_mct, only: ocean_public_type, ocean_state_type
use MOM_surface_forcing_mct, only: ice_ocean_boundary_type
use MOM_grid, only: ocean_grid_type
use MOM_domains, only: pass_var
use MOM_error_handler, only: is_root_pe
use mpp_domains_mod, only: mpp_get_compute_domain
use ocn_cpl_indices, only: cpl_indices_type

implicit none
private
Expand Down
8 changes: 4 additions & 4 deletions config_src/mct_driver/ocn_comp_mct.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ module ocn_comp_mct
use mpp_domains_mod, only: mpp_get_compute_domain

! Previously inlined - now in separate modules
use MOM_ocean_model, only: ocean_public_type, ocean_state_type
use MOM_ocean_model, only: ocean_model_init , update_ocean_model, ocean_model_end
use MOM_ocean_model, only: convert_state_to_ocean_type
use MOM_surface_forcing, only: surface_forcing_CS, forcing_save_restart, ice_ocean_boundary_type
use MOM_ocean_model_mct, only: ocean_public_type, ocean_state_type
use MOM_ocean_model_mct, only: ocean_model_init , update_ocean_model, ocean_model_end
use MOM_ocean_model_mct, only: convert_state_to_ocean_type
use MOM_surface_forcing_mct, only: surface_forcing_CS, forcing_save_restart, ice_ocean_boundary_type
use ocn_cap_methods, only: ocn_import, ocn_export

! FMS modules
Expand Down
Loading