Boundary conditions - v13 based on MOM6/v2 ocean bathymetry (OM4) by sinakhani · Pull Request #1149 · GEOS-ESM/GEOSgcm_GridComp

sinakhani · 2025-08-28T23:13:25Z

This PR adds updates for files in makebcs directory to include MOM6/v2 ocean bathymetry.
This PR also adds the wiring for handling (atmos) TOPO versions (but v13 bcs still have v1 TOPO).
This is non-zero diff for MOM6 in coupled mode, but zero-diff otherwise (AMIP).

gmao-rreichle

see comments below

...dComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_questionary.py

...gcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_cube.py

...idComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/rmTinyCatchParaMod.F90

sinakhani · 2025-08-29T15:57:11Z

I have make changes based on the given comments. Please let me know what you think about this version. Thank you @gmao-rreichle @mathomp4 @biljanaorescanin

gmao-rreichle

Thanks, @sinakhani. See more comments below

...dComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_questionary.py

...gcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_cube.py

...dComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_questionary.py

...idComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/rmTinyCatchParaMod.F90

sinakhani · 2025-08-29T20:36:09Z

I just cleaned up the text for merged cases "v12", "v13", and "v14". Please feel free to make further changes. Thank you.

biljanaorescanin · 2025-09-11T16:55:43Z

This PR was tested for BCS creation for both old v12 set and new v14 .
Zero diff to v12 with addition to TOPO linking. New version v14 is sourcing right files.
BCS run's for resolutions we do not have new bathymetry file will use v1 so we can create full set of BCS.

gmao-rreichle

see comments below

...gcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_cube.py

…heet; disable for now

…proc/topography/obsolete; update headers in Fortran/Python drivers

...gcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_ease.py

...m_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_shared.py

biljanaorescanin · 2026-01-27T15:31:18Z

@gmao-rreichle I think I implemented all your comments but please let me know if I missed something.
I am retesting it now.

biljanaorescanin · 2026-01-27T19:21:00Z

I've re-tested few grids and res just to confirm it is zero diff to before and what we want as far as behavior. And all looks good.

…ake_bcs_shared.py, rmTinyCatchParaMod.F90)

gmao-rreichle

@biljanaorescanin : I just pushed a commit with a few minor updates to the comments and white space. One of the updates might affect a log file, so technically it may not be zero-diff w.r.t. the v13 bcs that you already generated. But there's no need to re-generate the v13 bcs just because of the minimal log file change.
See also in-line comments below.

gmao-rreichle · 2026-01-28T18:40:50Z

...gcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_cube.py

+           TOPO_VERSION = TOPO_VERSION,
+           mom6_bathy_version = MOM6_BATHY_VERSION,


Don't we need to end these lines with "\"?

gmao-rreichle · 2026-01-28T18:50:24Z

...m_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_shared.py

+def _normalize_lbcsv(label: str) -> str:
+    v = (label or "").strip()
+    m = re.match(r'[vV]?\d+|[A-Za-z0-9]+', v)  # accepts v13 / 13 / NL3 / etc.
+    if not m:
+        return v
+    key = m.group(0)
+    # normalize numeric like '13' -> 'v13'
+    if key.isdigit():
+        key = 'v' + key
+    return key


Why do we need this "normalize" function? Don't we always have a 3-char alphanumeric string for "bcs_version"? When would we have "bcs_version=13" (without the leading "v")?

sinakhani added 3 commits August 28, 2025 18:52

New ocean bathymetry v2 (OM4) is added

8b01927

New ocean bathymetry v2 (OM4) is added

6cc2ea7

New ocean bathymetry v2 (OM4) is added

392194c

sinakhani assigned biljanaorescanin Aug 28, 2025

sinakhani requested a review from a team as a code owner August 28, 2025 23:13

sinakhani added the 0-diff AMIP 0-diff for uncoupled AMIP runs label Aug 28, 2025

biljanaorescanin marked this pull request as draft August 28, 2025 23:53

gmao-rreichle reviewed Aug 29, 2025

View reviewed changes

sinakhani added 4 commits August 29, 2025 09:52

A typo on text is fixed

43dc33d

MOM6 bathymetry version is added

87de898

Updates on v14 bcs

950b8e6

Typo on text is fixed

e796d0a

sinakhani added 2 commits August 29, 2025 12:00

Typo on text is fixed

922e735

Typo on text is fixed

2ed8999

