Merge pull request #134 from rjleveque/adjoint_geoclaw

need ClawRunData adjointdata attribute for geoclaw
clawpack · Apr 18, 2019 · 631c8b2 · 631c8b2
2 parents dcccd44 + 2a12bd6
commit 631c8b2
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/python/clawutil/data.py b/src/python/clawutil/data.py
@@ -462,10 +462,7 @@ def __init__(self, pkg, num_dim):
             self.add_data(amrclaw.AmrclawInputData(self.clawdata),'amrdata')
             self.add_data(amrclaw.RegionData(num_dim=num_dim),'regiondata')
             self.add_data(amrclaw.GaugeData(num_dim=num_dim),'gaugedata')
-            try:
-                self.add_data(amrclaw.AdjointData(num_dim=num_dim),'adjointdata')
-            except:
-                pass # for backward compatibility
+            self.add_data(amrclaw.AdjointData(num_dim=num_dim),'adjointdata')
 
         elif pkg.lower() in ['geoclaw']:
 
@@ -478,6 +475,7 @@ def __init__(self, pkg, num_dim):
             self.add_data(amrclaw.AmrclawInputData(self.clawdata),'amrdata')
             self.add_data(amrclaw.RegionData(num_dim=num_dim),'regiondata')
             self.add_data(amrclaw.GaugeData(num_dim=num_dim),'gaugedata')
+            self.add_data(amrclaw.AdjointData(num_dim=num_dim),'adjointdata')
             self.add_data(geoclaw.GeoClawData(),('geo_data'))
             self.add_data(geoclaw.TopographyData(),'topo_data')
             self.add_data(geoclaw.DTopoData(),'dtopo_data')