From c325f9c1bf182fc89bb47e5f4c84e5a7878c58a9 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Wed, 15 Apr 2020 22:30:32 +0000 Subject: [PATCH 1/2] Removes G_EARTH from OBCs - The parameter G_EARTH is unnecessarily read and logged by OBCs. This is normally innocuous except PR #1088 rearranges the call order between OBCs and vertGrid which puts G_EARTH in the wrong block in the doc files. - This removes G_EARTH from OBCs so it is not logged and the two outstanding PRs (#1088 and #1089) don't move G_EARTH to the wrong place. - This PR on its own does not change the doc files prior to #1088. --- src/core/MOM_open_boundary.F90 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/core/MOM_open_boundary.F90 b/src/core/MOM_open_boundary.F90 index 3b1559ab81..6ebb17baa8 100644 --- a/src/core/MOM_open_boundary.F90 +++ b/src/core/MOM_open_boundary.F90 @@ -240,7 +240,6 @@ module MOM_open_boundary logical :: zero_biharmonic = .false. !< If True, zeros the Laplacian of flow on open boundaries for !! use in the biharmonic viscosity term. logical :: brushcutter_mode = .false. !< If True, read data on supergrid. - real :: g_Earth !< The gravitational acceleration [m s-2]. logical, pointer, dimension(:) :: & tracer_x_reservoirs_used => NULL() !< Dimensioned by the number of tracers, set globally, !! true for those with x reservoirs (needed for restarts). @@ -347,9 +346,6 @@ subroutine open_boundary_config(G, US, param_file, OBC) call get_param(param_file, mdl, "OBC_NUMBER_OF_SEGMENTS", OBC%number_of_segments, & "The number of open boundary segments.", & default=0) - call get_param(param_file, mdl, "G_EARTH", OBC%g_Earth, & - "The gravitational acceleration of the Earth.", & - units="m s-2", default = 9.80) call get_param(param_file, mdl, "OBC_USER_CONFIG", config1, & "A string that sets how the open boundary conditions are "//& " configured: \n", default="none", do_not_log=.true.) From b4c4f28aa75956cc42029bebbb3d16929fdaf347 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Thu, 16 Apr 2020 13:19:20 +0000 Subject: [PATCH 2/2] Resolve conflict with NOAA-GFDL/MOM6#1088 - This branch/PR had been setup to precede NOAA-GFDL/MOM6#1088 to minimize changes to MOM6-examples but @Hallberg-NOAA jumped the gun and merged the PRs out of order. - This commit resolves the conflict and MOM6-examples needs to be fixed. --- src/core/MOM_open_boundary.F90 | 1 - 1 file changed, 1 deletion(-) diff --git a/src/core/MOM_open_boundary.F90 b/src/core/MOM_open_boundary.F90 index 3f529acf94..ffede1c0c2 100644 --- a/src/core/MOM_open_boundary.F90 +++ b/src/core/MOM_open_boundary.F90 @@ -4935,7 +4935,6 @@ subroutine rotate_OBC_config(OBC_in, G_in, OBC, G, turns) ! Scalar and logical transfer OBC%number_of_segments = OBC_in%number_of_segments - OBC%g_Earth = OBC_in%g_Earth OBC%ke = OBC_in%ke OBC%user_BCs_set_globally = OBC_in%user_BCs_set_globally