update chile2010 notebooks to remove fixed_grid_data and other deprec…

…ated params

notebooks/geoclaw/chile2010a/chile2010a.ipynb

@@ -403,9 +403,9 @@
  ],
  "metadata": {
  "kernelspec": {
- "display_name": "Python 2",
+ "display_name": "Python 3 (ipykernel)",
  "language": "python",
- "name": "python2"
+ "name": "python3"
  },
  "language_info": {
  "codemirror_mode": {
@@ -417,9 +417,9 @@
  "name": "python",
  "nbconvert_exporter": "python",
  "pygments_lexer": "ipython3",
- "version": "3.6.10"
+ "version": "3.10.13"
  }
  },
  "nbformat": 4,
- "nbformat_minor": 1
+ "nbformat_minor": 4
 }

notebooks/geoclaw/chile2010a/setrun.py

@@ -392,22 +392,20 @@ def setgeo(rundata):
  refinement_data = rundata.refinement_data
  refinement_data.variable_dt_refinement_ratios = True
  refinement_data.wave_tolerance = 0.1
- refinement_data.deep_depth = 1e2
- refinement_data.max_level_deep = 3
 
  # == settopo.data values ==
  topo_data = rundata.topo_data
  # for topography, append lines of the form
- # [topotype, minlevel, maxlevel, t1, t2, fname]
+ # [topotype, fname]
  topo_path = os.path.join(scratch_dir, 'etopo10min120W60W60S0S.asc')
- topo_data.topofiles.append([2, 1, 3, 0., 1.e10, topo_path])
+ topo_data.topofiles.append([2, topo_path])
 
  # == 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]
  dtopo_path = os.path.join(scratch_dir, 'dtopo_usgs100227.tt3')
- dtopo_data.dtopofiles.append([3,3,3,dtopo_path])
+ dtopo_data.dtopofiles.append([3,dtopo_path])
  dtopo_data.dt_max_dtopo = 0.2
 
 
@@ -417,12 +415,6 @@ def setgeo(rundata):
  # for qinit perturbations, append lines of the form: (<= 1 allowed for now!)
  # [minlev, maxlev, fname]
 
- # == setfixedgrids.data values ==
- fixed_grids = rundata.fixed_grid_data
- # for fixed grids append lines of the form
- # [t1,t2,noutput,x1,x2,y1,y2,xpoints,ypoints,\
- # ioutarrivaltimes,ioutsurfacemax]
-
  return rundata
  # end of function setgeo
  # ----------------------

notebooks/geoclaw/chile2010a/setrun_original.py

@@ -392,22 +392,20 @@ def setgeo(rundata):
  refinement_data = rundata.refinement_data
  refinement_data.variable_dt_refinement_ratios = True
  refinement_data.wave_tolerance = 0.1
- refinement_data.deep_depth = 1e2
- refinement_data.max_level_deep = 3
 
  # == settopo.data values ==
  topo_data = rundata.topo_data
  # for topography, append lines of the form
- # [topotype, minlevel, maxlevel, t1, t2, fname]
+ # [topotype, fname]
  topo_path = os.path.join(scratch_dir, 'etopo10min120W60W60S0S.asc')
- topo_data.topofiles.append([2, 1, 3, 0., 1.e10, topo_path])
+ topo_data.topofiles.append([2, topo_path])
 
  # == 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]
  dtopo_path = os.path.join(scratch_dir, 'dtopo_usgs100227.tt3')
- dtopo_data.dtopofiles.append([3,3,3,dtopo_path])
+ dtopo_data.dtopofiles.append([3,dtopo_path])
  dtopo_data.dt_max_dtopo = 0.2
 
 
@@ -417,12 +415,6 @@ def setgeo(rundata):
  # for qinit perturbations, append lines of the form: (<= 1 allowed for now!)
  # [minlev, maxlev, fname]
 
- # == setfixedgrids.data values ==
- fixed_grids = rundata.fixed_grid_data
- # for fixed grids append lines of the form
- # [t1,t2,noutput,x1,x2,y1,y2,xpoints,ypoints,\
- # ioutarrivaltimes,ioutsurfacemax]
-
  return rundata
  # end of function setgeo
  # ----------------------

notebooks/geoclaw/chile2010b/chile2010b.ipynb

@@ -335,7 +335,8 @@
  "xlim(3,8)\n",
  "xlabel('Hours since earthquake')\n",
  "ylabel('meters')\n",
