Skip to content

Commit

Permalink
Rename modules for NUOPC
Browse files Browse the repository at this point in the history
  • Loading branch information
@gustavo-marques
gustavo-marques committed Jul 30, 2019
1 parent 8a04b99 commit fc55c36
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
12 changes: 6 additions & 6 deletions config_src/nuopc_driver/MOM_cap.F90 → config_src/nuopc_driver/mom_cap.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
!!
!! The MOM cap package includes the cap code itself (MOM_cap.F90, MOM_cap_methods.F90
!! and MOM_cap_time.F90), a set of time utilities (time_utils.F90) for converting between ESMF and FMS
!! time type and two modules MOM_NUOPC_ocean_model.F90 and MOM_NUOPC_surface_forcing.F90. MOM_NUOPC_surface_forcing.F90
!! time type and two modules MOM_ocean_model_nuopc.F90 and MOM_surface_forcing_nuopc.F90. MOM_surface_forcing_nuopc.F90
!! converts the input ESMF data (import data) to a MOM-specific data type (surface_forcing_CS).
!! MOM_NUOPC_ocean_model.F90 contains routines for initialization, update and finalization of the ocean model state.
!! MOM_ocean_model_nuopc.F90 contains routines for initialization, update and finalization of the ocean model state.
!!
!! @subsection CapSubroutines Cap Subroutines
!!
Expand Down Expand Up @@ -340,11 +340,11 @@ module MOM_cap_mod
use MOM_get_input, only: Get_MOM_Input, directories
use MOM_domains, only: pass_var
use MOM_error_handler, only: is_root_pe
use MOM_NUOPC_ocean_model, only: ice_ocean_boundary_type
use MOM_ocean_model_nuopc, only: ice_ocean_boundary_type
use MOM_grid, only: ocean_grid_type, get_global_grid_size
use MOM_NUOPC_ocean_model, only: ocean_model_restart, ocean_public_type, ocean_state_type
use MOM_NUOPC_ocean_model, only: ocean_model_init_sfc
use MOM_NUOPC_ocean_model, only: ocean_model_init, update_ocean_model, ocean_model_end, get_ocean_grid
use MOM_ocean_model_nuopc, only: ocean_model_restart, ocean_public_type, ocean_state_type
use MOM_ocean_model_nuopc, only: ocean_model_init_sfc
use MOM_ocean_model_nuopc, only: ocean_model_init, update_ocean_model, ocean_model_end, get_ocean_grid
use MOM_cap_time, only: AlarmInit
use MOM_cap_methods, only: mom_import, mom_export, mom_set_geomtype
#ifdef CESMCOUPLED
Expand Down
4 changes: 2 additions & 2 deletions config_src/nuopc_driver/MOM_cap_methods.F90 → config_src/nuopc_driver/mom_cap_methods.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ module MOM_cap_methods
use ESMF, only: ESMF_RC_VAL_OUTOFRANGE, ESMF_INDEX_DELOCAL, ESMF_MESHLOC_ELEMENT
use ESMF, only: ESMF_TYPEKIND_R8
use ESMF, only: operator(/=), operator(==)
use MOM_NUOPC_ocean_model, only: ocean_public_type, ocean_state_type
use MOM_NUOPC_surface_forcing, only: ice_ocean_boundary_type
use MOM_ocean_model_nuopc, only: ocean_public_type, ocean_state_type
use MOM_surface_forcing_nuopc, only: ice_ocean_boundary_type
use MOM_grid, only: ocean_grid_type
use MOM_domains, only: pass_var
use mpp_domains_mod, only: mpp_get_compute_domain
Expand Down
0 config_src/nuopc_driver/MOM_cap_time.F90 → config_src/nuopc_driver/mom_cap_time.F90
View file
File renamed without changes.
14 changes: 7 additions & 7 deletions ...rc/nuopc_driver/MOM_NUOPC_ocean_model.F90 → ...rc/nuopc_driver/mom_ocean_model_nuopc.F90
View file
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_NUOPC_ocean_model
module MOM_ocean_model_nuopc

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

Expand Down Expand Up @@ -58,10 +58,10 @@ module MOM_NUOPC_ocean_model
use MOM_EOS, only : gsw_sp_from_sr, gsw_pt_from_ct
use MOM_wave_interface, only: wave_parameters_CS, MOM_wave_interface_init
use MOM_wave_interface, only: MOM_wave_interface_init_lite, Update_Surface_Waves
use MOM_NUOPC_surface_forcing, only : surface_forcing_init, convert_IOB_to_fluxes
use MOM_NUOPC_surface_forcing, only : convert_IOB_to_forces, ice_ocn_bnd_type_chksum
use MOM_NUOPC_surface_forcing, only : ice_ocean_boundary_type, surface_forcing_CS
use MOM_NUOPC_surface_forcing, only : forcing_save_restart
use MOM_surface_forcing_nuopc, only : surface_forcing_init, convert_IOB_to_fluxes
use MOM_surface_forcing_nuopc, only : convert_IOB_to_forces, ice_ocn_bnd_type_chksum
use MOM_surface_forcing_nuopc, only : ice_ocean_boundary_type, surface_forcing_CS
use MOM_surface_forcing_nuopc, only : forcing_save_restart

#include <MOM_memory.h>

Expand Down Expand Up @@ -475,7 +475,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_NUOPC_ocean_model.F90")
call callTree_enter("update_ocean_model(), MOM_ocean_model_nuopc.F90")
call get_time(Ocean_coupling_time_step, secs, days)
dt_coupling = 86400.0*real(days) + real(secs)

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

end module MOM_NUOPC_ocean_model
end module MOM_ocean_model_nuopc
6 changes: 3 additions & 3 deletions ...uopc_driver/MOM_NUOPC_surface_forcing.F90 → ...uopc_driver/mom_surface_forcing_nuopc.F90
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
!> Converts the input ESMF data (import data) to a MOM-specific data type (surface_forcing_CS).
module MOM_NUOPC_surface_forcing
module MOM_surface_forcing_nuopc

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

Expand Down Expand Up @@ -1011,7 +1011,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_NUOPC_surface_forcing" ! This module's name.
character(len=40) :: mdl = "MOM_surface_forcing_nuopc" ! This module's name.
character(len=48) :: stagger
character(len=48) :: flnam
character(len=240) :: basin_file
Expand Down Expand Up @@ -1383,4 +1383,4 @@ subroutine ice_ocn_bnd_type_chksum(id, timestep, iobt)

end subroutine ice_ocn_bnd_type_chksum

end module MOM_NUOPC_surface_forcing
end module MOM_surface_forcing_nuopc

0 comments on commit fc55c36

Please sign in to comment.