Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions global_oce_cs32/code/SIZE.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,3 @@ C routine buffers.
PARAMETER ( MAX_OLX = OLx,
& MAX_OLY = OLy )

C for pkg/ctrl:
INTEGER nobcs
PARAMETER ( nobcs = 4 )

4 changes: 0 additions & 4 deletions global_oce_cs32/code/SIZE.h_mpi
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,3 @@ C routine buffers.
PARAMETER ( MAX_OLX = OLx,
& MAX_OLY = OLy )

C for pkg/ctrl:
INTEGER nobcs
PARAMETER ( nobcs = 4 )

68 changes: 0 additions & 68 deletions global_oce_llc90/code/SIZE.h

This file was deleted.

1 change: 1 addition & 0 deletions global_oce_llc90/code/SIZE.h
6 changes: 1 addition & 5 deletions global_oce_llc90/code/SIZE.h_mpi
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ CEOP
& nPy = 1,
& Nx = sNx*nSx*nPx,
& Ny = sNy*nSy*nPy,
& Nr = 50 )
& Nr = 50)

C MAX_OLX :: Set to the maximum overlap region size of any array
C MAX_OLY that will be exchanged. Controls the sizing of exch
Expand All @@ -62,7 +62,3 @@ C routine buffers.
PARAMETER ( MAX_OLX = OLx,
& MAX_OLY = OLy )

C for pkg/ctrl:
INTEGER nobcs
PARAMETER ( nobcs = 4 )

4 changes: 0 additions & 4 deletions offline_cheapaml/code/SIZE.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,3 @@ C routine buffers.
PARAMETER ( MAX_OLX = OLx,
& MAX_OLY = OLy )

C for pkg/ctrl:
INTEGER nobcs
PARAMETER ( nobcs = 4 )

4 changes: 0 additions & 4 deletions offline_cheapaml/code/SIZE.h_mpi
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,3 @@ C routine buffers.
PARAMETER ( MAX_OLX = OLx,
& MAX_OLY = OLy )

C for pkg/ctrl:
INTEGER nobcs
PARAMETER ( nobcs = 4 )

4 changes: 0 additions & 4 deletions shelfice_remeshing/code/SIZE.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,3 @@ C routine buffers.
PARAMETER ( MAX_OLX = OLx,
& MAX_OLY = OLy )

C for pkg/ctrl:
INTEGER nobcs
PARAMETER ( nobcs = 4 )

61 changes: 33 additions & 28 deletions shelfice_remeshing/code_vrm/SIZE.h
Original file line number Diff line number Diff line change
@@ -1,27 +1,35 @@
CBOP
C !ROUTINE: SIZE.h
C !INTERFACE:
C include SIZE.h
C !DESCRIPTION: \bv
C *==========================================================*
C | SIZE.h Declare size of underlying computational grid.
C *==========================================================*
C | The design here supports a three-dimensional model grid
C | with indices I,J and K. The three-dimensional domain
C | is comprised of nPx*nSx blocks (or tiles) of size sNx
C | along the first (left-most index) axis, nPy*nSy blocks
C | of size sNy along the second axis and one block of size
C | Nr along the vertical (third) axis.
C | Blocks/tiles have overlap regions of size OLx and OLy
C | along the dimensions that are subdivided.
C *==========================================================*
C \ev
C
C /==========================================================\
C | SIZE.h Declare size of underlying computational grid. |
C |==========================================================|
C | The design here support a three-dimensional model grid |
C | with indices I,J and K. The three-dimensional domain |
C | is comprised of nPx*nSx blocks of size sNx along one axis|
C | nPy*nSy blocks of size sNy along another axis and one |
C | block of size Nz along the final axis. |
C | Blocks have overlap regions of size OLx and OLy along the|
C | dimensions that are subdivided. |
C \==========================================================/
C Voodoo numbers controlling data layout.
C sNx - No. X points in sub-grid.
C sNy - No. Y points in sub-grid.
C OLx - Overlap extent in X.
C OLy - Overlat extent in Y.
C nSx - No. sub-grids in X.
C nSy - No. sub-grids in Y.
C nPx - No. of processes to use in X.
C nPy - No. of processes to use in Y.
C Nx - No. points in X for the total domain.
C Ny - No. points in Y for the total domain.
C Nr - No. points in Z for full process domain.
C Voodoo numbers controlling data layout:
C sNx :: Number of X points in tile.
C sNy :: Number of Y points in tile.
C OLx :: Tile overlap extent in X.
C OLy :: Tile overlap extent in Y.
C nSx :: Number of tiles per process in X.
C nSy :: Number of tiles per process in Y.
C nPx :: Number of processes to use in X.
C nPy :: Number of processes to use in Y.
C Nx :: Number of points in X for the full domain.
C Ny :: Number of points in Y for the full domain.
C Nr :: Number of points in vertical direction.
CEOP
INTEGER sNx
INTEGER sNy
INTEGER OLx
Expand All @@ -46,14 +54,11 @@ C Nr - No. points in Z for full process domain.
& Ny = sNy*nSy*nPy,
& Nr = 90)

C MAX_OLX - Set to the maximum overlap region size of any array
C MAX_OLX :: Set to the maximum overlap region size of any array
C MAX_OLY that will be exchanged. Controls the sizing of exch
C routine buufers.
C routine buffers.
INTEGER MAX_OLX
INTEGER MAX_OLY
PARAMETER ( MAX_OLX = OLx,
& MAX_OLY = OLy )

INTEGER nobcs
PARAMETER ( nobcs = 4 )

2 changes: 2 additions & 0 deletions update_history
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Update history and content of "MITgcm/verification_other"
=================================================================

- post PR #749: remove parameter "nobcs" from SIZE.h (now in CTRL_OBCS.h).

checkpoint68q (2023/06/29) synchronised with main MITgcm code.
- post PR #714: update both Fwd & Ad ref output for cs32 & llc90 tests that
uses pkg/ggl90 (i.e., all except the 2 AD tests llc90 primary + core2 ).
Expand Down