From fc55c3641badbb6d781c4e065b26e823cb5dae21 Mon Sep 17 00:00:00 2001 From: Gustavo Marques Date: Tue, 30 Jul 2019 14:24:06 -0600 Subject: [PATCH] Rename modules for NUOPC --- .../nuopc_driver/{MOM_cap.F90 => mom_cap.F90} | 12 ++++++------ .../{MOM_cap_methods.F90 => mom_cap_methods.F90} | 4 ++-- .../{MOM_cap_time.F90 => mom_cap_time.F90} | 0 ...C_ocean_model.F90 => mom_ocean_model_nuopc.F90} | 14 +++++++------- ...e_forcing.F90 => mom_surface_forcing_nuopc.F90} | 6 +++--- 5 files changed, 18 insertions(+), 18 deletions(-) rename config_src/nuopc_driver/{MOM_cap.F90 => mom_cap.F90} (99%) rename config_src/nuopc_driver/{MOM_cap_methods.F90 => mom_cap_methods.F90} (99%) rename config_src/nuopc_driver/{MOM_cap_time.F90 => mom_cap_time.F90} (100%) rename config_src/nuopc_driver/{MOM_NUOPC_ocean_model.F90 => mom_ocean_model_nuopc.F90} (99%) rename config_src/nuopc_driver/{MOM_NUOPC_surface_forcing.F90 => mom_surface_forcing_nuopc.F90} (99%) diff --git a/config_src/nuopc_driver/MOM_cap.F90 b/config_src/nuopc_driver/mom_cap.F90 similarity index 99% rename from config_src/nuopc_driver/MOM_cap.F90 rename to config_src/nuopc_driver/mom_cap.F90 index cf182eb0d7..d6a7837c83 100644 --- a/config_src/nuopc_driver/MOM_cap.F90 +++ b/config_src/nuopc_driver/mom_cap.F90 @@ -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 !! @@ -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 diff --git a/config_src/nuopc_driver/MOM_cap_methods.F90 b/config_src/nuopc_driver/mom_cap_methods.F90 similarity index 99% rename from config_src/nuopc_driver/MOM_cap_methods.F90 rename to config_src/nuopc_driver/mom_cap_methods.F90 index 36b8ea97bc..8cb1a2ca4c 100644 --- a/config_src/nuopc_driver/MOM_cap_methods.F90 +++ b/config_src/nuopc_driver/mom_cap_methods.F90 @@ -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 diff --git a/config_src/nuopc_driver/MOM_cap_time.F90 b/config_src/nuopc_driver/mom_cap_time.F90 similarity index 100% rename from config_src/nuopc_driver/MOM_cap_time.F90 rename to config_src/nuopc_driver/mom_cap_time.F90 diff --git a/config_src/nuopc_driver/MOM_NUOPC_ocean_model.F90 b/config_src/nuopc_driver/mom_ocean_model_nuopc.F90 similarity index 99% rename from config_src/nuopc_driver/MOM_NUOPC_ocean_model.F90 rename to config_src/nuopc_driver/mom_ocean_model_nuopc.F90 index 441674020c..95b1bcc6e3 100644 --- a/config_src/nuopc_driver/MOM_NUOPC_ocean_model.F90 +++ b/config_src/nuopc_driver/mom_ocean_model_nuopc.F90 @@ -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. @@ -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 @@ -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) @@ -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 diff --git a/config_src/nuopc_driver/MOM_NUOPC_surface_forcing.F90 b/config_src/nuopc_driver/mom_surface_forcing_nuopc.F90 similarity index 99% rename from config_src/nuopc_driver/MOM_NUOPC_surface_forcing.F90 rename to config_src/nuopc_driver/mom_surface_forcing_nuopc.F90 index b8e6adf11b..b6517de9e4 100644 --- a/config_src/nuopc_driver/MOM_NUOPC_surface_forcing.F90 +++ b/config_src/nuopc_driver/mom_surface_forcing_nuopc.F90 @@ -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. @@ -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 @@ -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