make it easier to change flagging method in 2d examples

paper2_examples/acoustics_2d_ex3/setplot.py

@@ -7,6 +7,8 @@
     
 """
 
+
+
 #--------------------------
 def setplot(plotdata):
 #--------------------------
@@ -20,6 +22,11 @@ def setplot(plotdata):
 
     from clawpack.visclaw import colormaps
 
+    from clawpack.clawutil.data import ClawData
+    adjoint_data = ClawData()
+    adjoint_data.read('adjoint.data', force=True)
+    print('use_adjoint = ', adjoint_data.use_adjoint)
+
     plotdata.clearfigures()  # clear any old figures,axes,items data
     plotdata.format = 'ascii'      # 'ascii', 'binary', 'netcdf'
 
@@ -54,7 +61,7 @@ def setplot(plotdata):
     #-----------------------------------------
     plotfigure = plotdata.new_plotfigure(name='Inner Product', figno=1)
     plotfigure.kwargs = {'figsize': (5.5,4)}
-    #plotfigure.show = False
+    plotfigure.show = adjoint_data.use_adjoint
 
     # Set up for axes in this figure:
     plotaxes = plotfigure.new_plotaxes()
@@ -110,8 +117,8 @@ def setplot(plotdata):
     plotaxes = plotfigure.new_plotaxes()
     plotaxes.xlimits = 'auto'
     plotaxes.ylimits = 'auto'
-    plotaxes.xlimits = [1,3]
-    plotaxes.ylimits = [-0.4,0.5]
+    plotaxes.xlimits = [0,21]
+    plotaxes.ylimits = [-0.4,0.6]
     plotaxes.title = 'Pressure'
     plotitem = plotaxes.new_plotitem(plot_type='1d_plot')
     plotitem.plot_var = 0

paper2_examples/acoustics_2d_ex3/setrun.py

@@ -243,8 +243,7 @@ def setrun(claw_pkg='amrclaw'):
     # ---------------
     rundata.gaugedata.gauges = []
     # for gauges append lines of the form  [gaugeno, x, y, t1, t2]
-    rundata.gaugedata.gauges.append([0, 1.0, 5.5, 18., 21.])
-    #rundata.gaugedata.gauges.append([1, 3.6, 0.5, 2.7, 2.85])
+    rundata.gaugedata.gauges.append([0, 1.0, 5.5, 0., 21.])
 
     # --------------
     # Checkpointing:
@@ -296,18 +295,8 @@ def setrun(claw_pkg='amrclaw'):
     rundata.amrdata.aux_type = ['center','center']
     # Note: as required for original problem - modified below for adjoint
 
-    # set tolerances appropriate for adjoint flagging:
+    # set tolerances for flagging in adjoint section below
 
-    # need 1 value, set in setadjoint
-
-
-    # Flag for refinement based on Richardson error estimater:
-    amrdata.flag_richardson = True
-    amrdata.flag_richardson_tol = 3e-3 # suggested if using adjoint error flag
-
-    # Flag for refinement using routine flag2refine:
-    amrdata.flag2refine = False
-    rundata.amrdata.flag2refine_tol = 3e-4 # suggested if using adj mag flag
 
     # steps to take on each level L between regriddings of level L+1:
     amrdata.regrid_interval = 2       
@@ -336,8 +325,22 @@ def setrun(claw_pkg='amrclaw'):
     #------------------------------------------------------------------
     # Also need to set flagging method and appropriate tolerances above
 
+    flag_method = 'forward-diff'
+
+    assert flag_method in ['forward-diff','forward-error',\
+           'adjoint-mag','adjoint-error'], '*** Unsupported flag_method'
+
     adjointdata = rundata.adjointdata
-    adjointdata.use_adjoint = True
+    adjointdata.use_adjoint = (flag_method in ['adjoint-mag','adjoint-error'])
+
+    # Flag for refinement based on Richardson error estimater:
+    amrdata.flag_richardson = (flag_method in ['adjoint-error','forward-error'])
+    amrdata.flag_richardson_tol = 3e-3 # suggested if using adjoint-error flag
+
+    # Flag for refinement using routine flag2refine:
+    amrdata.flag2refine = (flag_method in ['adjoint-mag','forward-diff'])
+    #amrdata.flag2refine_tol = 3e-4 # suggested if using adjoint-mag flag
+    amrdata.flag2refine_tol =  0.05 # suggested if using forward-diff
 
     # location of adjoint solution, must first be created:
     adjointdata.adjoint_outdir = os.path.abspath('adjoint/_output')

paper2_examples/acoustics_2d_ex4/setplot.py

@@ -7,6 +7,8 @@
     
 """
 
+
+
 #--------------------------
 def setplot(plotdata):
 #--------------------------
@@ -20,6 +22,11 @@ def setplot(plotdata):
 
     from clawpack.visclaw import colormaps
 
+    from clawpack.clawutil.data import ClawData
+    adjoint_data = ClawData()
+    adjoint_data.read('adjoint.data', force=True)
+    print('use_adjoint = ', adjoint_data.use_adjoint)
+
     plotdata.clearfigures()  # clear any old figures,axes,items data
     plotdata.format = 'ascii'      # 'ascii', 'binary', 'netcdf'
 
