Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve mesh consistency check #119

Merged
merged 7 commits into from
Aug 29, 2019
Merged

Improve mesh consistency check #119

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7ad7296
remove labeled format specifiers
alperaltuntas Aug 28, 2019
18c6f1e
replace hard-coded mesh diff. limit with a param: eps_omesh
alperaltuntas Aug 28, 2019
66f808b
add units to EPS_OMESH
alperaltuntas Aug 28, 2019
c698b1a
call get_eps_omesh and remove hardcoded limit
alperaltuntas Aug 28, 2019
d9a00d7
call MOM_error if mesh is inconsistent
alperaltuntas Aug 28, 2019
e02b358
compare mod 360 of diff and eps
alperaltuntas Aug 29, 2019
7f7e8c0
Add EPS_OMESH value in error message
alperaltuntas Aug 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 22 additions & 15 deletions config_src/nuopc_driver/mom_cap.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,6 @@ module MOM_cap_mod
use mpp_domains_mod, only: mpp_get_ntile_count, mpp_get_pelist, mpp_get_global_domain
use mpp_domains_mod, only: mpp_get_domain_npes
use mpp_io_mod, only: mpp_open, MPP_RDONLY, MPP_ASCII, MPP_OVERWR, MPP_APPEND, mpp_close, MPP_SINGLE
use mpp_mod, only: input_nml_file, mpp_error, FATAL, NOTE, mpp_pe, mpp_npes, mpp_set_current_pelist
use mpp_mod, only: stdlog, stdout, mpp_root_pe, mpp_clock_id
use mpp_mod, only: mpp_clock_begin, mpp_clock_end, MPP_CLOCK_SYNC
use mpp_mod, only: MPP_CLOCK_DETAILED, CLOCK_COMPONENT, MAXPES
Expand All @@ -339,12 +338,13 @@ module MOM_cap_mod
use MOM_file_parser, only: get_param, log_version, param_file_type, close_param_file
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_error_handler, only: MOM_error, FATAL, is_root_pe
use MOM_ocean_model_nuopc, only: ice_ocean_boundary_type
use MOM_grid, only: ocean_grid_type, get_global_grid_size
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_ocean_model_nuopc, only: ocean_model_init, update_ocean_model, ocean_model_end
use MOM_ocean_model_nuopc, only: get_ocean_grid, get_eps_omesh
use MOM_cap_time, only: AlarmInit
use MOM_cap_methods, only: mom_import, mom_export, mom_set_geomtype
#ifdef CESMCOUPLED
Expand Down Expand Up @@ -1181,6 +1181,8 @@ subroutine InitializeRealize(gcomp, importState, exportState, clock, rc)
integer, allocatable :: gindex(:) ! global index space
character(len=128) :: fldname
character(len=256) :: cvalue
character(len=256) :: frmt ! format specifier for several error msgs
character(len=512) :: err_msg ! error messages
character(len=*), parameter :: subname='(MOM_cap:InitializeRealize)'
integer :: spatialDim
integer :: numOwnedElements
Expand All @@ -1190,6 +1192,7 @@ subroutine InitializeRealize(gcomp, importState, exportState, clock, rc)
real(ESMF_KIND_R8) , pointer :: lon(:), lonMesh(:)
integer(ESMF_KIND_I4) , pointer :: mask(:), maskMesh(:)
real(ESMF_KIND_R8) :: diff_lon, diff_lat
real :: eps_omesh
!--------------------------------

rc = ESMF_SUCCESS
Expand Down Expand Up @@ -1381,23 +1384,27 @@ subroutine InitializeRealize(gcomp, importState, exportState, clock, rc)
end do
end do

eps_omesh = get_eps_omesh(ocean_state)
do n = 1,numOwnedElements
diff_lon = abs(lonMesh(n) - lon(n))
if (diff_lon > 1.e-2) then
write(6,100)n,lonMesh(n),lon(n), diff_lon
100 format('ERROR: MOM n, lonMesh(n), lon(n), diff_lon = ',i8,2(f21.13,3x),d21.5)
!call shr_sys_abort()
diff_lon = abs(mod(lonMesh(n) - lon(n),360.0))
if (diff_lon > eps_omesh) then
frmt = "('ERROR: Inconsistent coords - "//&
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we mention that EPS_OMESH is used to identify the inconsistency? The default value might break in certain conditions (e.g., high-res experiments), and the user may have to change this value.

Copy link
Member Author

