Skip to content

Commit

Permalink
Merge pull request #48 from NOAA-GFDL/dev/gfdl
Browse files Browse the repository at this point in the history 
merge in latest dev/gfdl updates
  • Loading branch information
@wrongkindofdoctor
wrongkindofdoctor authored Feb 10, 2020
2 parents cee0a21 + e9e3d4b commit 477d9f8
Show file tree
Hide file tree
Showing 6 changed files with 639 additions and 174 deletions.
32 changes: 16 additions & 16 deletions src/core/MOM_open_boundary.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -904,8 +904,8 @@ subroutine setup_u_point_obc(OBC, G, US, segment_str, l_seg, PF, reentrant_y)
OBC%segment(l_seg)%open = .true.
OBC%Flather_u_BCs_exist_globally = .true.
OBC%open_u_BCs_exist_globally = .true.
OBC%segment%z_values_needed = .true.
OBC%segment%u_values_needed = .true.
OBC%segment(l_seg)%z_values_needed = .true.
OBC%segment(l_seg)%u_values_needed = .true.
elseif (trim(action_str(a_loop)) == 'ORLANSKI') then
OBC%segment(l_seg)%radiation = .true.
OBC%segment(l_seg)%open = .true.
Expand Down Expand Up @@ -933,28 +933,28 @@ subroutine setup_u_point_obc(OBC, G, US, segment_str, l_seg, PF, reentrant_y)
elseif (trim(action_str(a_loop)) == 'NUDGED') then
OBC%segment(l_seg)%nudged = .true.
OBC%nudged_u_BCs_exist_globally = .true.
OBC%segment%u_values_needed = .true.
OBC%segment(l_seg)%u_values_needed = .true.
elseif (trim(action_str(a_loop)) == 'NUDGED_TAN') then
OBC%segment(l_seg)%nudged_tan = .true.
OBC%nudged_u_BCs_exist_globally = .true.
OBC%segment%v_values_needed = .true.
OBC%segment(l_seg)%v_values_needed = .true.
elseif (trim(action_str(a_loop)) == 'NUDGED_GRAD') then
OBC%segment(l_seg)%nudged_grad = .true.
OBC%segment%g_values_needed = .true.
OBC%segment(l_seg)%g_values_needed = .true.
elseif (trim(action_str(a_loop)) == 'GRADIENT') then
OBC%segment(l_seg)%gradient = .true.
OBC%segment(l_seg)%open = .true.
OBC%open_u_BCs_exist_globally = .true.
elseif (trim(action_str(a_loop)) == 'SIMPLE') then
OBC%segment(l_seg)%specified = .true.
OBC%specified_u_BCs_exist_globally = .true. ! This avoids deallocation
OBC%segment%u_values_needed = .true.
OBC%segment(l_seg)%u_values_needed = .true.
elseif (trim(action_str(a_loop)) == 'SIMPLE_TAN') then
OBC%segment(l_seg)%specified_tan = .true.
OBC%segment%v_values_needed = .true.
OBC%segment(l_seg)%v_values_needed = .true.
elseif (trim(action_str(a_loop)) == 'SIMPLE_GRAD') then
OBC%segment(l_seg)%specified_grad = .true.
OBC%segment%g_values_needed = .true.
OBC%segment(l_seg)%g_values_needed = .true.
else
call MOM_error(FATAL, "MOM_open_boundary.F90, setup_u_point_obc: "//&
"String '"//trim(action_str(a_loop))//"' not understood.")
Expand Down Expand Up @@ -1045,8 +1045,8 @@ subroutine setup_v_point_obc(OBC, G, US, segment_str, l_seg, PF, reentrant_x)
OBC%segment(l_seg)%open = .true.
OBC%Flather_v_BCs_exist_globally = .true.
OBC%open_v_BCs_exist_globally = .true.
OBC%segment%z_values_needed = .true.
OBC%segment%v_values_needed = .true.
OBC%segment(l_seg)%z_values_needed = .true.
OBC%segment(l_seg)%v_values_needed = .true.
elseif (trim(action_str(a_loop)) == 'ORLANSKI') then
OBC%segment(l_seg)%radiation = .true.
OBC%segment(l_seg)%open = .true.
Expand Down Expand Up @@ -1074,28 +1074,28 @@ subroutine setup_v_point_obc(OBC, G, US, segment_str, l_seg, PF, reentrant_x)
elseif (trim(action_str(a_loop)) == 'NUDGED') then
OBC%segment(l_seg)%nudged = .true.
OBC%nudged_v_BCs_exist_globally = .true.
OBC%segment%v_values_needed = .true.
OBC%segment(l_seg)%v_values_needed = .true.
elseif (trim(action_str(a_loop)) == 'NUDGED_TAN') then
OBC%segment(l_seg)%nudged_tan = .true.
OBC%nudged_v_BCs_exist_globally = .true.
OBC%segment%u_values_needed = .true.
OBC%segment(l_seg)%u_values_needed = .true.
elseif (trim(action_str(a_loop)) == 'NUDGED_GRAD') then
OBC%segment(l_seg)%nudged_grad = .true.
OBC%segment%g_values_needed = .true.
OBC%segment(l_seg)%g_values_needed = .true.
elseif (trim(action_str(a_loop)) == 'GRADIENT') then
OBC%segment(l_seg)%gradient = .true.
OBC%segment(l_seg)%open = .true.
OBC%open_v_BCs_exist_globally = .true.
elseif (trim(action_str(a_loop)) == 'SIMPLE') then
OBC%segment(l_seg)%specified = .true.
OBC%specified_v_BCs_exist_globally = .true. ! This avoids deallocation
OBC%segment%v_values_needed = .true.
OBC%segment(l_seg)%v_values_needed = .true.
elseif (trim(action_str(a_loop)) == 'SIMPLE_TAN') then
OBC%segment(l_seg)%specified_tan = .true.
OBC%segment%u_values_needed = .true.
OBC%segment(l_seg)%u_values_needed = .true.
elseif (trim(action_str(a_loop)) == 'SIMPLE_GRAD') then
OBC%segment(l_seg)%specified_grad = .true.
OBC%segment%g_values_needed = .true.
OBC%segment(l_seg)%g_values_needed = .true.
else
call MOM_error(FATAL, "MOM_open_boundary.F90, setup_v_point_obc: "//&
"String '"//trim(action_str(a_loop))//"' not understood.")
Expand Down
3 changes: 3 additions & 0 deletions src/core/MOM_unit_tests.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ module MOM_unit_tests
use MOM_remapping, only : remapping_unit_tests
use MOM_neutral_diffusion, only : neutral_diffusion_unit_tests
use MOM_diag_vkernels, only : diag_vkernels_unit_tests
use MOM_random, only : random_unit_tests

implicit none ; private

Expand All @@ -35,6 +36,8 @@ subroutine unit_tests(verbosity)
"MOM_unit_tests: neutralDiffusionUnitTests FAILED")
if (diag_vkernels_unit_tests(verbose)) call MOM_error(FATAL, &
"MOM_unit_tests: diag_vkernels_unit_tests FAILED")
if (random_unit_tests(verbose)) call MOM_error(FATAL, &
"MOM_unit_tests: random_unit_tests FAILED")
endif

end subroutine unit_tests
Expand Down
Loading

0 comments on commit 477d9f8

Please sign in to comment.