From f71bf08ebd9418525d5bb69ede861c2f2224bc77 Mon Sep 17 00:00:00 2001 From: Brisa Davis Date: Fri, 20 May 2016 11:20:40 -0700 Subject: [PATCH] Updating setrun_compare to allow inner product to be stored in aux array. --- .../method-sw-paper/tsunami_Alaska/compare/Makefile_compare | 1 + .../method-sw-paper/tsunami_Alaska/compare/setrun_compare.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/method-sw-paper/tsunami_Alaska/compare/Makefile_compare b/examples/method-sw-paper/tsunami_Alaska/compare/Makefile_compare index ba8b017..d9224f1 100644 --- a/examples/method-sw-paper/tsunami_Alaska/compare/Makefile_compare +++ b/examples/method-sw-paper/tsunami_Alaska/compare/Makefile_compare @@ -47,6 +47,7 @@ SWADJLIB = $(CLAW)/adjoint/src/shallow EXCLUDE_MODULES = \ EXCLUDE_SOURCES = \ + $(AMRLIB)/setprob.f \ # ---------------------------------------- # List of custom sources for this program: diff --git a/examples/method-sw-paper/tsunami_Alaska/compare/setrun_compare.py b/examples/method-sw-paper/tsunami_Alaska/compare/setrun_compare.py index df80e93..f8bd0bb 100644 --- a/examples/method-sw-paper/tsunami_Alaska/compare/setrun_compare.py +++ b/examples/method-sw-paper/tsunami_Alaska/compare/setrun_compare.py @@ -91,7 +91,7 @@ def setrun(claw_pkg='geoclaw'): clawdata.num_eqn = 3 # Number of auxiliary variables in the aux array (initialized in setaux) - clawdata.num_aux = 3 + clawdata.num_aux = 4 # Index of aux array corresponding to capacity function, if there is one: clawdata.capa_index = 2 @@ -303,7 +303,7 @@ def setrun(claw_pkg='geoclaw'): # Specify type of each aux variable in amrdata.auxtype. # This must be a list of length num_aux, each element of which is one of: # 'center', 'capacity', 'xleft', or 'yleft' (see documentation). - amrdata.aux_type = ['center', 'capacity', 'yleft'] + amrdata.aux_type = ['center', 'capacity', 'yleft', 'center'] # Flag for refinement based on Richardson error estimater: @@ -467,6 +467,7 @@ def setadjoint(rundata): probdata = rundata.new_UserData(name='adjointdata',fname='adjoint.data') probdata.add_param('numadjoints', len(files), 'Number of adjoint checkpoint files.') + probdata.add_param('innerprod_index', 4, 'Index for innerproduct data in aux array.') counter = 1 for fname in files: