Skip to content

Commit

Permalink
Comment out call to initialize_segment_data.
Browse files Browse the repository at this point in the history
Also cleaned supercritical problem from MOM_fixed_initialization.
  • Loading branch information
kshedstrom committed Jan 11, 2017
1 parent fbaa8d9 commit e3dab80
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
6 changes: 3 additions & 3 deletions src/core/MOM_open_boundary.F90
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,9 @@ subroutine open_boundary_config(G, param_file, OBC)
endif
enddo

! if (open_boundary_query(OBC, needs_ext_seg_data=.true.) .and. .not. OBC%user_BCs_set_globally) &
if (open_boundary_query(OBC, needs_ext_seg_data=.true.)) &
call initialize_segment_data(G, OBC, param_file)
! if (open_boundary_query(OBC, needs_ext_seg_data=.true.) .and. .not. OBC%user_BCs_set_globally) &
! if (open_boundary_query(OBC, needs_ext_seg_data=.true.)) &
! call initialize_segment_data(G, OBC, param_file)
endif

! Safety check
Expand Down
4 changes: 0 additions & 4 deletions src/initialization/MOM_fixed_initialization.F90
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ module MOM_fixed_initialization
use sloshing_initialization, only : sloshing_initialize_topography
use seamount_initialization, only : seamount_initialize_topography
use Phillips_initialization, only : Phillips_initialize_topography
use supercritical_initialization, only : supercritical_initialize_topography

use netcdf

Expand Down Expand Up @@ -91,7 +90,6 @@ subroutine MOM_initialize_fixed(G, OBC, PF, write_geom, output_dir)
case ("none")
case ("DOME") ! Avoid FATAL when using segments
case ("tidal_bay") ; !Using segments now
case ("supercritical") ; !Using segments now
case ("USER") ! Avoid FATAL when using segments
case default ; call MOM_error(FATAL, "MOM_initialize_fixed: "// &
"The open boundary positions specified by OBC_CONFIG="//&
Expand Down Expand Up @@ -207,7 +205,6 @@ subroutine MOM_initialize_topography(D, max_depth, G, PF)
" \t DOME2D - use a shelf and slope configuration for the \n"//&
" \t\t DOME2D gravity current/overflow test case. \n"//&
" \t seamount - Gaussian bump for spontaneous motion test case.\n"//&
" \t supercritical - flat but with 8.95 degree land mask.\n"//&
" \t Phillips - ACC-like idealized topography used in the Phillips config.\n"//&
" \t USER - call a user modified routine.", &
fail_if_missing=.true.)
Expand All @@ -225,7 +222,6 @@ subroutine MOM_initialize_topography(D, max_depth, G, PF)
case ("sloshing"); call sloshing_initialize_topography(D, G, PF, max_depth)
case ("seamount"); call seamount_initialize_topography(D, G, PF, max_depth)
case ("Phillips"); call Phillips_initialize_topography(D, G, PF, max_depth)
case ("supercritical"); call supercritical_initialize_topography(D, G, PF, max_depth)
case ("USER"); call user_initialize_topography(D, G, PF, max_depth)
case default ; call MOM_error(FATAL,"MOM_initialize_topography: "// &
"Unrecognized topography setup '"//trim(config)//"'")
Expand Down

0 comments on commit e3dab80

Please sign in to comment.