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

+Remove dyn_horgrid_type%Rad_Earth and ocean_grid_type%Rad_Earth #769

Merged
merged 1 commit into from
Jan 16, 2025
+2 −6
Merged

+Remove dyn_horgrid_type%Rad_Earth and ocean_grid_type%Rad_Earth #769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/core/MOM_grid.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ module MOM_grid
real :: west_lon !< The longitude (or x-coordinate) of the first u-line [degrees_E] or [km] or [m]
real :: len_lat !< The latitudinal (or y-coord) extent of physical domain [degrees_N] or [km] or [m]
real :: len_lon !< The longitudinal (or x-coord) extent of physical domain [degrees_E] or [km] or [m]
real :: Rad_Earth !< The radius of the planet [m]
real :: Rad_Earth_L !< The radius of the planet in rescaled units [L ~> m]
real :: max_depth !< The maximum depth of the ocean in depth units [Z ~> m]
end type ocean_grid_type
Expand Down
4 changes: 2 additions & 2 deletions src/core/MOM_transcribe_grid.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
oG%areaT_global = dG%areaT_global ; oG%IareaT_global = dG%IareaT_global
oG%south_lat = dG%south_lat ; oG%west_lon = dG%west_lon
oG%len_lat = dG%len_lat ; oG%len_lon = dG%len_lon
oG%Rad_Earth = dG%Rad_Earth ; oG%Rad_Earth_L = dG%Rad_Earth_L
oG%Rad_Earth_L = dG%Rad_Earth_L
oG%max_depth = dG%max_depth

! Update the halos in case the dynamic grid has smaller halos than the ocean grid.
Expand Down Expand Up @@ -301,7 +301,7 @@
dG%areaT_global = oG%areaT_global ; dG%IareaT_global = oG%IareaT_global
dG%south_lat = oG%south_lat ; dG%west_lon = oG%west_lon
dG%len_lat = oG%len_lat ; dG%len_lon = oG%len_lon
dG%Rad_Earth = oG%Rad_Earth ; dG%Rad_Earth_L = oG%Rad_Earth_L
dG%Rad_Earth_L = oG%Rad_Earth_L

Check warning on line 304 in src/core/MOM_transcribe_grid.F90

View check run for this annotation

Codecov / codecov/patch

src/core/MOM_transcribe_grid.F90#L304 

Added line #L304 was not covered by tests
dG%max_depth = oG%max_depth

! Update the halos in case the dynamic grid has smaller halos than the ocean grid.
Expand Down
2 changes: 0 additions & 2 deletions src/framework/MOM_dyn_horgrid.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ module MOM_dyn_horgrid
real :: west_lon !< The longitude (or x-coordinate) of the first u-line [degrees_E] or [km] or [m]
real :: len_lat !< The latitudinal (or y-coord) extent of physical domain [degrees_N] or [km] or [m]
real :: len_lon !< The longitudinal (or x-coord) extent of physical domain [degrees_E] or [km] or [m]
real :: Rad_Earth !< The radius of the planet [m]
real :: Rad_Earth_L !< The radius of the planet in rescaled units [L ~> m]
real :: max_depth !< The maximum depth of the ocean [Z ~> m]
end type dyn_horgrid_type
Expand Down Expand Up @@ -407,7 +406,6 @@ subroutine rotate_dyn_horgrid(G_in, G, US, turns)
G%grid_unit_to_L = G_in%grid_unit_to_L
G%areaT_global = G_in%areaT_global
G%IareaT_global = G_in%IareaT_global
G%Rad_Earth = G_in%Rad_Earth
G%Rad_Earth_L = G_in%Rad_Earth_L
G%max_depth = G_in%max_depth

Expand Down
1 change: 0 additions & 1 deletion src/initialization/MOM_grid_initialize.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ subroutine set_grid_metrics(G, param_file, US)
call get_param(param_file, "MOM_grid_init", "RAD_EARTH", G%Rad_Earth_L, &
"The radius of the Earth.", units="m", default=6.378e6, scale=US%m_to_L)
endif
G%Rad_Earth = US%L_to_m*G%Rad_Earth_L

! Calculate derived metrics (i.e. reciprocals and products)
call callTree_enter("set_derived_metrics(), MOM_grid_initialize.F90")
Expand Down
Loading