Moved OBC_Reg to OBC structure.

mom-ocean · Apr 24, 2017 · 6d9ed7c · 6d9ed7c
1 parent 4a21c52
commit 6d9ed7c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/core/MOM.F90 b/src/core/MOM.F90
@@ -393,7 +393,6 @@ module MOM
   type(diagnostics_CS),          pointer :: diagnostics_CSp        => NULL()
   type(diag_to_Z_CS),            pointer :: diag_to_Z_CSp          => NULL()
   type(MOM_restart_CS),          pointer :: restart_CSp            => NULL()
-  type(OBC_registry_type),       pointer :: OBC_Reg                => NULL()
   type(update_OBC_CS),           pointer :: update_OBC_CSp         => NULL()
   type(ocean_OBC_type),          pointer :: OBC                    => NULL()
   type(sponge_CS),               pointer :: sponge_CSp             => NULL()
@@ -2227,8 +2226,6 @@ subroutine initialize_MOM(Time, param_file, dirs, CS, Time_in, offline_tracer_mo
   call call_tracer_register(dG%HI, GV, param_file, CS%tracer_flow_CSp, &
                             CS%tracer_Reg, CS%restart_CSp)
 
-  call call_OBC_register(param_file, CS%update_OBC_CSp, CS%OBC_Reg)
-
   call MEKE_alloc_register_restart(dG%HI, param_file, CS%MEKE, CS%restart_CSp)
   call set_visc_register_restarts(dG%HI, GV, param_file, CS%visc, CS%restart_CSp)
   call mixedlayer_restrat_register_restarts(dG%HI, param_file, CS%mixedlayer_restrat_CSp, CS%restart_CSp)
@@ -2239,6 +2236,9 @@ subroutine initialize_MOM(Time, param_file, dirs, CS, Time_in, offline_tracer_mo
   call cpu_clock_begin(id_clock_MOM_init)
   call MOM_initialize_fixed(dG, CS%OBC, param_file, write_geom_files, dirs%output_directory)
   call callTree_waypoint("returned from MOM_initialize_fixed() (initialize_MOM)")
+
+  call call_OBC_register(param_file, CS%update_OBC_CSp, CS%OBC)
+
   call MOM_initialize_coord(GV, param_file, write_geom_files, &
                             dirs%output_directory, CS%tv, dG%max_depth)
   call callTree_waypoint("returned from MOM_initialize_coord() (initialize_MOM)")

diff --git a/src/core/MOM_boundary_update.F90 b/src/core/MOM_boundary_update.F90
@@ -52,10 +52,10 @@ module MOM_boundary_update
 !> The following subroutines and associated definitions provide the
 !! machinery to register and call the subroutines that initialize
 !! open boundary conditions.
-subroutine call_OBC_register(param_file, CS, OBC_Reg)
+subroutine call_OBC_register(param_file, CS, OBC)
   type(param_file_type),     intent(in) :: param_file !< Parameter file to parse
   type(update_OBC_CS),       pointer    :: CS         !< Control structure for OBCs
-  type(OBC_registry_type),   pointer    :: OBC_Reg    !< OBC registry
+  type(ocean_OBC_type),      pointer    :: OBC        !< Open boundary structure
   character(len=40)  :: mod = "MOM_boundary_update" ! This module's name.
 
   if (associated(CS)) then
@@ -81,16 +81,16 @@ subroutine call_OBC_register(param_file, CS, OBC_Reg)
 
   if (CS%use_files) CS%use_files = &
     register_file_OBC(param_file, CS%file_OBC_CSp, &
-                         OBC_Reg)
+               OBC%OBC_Reg)
   if (CS%use_tidal_bay) CS%use_tidal_bay = &
     register_tidal_bay_OBC(param_file, CS%tidal_bay_OBC_CSp, &
-                         OBC_Reg)
+               OBC%OBC_Reg)
   if (CS%use_Kelvin) CS%use_Kelvin = &
     register_Kelvin_OBC(param_file, CS%Kelvin_OBC_CSp, &
-                         OBC_Reg)
+               OBC%OBC_Reg)
   if (CS%use_shelfwave) CS%use_shelfwave = &
     register_shelfwave_OBC(param_file, CS%shelfwave_OBC_CSp, &
-                         OBC_Reg)
+               OBC%OBC_Reg)
 
 end subroutine call_OBC_register
 

diff --git a/src/core/MOM_open_boundary.F90 b/src/core/MOM_open_boundary.F90
@@ -172,6 +172,7 @@ module MOM_open_boundary
   logical :: OBC_pe !< Is there an open boundary on this tile?
   character(len=200) :: OBC_user_config
   type(remapping_CS), pointer         :: remap_CS   ! ALE remapping control structure for segments only
+  type(OBC_registry_type),       pointer :: OBC_Reg                => NULL()
 end type ocean_OBC_type
 
 !> Control structure for open boundaries that read from files.