Merge pull request #654 from kbarnhart/fgout_fixes_post511

post 5.11 fixes for dclaw: fgout_tools and fgout xarray backends

Author: rjleveque

src/python/geoclaw/fgout_tools.py

@@ -342,11 +342,13 @@ def __init__(self,fgno=None,outdir='.',output_format=None,
         self.output_format = output_format
 
         # list of which components to print:
-        if 'eta' in self.qmap.keys():
-            # default: h,hu,hv,eta as in previous versions of GeoClaw
-            self.q_out_vars = [1,2,3,self.qmap['eta']]
+        if qmap == 'dclaw':
+            # default: h,hu,hv,hm,pb,hchi,bdif,eta, DClaw
+            self.q_out_vars = [1,2,3,4,5,6,7]
         else:
-            self.q_out_vars = [1,2,3]  # if qmap['eta'] not defined
+            self.q_out_vars = [1,2,3] # use Geoclaw values as default.
+        if 'eta' in self.qmap.keys():
+            self.q_out_vars.append(self.qmap['eta'])
 
         self.drytol = 1e-3          # used for computing u,v from hu,hv
 

src/python/geoclaw/xarray_backends.py

@@ -221,7 +221,11 @@ def open_dataset(
         if fgout_grid.point_style != 2:
             raise ValueError("FGOutBackend only works with fg.point_style=2")
 
-        fgout_grid.read_fgout_grids_data()
+        try:
+            fgout_grid.read_fgout_grids_data()
+        except AssertionError:
+            fgout_grid.read_fgout_grids_data_pre511()
+
         fgout = fgout_grid.read_frame(frameno)
 
         time = fgout.t