@@ -54,7 +61,7 @@ def setplot(plotdata):
     #-----------------------------------------
     plotfigure = plotdata.new_plotfigure(name='Inner Product', figno=1)
     plotfigure.kwargs = {'figsize': (5.5,4)}
-    #plotfigure.show = False
+    plotfigure.show = adjoint_data.use_adjoint
 
     # Set up for axes in this figure:
     plotaxes = plotfigure.new_plotaxes()
@@ -74,7 +81,8 @@ def setplot(plotdata):
     plotitem.pcolor_cmin = 0.0      # use when plotting inner product with q
     #plotitem.pcolor_cmin = 0.0     # use when plotting inner product with error
     #plotitem.pcolor_cmax = 0.12    # use when plotting inner product with q
-    plotitem.pcolor_cmax = 0.000001    # use when plotting inner product with error
+    #plotitem.pcolor_cmax = 0.000001    # for adjoint-error
+    plotitem.pcolor_cmax = 0.0001    # for adjoint-mag
     plotitem.amr_patchedges_show = [0,0,0]
     plotitem.amr_celledges_show = [0,0,0]
     plotitem.amr_data_show = [1,1,1,1,0]
@@ -110,8 +118,8 @@ def setplot(plotdata):
     plotaxes = plotfigure.new_plotaxes()
     plotaxes.xlimits = 'auto'
     plotaxes.ylimits = 'auto'
-    plotaxes.xlimits = [1,3]
-    plotaxes.ylimits = [-0.4,0.5]
+    plotaxes.xlimits = [0,21]
+    plotaxes.ylimits = [-0.4,0.6]
     plotaxes.title = 'Pressure'
     plotitem = plotaxes.new_plotitem(plot_type='1d_plot')
     plotitem.plot_var = 0
@@ -176,7 +184,8 @@ def plot_rectangle(current_data):
 
 def fixup_gauge(current_data):
     import pylab
-    size = 34
+    size = 15
+    pylab.grid(True)
     pylab.title('Pressure at Gauge 0', fontsize=size)
-    pylab.xticks([1.0, 1.5, 2.0, 2.5, 3.0], fontsize=size)
-    pylab.yticks([-0.3, -0.1, 0.1, 0.3, 0.5], fontsize=size)
+    #pylab.xticks([1.0, 1.5, 2.0, 2.5, 3.0], fontsize=size)
+    #pylab.yticks([-0.3, -0.1, 0.1, 0.3, 0.5], fontsize=size)

paper2_examples/acoustics_2d_ex4/setrun.py

@@ -243,7 +243,7 @@ def setrun(claw_pkg='amrclaw'):
     # ---------------
     rundata.gaugedata.gauges = []
     # for gauges append lines of the form  [gaugeno, x, y, t1, t2]
-    rundata.gaugedata.gauges.append([0, 3.5, 0.5, 18., 21.])
+    rundata.gaugedata.gauges.append([0, 3.5, 0.5, 0., 21.])
 
     # --------------
     # Checkpointing:
@@ -295,18 +295,8 @@ def setrun(claw_pkg='amrclaw'):
     rundata.amrdata.aux_type = ['center','center']
     # Note: as required for original problem - modified below for adjoint
 
-    # set tolerances appropriate for adjoint flagging:
+    # set tolerances for flagging in adjoint section below
 
-    # need 1 value, set in setadjoint
-
-
-    # Flag for refinement based on Richardson error estimater:
-    amrdata.flag_richardson = True
-    amrdata.flag_richardson_tol = 3e-3 # suggested if using adjoint error flag
-
-    # Flag for refinement using routine flag2refine:
-    amrdata.flag2refine = False
-    rundata.amrdata.flag2refine_tol = 3e-4 # suggested if using adj mag flag
 
     # steps to take on each level L between regriddings of level L+1:
     amrdata.regrid_interval = 2       
@@ -335,8 +325,22 @@ def setrun(claw_pkg='amrclaw'):
     #------------------------------------------------------------------
     # Also need to set flagging method and appropriate tolerances above
 
+    flag_method = 'forward-diff'
+
+    assert flag_method in ['forward-diff','forward-error',\
+           'adjoint-mag','adjoint-error'], '*** Unsupported flag_method'
+
     adjointdata = rundata.adjointdata
-    adjointdata.use_adjoint = True
+    adjointdata.use_adjoint = (flag_method in ['adjoint-mag','adjoint-error'])
+
+    # Flag for refinement based on Richardson error estimater:
+    amrdata.flag_richardson = (flag_method in ['adjoint-error','forward-error'])
+    amrdata.flag_richardson_tol = 3e-3 # suggested if using adjoint-error flag
+
+    # Flag for refinement using routine flag2refine:
+    amrdata.flag2refine = (flag_method in ['adjoint-mag','forward-diff'])
+    #amrdata.flag2refine_tol = 3e-4 # suggested if using adjoint-mag flag
+    amrdata.flag2refine_tol =  0.05 # suggested if using forward-diff
 
     # location of adjoint solution, must first be created:
     adjointdata.adjoint_outdir = os.path.abspath('adjoint/_output')