Skip to content

Commit d4c5b4b

Browse files
cblakely97sbrus89
authored andcommitted
Fix minor bugs in tides test case
- Adds remap topography step to tides case to update cull_mesh behavior
1 parent cb39952 commit d4c5b4b

2 files changed

Lines changed: 23 additions & 15 deletions

File tree

compass/ocean/tests/tides/mesh/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def __init__(self, test_group, mesh_name):
6060

6161
self.add_step(CullMeshStep(
6262
test_case=self, base_mesh_step=base_mesh_step,
63-
with_ice_shelf_cavities=True, remap_topography=remap_step))
63+
with_ice_shelf_cavities=True, unsmoothed_topo=remap_step))
6464

6565
def configure(self):
6666
"""

compass/ocean/tests/tides/mesh/icos7/icos7.cfg

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
# options for spherical meshes
22
[spherical_mesh]
33

4+
latitude_threshold = 43.0
5+
6+
sweep_count = 20
7+
8+
convert_culled_mesh_to_cdf5 = False
9+
410
## config options related to the step for culling land from the mesh
511
# number of cores to use
612
cull_mesh_cpus_per_task = 18
@@ -58,32 +64,27 @@ tpxo_version = TPXO9
5864
# constituents to validate
5965
constituents = k1, k2, m2, n2, o1, p1, q1, s2
6066

61-
6267
# config options related to remapping topography to an MPAS-Ocean mesh
6368
[remap_topography]
6469

6570
# the name of the topography file in the bathymetry database
66-
topo_filename = BedMachineAntarctica_v3_and_GEBCO_2023_0.0125_degree_20240828.nc
67-
68-
# variable names in topo_filename
69-
lon_var = lon
70-
lat_var = lat
71-
bathymetry_var = bathymetry
72-
ice_thickness_var = thickness
73-
ice_frac_var = ice_mask
74-
grounded_ice_frac_var = grounded_mask
75-
ocean_frac_var = ocean_mask
76-
bathy_frac_var = bathymetry_mask
71+
topo_filename = BedMachineAntarctica-v3_GEBCO_2023_ne3000_20250110.nc
72+
src_scrip_filename = ne3000_20250110.scrip.nc
73+
74+
# weight generator function:
75+
# `tempest` for cubed-sphere bathy or `esmf` for latlon bathy
76+
weight_generator = tempest
7777

7878
# the description to include in metadata
7979
description = Bathymetry is from GEBCO 2023, combined with BedMachine
8080
Antarctica v3 around Antarctica.
8181

8282
# the target and minimum number of MPI tasks to use in remapping
83-
ntasks = 4096
84-
min_tasks = 360
83+
ntasks = 1280
84+
min_tasks = 256
8585

8686
# remapping method {'bilinear', 'neareststod', 'conserve'}
87+
# must use 'conserve' for tempestremap
8788
method = conserve
8889

8990
# threshold of what fraction of an MPAS cell must contain ocean in order to
@@ -92,3 +93,10 @@ renorm_threshold = 0.01
9293

9394
# the density of land ice from MALI (kg/m^3)
9495
ice_density = 910.0
96+
97+
# smoothing parameters
98+
# no smoothing (required for esmf):
99+
# expandDist = 0 [m]
100+
# expandFactor = 1 [cell fraction]
101+
expandDist = 0
102+
expandFactor = 1

0 commit comments

Comments
 (0)