- "title('Sea surface elevation at gauge 123')"
+ "title('Sea surface elevation at gauge 123')\n",
+ "grid(True)"
  ]
  },
  {
@@ -352,7 +353,8 @@
  "legend()\n",
  "title('Velocities at gauge 123')\n",
  "xlabel('Hours since earthquake')\n",
- "ylabel('meters per second')"
+ "ylabel('meters per second')\n",
+ "grid(True)"
  ]
  },
  {
@@ -365,9 +367,9 @@
  ],
  "metadata": {
  "kernelspec": {
- "display_name": "Python 2",
+ "display_name": "Python 3 (ipykernel)",
  "language": "python",
- "name": "python2"
+ "name": "python3"
  },
  "language_info": {
  "codemirror_mode": {
@@ -379,9 +381,9 @@
  "name": "python",
  "nbconvert_exporter": "python",
  "pygments_lexer": "ipython3",
- "version": "3.6.10"
+ "version": "3.10.13"
  }
  },
  "nbformat": 4,
- "nbformat_minor": 1
+ "nbformat_minor": 4
 }

notebooks/geoclaw/chile2010b/setrun.py

@@ -351,7 +351,6 @@ def setrun(claw_pkg='geoclaw'):
  rundata.gaugedata.gauges = []
  # for gauges append lines of the form [gaugeno, x, y, t1, t2]
  rundata.gaugedata.gauges.append([32412, -86.392, -17.975, 0., 1.e10])
- rundata.gaugedata.gauges.append([123, -77.3, -12.3, 3.5*3600, 1.e10])
 
 
  return rundata
@@ -392,22 +391,20 @@ def setgeo(rundata):
  refinement_data = rundata.refinement_data
  refinement_data.variable_dt_refinement_ratios = True
  refinement_data.wave_tolerance = 0.02
- refinement_data.deep_depth = 1e2
- refinement_data.max_level_deep = 3
 
  # == settopo.data values ==
  topo_data = rundata.topo_data
  # for topography, append lines of the form
- # [topotype, minlevel, maxlevel, t1, t2, fname]
+ # [topotype, fname]
  topo_path = os.path.join(scratch_dir, 'etopo10min120W60W60S0S.asc')
- topo_data.topofiles.append([2, 1, 3, 0., 1.e10, topo_path])
+ topo_data.topofiles.append([2, topo_path])
 
  # == 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]
  dtopo_path = os.path.join(scratch_dir, 'dtopo_usgs100227.tt3')
- dtopo_data.dtopofiles.append([3,3,3,dtopo_path])
+ dtopo_data.dtopofiles.append([3,dtopo_path])
  dtopo_data.dt_max_dtopo = 0.2
 
 
@@ -417,11 +414,6 @@ def setgeo(rundata):
  # for qinit perturbations, append lines of the form: (<= 1 allowed for now!)
  # [minlev, maxlev, fname]
 
- # == setfixedgrids.data values ==
- fixed_grids = rundata.fixed_grid_data
- # for fixed grids append lines of the form
- # [t1,t2,noutput,x1,x2,y1,y2,xpoints,ypoints,\
- # ioutarrivaltimes,ioutsurfacemax]
 
  return rundata
  # end of function setgeo

notebooks/geoclaw/chile2010b/setrun_original.py

@@ -391,22 +391,20 @@ def setgeo(rundata):
  refinement_data = rundata.refinement_data
  refinement_data.variable_dt_refinement_ratios = True
  refinement_data.wave_tolerance = 0.02
- refinement_data.deep_depth = 1e2
- refinement_data.max_level_deep = 3
 
  # == settopo.data values ==
  topo_data = rundata.topo_data
  # for topography, append lines of the form
- # [topotype, minlevel, maxlevel, t1, t2, fname]
+ # [topotype, fname]
  topo_path = os.path.join(scratch_dir, 'etopo10min120W60W60S0S.asc')
- topo_data.topofiles.append([2, 1, 3, 0., 1.e10, topo_path])
+ topo_data.topofiles.append([2, topo_path])
 
  # == 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]
  dtopo_path = os.path.join(scratch_dir, 'dtopo_usgs100227.tt3')
- dtopo_data.dtopofiles.append([3,3,3,dtopo_path])
+ dtopo_data.dtopofiles.append([3,dtopo_path])
  dtopo_data.dt_max_dtopo = 0.2
 
 
@@ -416,11 +414,6 @@ def setgeo(rundata):
  # for qinit perturbations, append lines of the form: (<= 1 allowed for now!)
  # [minlev, maxlev, fname]
 
- # == setfixedgrids.data values ==
- fixed_grids = rundata.fixed_grid_data
- # for fixed grids append lines of the form
- # [t1,t2,noutput,x1,x2,y1,y2,xpoints,ypoints,\
- # ioutarrivaltimes,ioutsurfacemax]
 
  return rundata
  # end of function setgeo