fix tsunami/bowl_radial_fgmax

clawpack · Dec 27, 2023 · 77512ea · 77512ea
1 parent 639f70c
commit 77512ea
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/tsunami/bowl_radial_fgmax/README.rst b/tsunami/bowl_radial_fgmax/README.rst
@@ -90,4 +90,5 @@ Version history:
 - Updated for Clawpack 5.3.0 on 15 Sept 2015
 - Updated for Clawpack 5.4.0 on 4 Jan 2017
 - Updated for Clawpack 5.7.0 on 4 Sept 2020
+- Updated for Clawpack 5.9.2 on 26 Dec 2023
 
diff --git a/tsunami/bowl_radial_fgmax/setplot.py b/tsunami/bowl_radial_fgmax/setplot.py
@@ -49,6 +49,16 @@ def addgauges(current_data):
  gaugetools.plot_gauge_locations(current_data.plotdata, \
  gaugenos='all', format_string='ko', add_labels=True)
 
+ def addgauges_xaxis(current_data):
+ from clawpack.visclaw import gaugetools
+ gaugetools.plot_gauge_locations(current_data.plotdata, \
+ gaugenos=range(1,10), format_string='ko', add_labels=True)
+
+ def addgauges_diag(current_data):
+ from clawpack.visclaw import gaugetools
+ gaugetools.plot_gauge_locations(current_data.plotdata, \
+ gaugenos=range(101,110), format_string='ko', add_labels=True)
+
 
  #-----------------------------------------
  # Figure for pcolor plot
@@ -98,7 +108,7 @@ def addgauges(current_data):
  plotaxes.scaled = True
  plotaxes.xlimits = [55,66]
  plotaxes.ylimits = [55,66]
- plotaxes.afteraxes = addgauges
+ plotaxes.afteraxes = addgauges_diag
 
  # Water
  plotitem = plotaxes.new_plotitem(plot_type='2d_pcolor')
@@ -171,7 +181,7 @@ def addgauges(current_data):
  plotaxes.scaled = True
  plotaxes.xlimits = [82,93]
  plotaxes.ylimits = [-5,6]
- plotaxes.afteraxes = addgauges
+ plotaxes.afteraxes = addgauges_xaxis
 
  # Water
  plotitem = plotaxes.new_plotitem(plot_type='2d_pcolor')

diff --git a/tsunami/bowl_radial_fgmax/setrun.py b/tsunami/bowl_radial_fgmax/setrun.py
@@ -378,20 +378,18 @@ def setgeo(rundata):
  # Refinement data
  refinement_data = rundata.refinement_data
  refinement_data.wave_tolerance = 1.e-2
- refinement_data.deep_depth = 1e2
- refinement_data.max_level_deep = 3
  refinement_data.variable_dt_refinement_ratios = True
 
  # == settopo.data values ==
  topo_data = rundata.topo_data
  # for topography, append lines of the form
- # [topotype, minlevel, maxlevel, t1, t2, fname]
- topo_data.topofiles.append([2, 1, 1, 0., 1.e10, 'bowl.topotype2'])
+ # [topotype, fname]
+ topo_data.topofiles.append([2, 'bowl.topotype2'])
 
  # == setdtopo.data values ==
  dtopo_data = rundata.dtopo_data
  # for moving topography, append lines of the form : (<= 1 allowed for now!)
- # [topotype, minlevel,maxlevel,fname]
+ # [topotype, fname]
 
  # == setqinit.data values ==
  rundata.qinit_data.qinit_type = 4