Skip to content

Pass num_dim to geoclaw TopographyData and DTopoData #208

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

Open
mandli wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Pass num_dim to geoclaw TopographyData and DTopoData #208

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
28 changes: 24 additions & 4 deletions src/python/clawutil/data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,22 @@ def _parse_value(self,value):
# ==============================================================================


def _make_dim_aware(cls, num_dim):
r"""Construct *cls*, passing ``num_dim`` if the class accepts it.

``geoclaw.TopographyData`` and ``geoclaw.DTopoData`` gained a ``num_dim``
argument so they can emit the topo.data / dtopo.data layouts the 1D Fortran
readers expect, which differ from the 2D ones. A geoclaw predating that
takes no argument, and mixed clawutil/geoclaw checkouts are routine during
development, so fall back rather than breaking every geoclaw setrun. Drop
this once the geoclaw requirement catches up.
"""
try:
return cls(num_dim=num_dim)
except TypeError:
return cls()


# ==============================================================================
# Clawpack input data classes
class ClawRunData(ClawData):
Expand Down Expand Up @@ -521,8 +537,10 @@ def __init__(self, pkg, num_dim):
# Required data set for basic run parameters:
self.add_data(geoclaw.GeoClawData(),('geo_data'))
self.add_data(amrclaw.GaugeData(num_dim=num_dim),'gaugedata')
self.add_data(geoclaw.TopographyData(),'topo_data')
self.add_data(geoclaw.DTopoData(),'dtopo_data')
self.add_data(_make_dim_aware(geoclaw.TopographyData, num_dim),
'topo_data')
self.add_data(_make_dim_aware(geoclaw.DTopoData, num_dim),
'dtopo_data')
#self.add_data(geoclaw.BoussData(), 'bouss_data') # add to setrun

if num_dim == 2:
Expand Down Expand Up @@ -567,8 +585,10 @@ def __init__(self, pkg, num_dim):
# Required data set for basic run parameters:
self.add_data(geoclaw.GeoClawData(),('geo_data'))
self.add_data(amrclaw.GaugeData(num_dim=num_dim),'gaugedata')
self.add_data(geoclaw.TopographyData(),'topo_data')
self.add_data(geoclaw.DTopoData(),'dtopo_data')
self.add_data(_make_dim_aware(geoclaw.TopographyData, num_dim),
'topo_data')
self.add_data(_make_dim_aware(geoclaw.DTopoData, num_dim),
'dtopo_data')

if num_dim == 2:
# options not available in 1d:
Expand Down