gmao-rreichle reviewed Aug 29, 2025

View reviewed changes

sinakhani added 3 commits August 29, 2025 12:37

More clean-up for mom6 v2 bathymetry

fb7adc0

More clean-up for mom6 v2 bathymetry

6d6f4bd

Merging v12, v13, and v14 bcs cases

02fe5c7

sinakhani force-pushed the skhani/develop branch from a4f68f7 to 02fe5c7 Compare August 29, 2025 20:33

mathomp4 added the 0 diff The changes in this pull request have verified to be zero-diff with the target branch. label Aug 29, 2025

biljanaorescanin and others added 2 commits September 11, 2025 12:34

add options so code is more flexiable

d157723

Merge branch 'develop' into skhani/develop

185f585

biljanaorescanin marked this pull request as ready for review September 11, 2025 16:59

gmao-rreichle reviewed Sep 12, 2025

View reviewed changes

...gcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_cube.py Outdated Show resolved Hide resolved

...gcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_cube.py Outdated Show resolved Hide resolved

biljanaorescanin marked this pull request as draft September 12, 2025 14:03

gmao-rreichle changed the title ~~Boundary conditions v14 based on MOM6/v2 ocean bathymetry (OM4)~~ Boundary conditions v14 based on MOM6/v2 ocean bathymetry (OM4) and "v2" topography for atmosphere Sep 12, 2025

refine options

c16644c

zhaobin74 and others added 16 commits January 8, 2026 10:46

claving causes huge frazil generation at isolated locations near ices…

e5a729c

…heet; disable for now

Fix for gfortran

656728a

Topo docs & cleanup: add README_topo.md; move generate_topo.sh to pre…

cb905bc

…proc/topography/obsolete; update headers in Fortran/Python drivers

remove example to make it simetric to other file

7e6fae6

fix example

4fafcfb

moved to obsolete

bbbd66e

add more text to readme

b832814

update readme

4894b0d

update readme again

52d257f

add to readme and move

e03cbec

move utils_topo dir to new location

9afd2a6

add cmake file

9c3d8b8

add dir to build

6963c04

we don't need all this

d5467db

Fixes #1069. Clean up WW3 Cmake

dcad50c

New ocean grids added to mom6/v2

74b9a9d

biljanaorescanin added the Not 0-diff coupled Non 0-diff for coupled AGCM/MOM5/MOM6/CICE4/CICE6 model label Jan 22, 2026

biljanaorescanin changed the title ~~Boundary conditions v14 based on MOM6/v2 ocean bathymetry (OM4) and "v2" topography for atmosphere~~ Boundary conditions - v13 based on MOM6/v2 ocean bathymetry (OM4) Jan 22, 2026

biljanaorescanin added 5 commits January 22, 2026 12:23

using v13 for this coupled grids bathymetry update

cf890bb

fix for easy

442009d

right topo version

14adaca

better info message

f448587

smarter cleanup

1fd603e

gmao-rreichle reviewed Jan 23, 2026

View reviewed changes

...gcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_ease.py Outdated Show resolved Hide resolved

gmao-rreichle reviewed Jan 23, 2026

View reviewed changes

...m_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_shared.py Outdated Show resolved Hide resolved

code simplification / cleanup

297db4b

minor updates to comments and white space (make_bcs_questionary.py, m…

a264bbe

…ake_bcs_shared.py, rmTinyCatchParaMod.F90)

gmao-rreichle reviewed Jan 28, 2026

View reviewed changes

		TOPO_VERSION = TOPO_VERSION,
		mom6_bathy_version = MOM6_BATHY_VERSION,

Conversation

sinakhani commented Aug 28, 2025 • edited by gmao-rreichle Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gmao-rreichle left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sinakhani commented Aug 29, 2025

Uh oh!

gmao-rreichle left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sinakhani commented Aug 29, 2025

Uh oh!

biljanaorescanin commented Sep 11, 2025

Uh oh!

gmao-rreichle left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

biljanaorescanin commented Jan 27, 2026

Uh oh!

biljanaorescanin commented Jan 27, 2026

Uh oh!

gmao-rreichle left a comment

Choose a reason for hiding this comment

Uh oh!

gmao-rreichle Jan 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gmao-rreichle Jan 28, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Comments

sinakhani commented Aug 28, 2025 •

edited by gmao-rreichle

Loading

gmao-rreichle Jan 28, 2026 •

edited

Loading