@alperaltuntas alperaltuntas Aug 29, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EPS_MESH is a parameter that can be changed by the user in MOM_input or MOM_override. See changes in mom_ocean_model_nuopc.F90

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My suggestion is to add this message to the ERROR message since the user might not know that changes in EPS_OMESH are needed.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done.

"MOM n, lonMesh(n), lon(n), diff_lon = ',i8,2(f21.13,3x),d21.5)"
write(err_msg, frmt)n,lonMesh(n),lon(n), diff_lon
call MOM_error(FATAL, err_msg)
end if
diff_lat = abs(latMesh(n) - lat(n))
if (diff_lat > 1.e-2) then
write(6,101)n,latMesh(n),lat(n), diff_lat
101 format('ERROR: MOM n, latMesh(n), lat(n), diff_lat = ',i8,2(f21.13,3x),d21.5)
!call shr_sys_abort()
if (diff_lat > eps_omesh) then
frmt = "('ERROR: Inconsistent coords - "//&
"MOM n, latMesh(n), lat(n), diff_lat = ',i8,2(f21.13,3x),d21.5)"
write(err_msg, frmt)n,latMesh(n),lat(n), diff_lat
call MOM_error(FATAL, err_msg)
end if
if (abs(maskMesh(n) - mask(n)) > 0) then
write(6,102)n,maskMesh(n),mask(n)
102 format('ERROR: MOM n, maskMesh(n), mask(n) = ',3(i8,2x))
!call shr_sys_abort()
frmt = "('ERROR: Inconsistent masks - "//&
"MOM n, maskMesh(n), mask(n) = ',3(i8,2x))"
write(err_msg, frmt)n,maskMesh(n),mask(n)
call MOM_error(FATAL, err_msg)
end if
end do

Expand Down
16 changes: 15 additions & 1 deletion config_src/nuopc_driver/mom_ocean_model_nuopc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ module MOM_ocean_model_nuopc
public ocean_public_type_chksum
public ocean_model_data_get
public get_ocean_grid
public get_eps_omesh

!> This interface extracts a named scalar field or array from the ocean surface or public type
interface ocean_model_data_get
Expand Down Expand Up @@ -182,6 +183,9 @@ module MOM_ocean_model_nuopc
logical :: diabatic_first !< If true, apply diabatic and thermodynamic
!! processes before time stepping the dynamics.

real :: eps_omesh !< Max allowable difference between ESMF mesh and MOM6
!! domain coordinates

type(directories) :: dirs !< A structure containing several relevant directory paths.
type(mech_forcing) :: forces !< A structure with the driving mechanical surface forces
type(forcing) :: fluxes !< A structure containing pointers to
Expand Down Expand Up @@ -327,6 +331,10 @@ subroutine ocean_model_init(Ocean_sfc, OS, Time_init, Time_in, gas_fields_ocn, i
else ; call MOM_error(FATAL,"ocean_model_init: OCEAN_SURFACE_STAGGER = "// &
trim(stagger)//" is invalid.") ; endif

call get_param(param_file, mdl, "EPS_OMESH",OS%eps_omesh, &
"Maximum allowable difference between ESMF mesh and "//&
"MOM6 domain coordinates in nuopc cap.", &
units="degrees", default=1.e-4)
call get_param(param_file, mdl, "RESTORE_SALINITY",OS%restore_salinity, &
"If true, the coupled driver will add a globally-balanced "//&
"fresh-water flux that drives sea-surface salinity "//&
Expand All @@ -353,7 +361,7 @@ subroutine ocean_model_init(Ocean_sfc, OS, Time_init, Time_in, gas_fields_ocn, i

OS%press_to_z = 1.0/(Rho0*G_Earth)

call get_param(param_file, mdl, "HFREEZE", HFrz, &
call get_param(param_file, mdl, "HFREEZE", HFrz, &
"If HFREEZE > 0, melt potential will be computed. The actual depth "//&
"over which melt potential is computed will be min(HFREEZE, OBLD), "//&
"where OBLD is the boundary layer depth. If HFREEZE <= 0 (default), "//&
Expand Down Expand Up @@ -1174,4 +1182,10 @@ subroutine get_ocean_grid(OS, Gridp)
return
end subroutine get_ocean_grid

!> Returns eps_omesh read from param file
real function get_eps_omesh(OS)
type(ocean_state_type) :: OS
get_eps_omesh = OS%eps_omesh; return
end function

end module MOM_ocean_model_nuopc