From 84bc012787952796128d38e2f1a2f296f3c01c77 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Sat, 30 Jul 2022 02:39:52 -0500 Subject: [PATCH] Update to GEBCO 2022 and BedMachine v2 bathymetry --- compass/ocean/tests/global_ocean/configure.py | 4 ++-- compass/ocean/tests/global_ocean/init/initial_state.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compass/ocean/tests/global_ocean/configure.py b/compass/ocean/tests/global_ocean/configure.py index 0d4f30002b..0a6d2ae7d2 100644 --- a/compass/ocean/tests/global_ocean/configure.py +++ b/compass/ocean/tests/global_ocean/configure.py @@ -38,8 +38,8 @@ def configure_global_ocean(test_case, mesh, init=None): # a description of the bathymetry config.set('global_ocean', 'bathy_description', - 'Bathymetry is from GEBCO 2019, combined with BedMachine ' - 'Antarctica around Antarctica.') + 'Bathymetry is from GEBCO 2022, combined with BedMachine ' + 'Antarctica v2 around Antarctica.') if init is not None and init.with_bgc: # todo: this needs to be filled in! diff --git a/compass/ocean/tests/global_ocean/init/initial_state.py b/compass/ocean/tests/global_ocean/init/initial_state.py index 155039f0b4..5564fae49f 100644 --- a/compass/ocean/tests/global_ocean/init/initial_state.py +++ b/compass/ocean/tests/global_ocean/init/initial_state.py @@ -68,7 +68,7 @@ def __init__(self, test_case, mesh, initial_condition, with_bgc): self.add_input_file( filename='topography.nc', - target='BedMachineAntarctica_and_GEBCO_2019_0.05_degree.200128.nc', + target='BedMachineAntarctica_v2_and_GEBCO_2022_0.05_degree_20220729.nc', database='bathymetry_database') self.add_input_file(