-
Notifications
You must be signed in to change notification settings - Fork 26
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[WIP] Implementation of absorbing boundary layer #83
Open
cjvogl
wants to merge
14
commits into
clawpack:master
Choose a base branch
from
cjvogl:absorbing_layer
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
3bcb654
added absorbing layer source code and updated acoustics_2d_radial exa…
cjvogl 32681eb
reverted Makefile and created Makefile_abl and setplot_abl instead
cjvogl 0a52c78
for clarity don't redefine clawdata attributes in setplot_abl.py
rjleveque 5f7a38f
added text to plot of ABL
rjleveque 87f7745
modify legend for scatter plot
rjleveque 74df71c
started adding info on ABL to README
rjleveque ce0448f
Merge pull request #1 from rjleveque/absorbing_layer
cjvogl 0209fbc
no longer need .output_abl or .data_abl in .gitignore as they will no…
cjvogl e453bbc
Merge branch 'absorbing_layer' of https://github.com/cjvogl/classic i…
cjvogl 738ee20
Merge remote-tracking branch 'upstream/master' into absorbing_layer
cjvogl 71aca24
Merge branch 'absorbing_layer' of github.com:cjvogl/classic into abso…
cjvogl 33d6bca
implemented aux-less absorbing boundary layer
cjvogl 1d76471
minor cleanup of step2 for abl
cjvogl 95dc031
many improvements to ABL implementation, but need to look in abl_R or…
cjvogl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,9 @@ xclaw | |
*.mod | ||
*~ | ||
.data | ||
.data_abl | ||
.output | ||
.output_abl | ||
_output/* | ||
_output | ||
_plots/* | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
|
||
# Makefile for Clawpack code in this directory. | ||
# This version only sets the local files and frequently changed | ||
# options, and then includes the standard makefile pointed to by CLAWMAKE. | ||
CLAWMAKE = $(CLAW)/clawutil/src/Makefile.common | ||
|
||
# See the above file for details and a list of make options, or type | ||
# make .help | ||
# at the unix prompt. | ||
|
||
|
||
# Adjust these variables if desired: | ||
# ---------------------------------- | ||
|
||
CLAW_PKG = classic # Clawpack package to use | ||
EXE = xclaw # Executable to create | ||
SETRUN_FILE = setrun_abl.py # File containing function to make data | ||
OUTDIR = _output_abl # Directory for output | ||
SETPLOT_FILE = setplot_abl.py # File containing function to set plots | ||
PLOTDIR = _plots_abl # Directory for plots | ||
|
||
OVERWRITE ?= True # False ==> make a copy of OUTDIR first | ||
|
||
# Environment variable FC should be set to fortran compiler, e.g. gfortran | ||
|
||
# Compiler flags can be specified here or set as an environment variable | ||
FFLAGS ?= | ||
|
||
# --------------------------------- | ||
# package sources for this program: | ||
# --------------------------------- | ||
|
||
include $(CLAW)/classic/src/2d/Makefile.classic_2d | ||
|
||
# --------------------------------------- | ||
# package sources specifically to exclude | ||
# (i.e. if a custom replacement source | ||
# under a different name is provided) | ||
# --------------------------------------- | ||
|
||
EXCLUDE_MODULES = \ | ||
|
||
EXCLUDE_SOURCES = \ | ||
|
||
|
||
# --------------------------------- | ||
# List of custom sources for this program: | ||
# --------------------------------- | ||
|
||
MODULES = \ | ||
|
||
SOURCES = \ | ||
qinit.f \ | ||
setprob.f \ | ||
$(CLAW)/riemann/src/rpn2_acoustics.f90 \ | ||
$(CLAW)/riemann/src/rpt2_acoustics.f90 | ||
|
||
#------------------------------------------------------------------- | ||
# Include Makefile containing standard definitions and make options: | ||
include $(CLAWMAKE) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,150 @@ | ||
|
||
""" | ||
Set up the plot figures, axes, and items to be done for each frame. | ||
|
||
This module is imported by the plotting routines and then the | ||
function setplot is called to set the plot parameters. | ||
|
||
""" | ||
|
||
from __future__ import absolute_import | ||
from __future__ import print_function | ||
import os | ||
if os.path.exists('./1drad/_output'): | ||
qref_dir = os.path.abspath('./1drad/_output') | ||
else: | ||
qref_dir = None | ||
print("Directory ./1drad/_output not found") | ||
|
||
|
||
#-------------------------- | ||
def setplot(plotdata=None): | ||
#-------------------------- | ||
|
||
""" | ||
Specify what is to be plotted at each frame. | ||
Input: plotdata, an instance of clawpack.visclaw.data.ClawPlotData. | ||
Output: a modified version of plotdata. | ||
|
||
""" | ||
|
||
if plotdata is None: | ||
from clawpack.visclaw.data import ClawPlotData | ||
plotdata = ClawPlotData() | ||
|
||
|
||
from clawpack.visclaw import colormaps | ||
from clawpack.clawutil.data import ClawData | ||
|
||
# determine original computational domain | ||
abldata = ClawData() | ||
abldata.read(plotdata.outdir + '/abl.data', force=True) | ||
clawdata = ClawData() | ||
clawdata.read(plotdata.outdir + '/claw.data', force=True) | ||
clawdata.lower[0] += abldata.depth_lower[0] | ||
clawdata.upper[0] -= abldata.depth_upper[0] | ||
clawdata.lower[1] += abldata.depth_lower[1] | ||
clawdata.upper[1] -= abldata.depth_upper[1] | ||
|
||
plotdata.clearfigures() # clear any old figures,axes,items data | ||
|
||
|
||
# Figure for pressure | ||
# ------------------- | ||
|
||
plotfigure = plotdata.new_plotfigure(name='Pressure', figno=0) | ||
|
||
# Set up for axes in this figure: | ||
plotaxes = plotfigure.new_plotaxes() | ||
plotaxes.xlimits = 'auto' | ||
plotaxes.ylimits = 'auto' | ||
plotaxes.title = 'Pressure' | ||
plotaxes.scaled = True # so aspect ratio is 1 | ||
|
||
# Set up for item on these axes: | ||
plotitem = plotaxes.new_plotitem(plot_type='2d_pcolor') | ||
plotitem.plot_var = 0 | ||
plotitem.pcolor_cmap = colormaps.blue_yellow_red | ||
plotitem.pcolor_cmin = -2.0 | ||
plotitem.pcolor_cmax = 2.0 | ||
plotitem.add_colorbar = True | ||
|
||
def plot_original_domain(current_data): | ||
from matplotlib.pyplot import gca | ||
ax = gca() | ||
x = [clawdata.lower[0], clawdata.upper[0], clawdata.upper[0], \ | ||
clawdata.lower[0], clawdata.lower[0]] | ||
y = [clawdata.lower[1], clawdata.lower[1], clawdata.upper[1], \ | ||
clawdata.upper[1], clawdata.lower[1]] | ||
ax.plot(x, y, '--k') | ||
|
||
plotaxes.afteraxes = plot_original_domain | ||
|
||
# Figure for scatter plot | ||
# ----------------------- | ||
|
||
plotfigure = plotdata.new_plotfigure(name='scatter', figno=3) | ||
plotfigure.show = (qref_dir is not None) # don't plot if 1d solution is missing | ||
|
||
# Set up for axes in this figure: | ||
plotaxes = plotfigure.new_plotaxes() | ||
plotaxes.xlimits = [0,1.5] | ||
plotaxes.ylimits = [-2.,4.] | ||
plotaxes.title = 'Scatter plot' | ||
|
||
# Set up for item on these axes: scatter of 2d data | ||
plotitem = plotaxes.new_plotitem(plot_type='1d_from_2d_data') | ||
|
||
def p_vs_r(current_data): | ||
# Return radius of each grid cell and p value in the cell | ||
from numpy.ma import MaskedArray, masked_where | ||
from pylab import sqrt | ||
x = current_data.x | ||
y = current_data.y | ||
r = sqrt(x**2 + y**2) | ||
r = masked_where(x < clawdata.lower[0], r) | ||
r = masked_where(x > clawdata.upper[0], r) | ||
r = masked_where(y < clawdata.lower[1], r) | ||
r = masked_where(y > clawdata.upper[1], r) | ||
q = current_data.q | ||
p = MaskedArray(q[0,:,:], mask=r.mask) | ||
return r,p | ||
|
||
plotitem.map_2d_to_1d = p_vs_r | ||
plotitem.plot_var = 0 | ||
plotitem.plotstyle = 'o' | ||
plotitem.color = 'b' | ||
plotitem.show = (qref_dir is not None) # show on plot? | ||
|
||
# Set up for item on these axes: 1d reference solution | ||
plotitem = plotaxes.new_plotitem(plot_type='1d_plot') | ||
plotitem.outdir = qref_dir | ||
plotitem.plot_var = 0 | ||
plotitem.plotstyle = '-' | ||
plotitem.color = 'r' | ||
plotitem.kwargs = {'linewidth': 2} | ||
plotitem.show = True # show on plot? | ||
|
||
def make_legend(current_data): | ||
import matplotlib.pyplot as plt | ||
plt.legend(('2d data', '1d reference solution')) | ||
|
||
plotaxes.afteraxes = make_legend | ||
|
||
|
||
# Parameters used only when creating html and/or latex hardcopy | ||
# e.g., via clawpack.visclaw.frametools.printframes: | ||
|
||
plotdata.printfigs = True # print figures | ||
plotdata.print_format = 'png' # file format | ||
plotdata.print_framenos = 'all' # list of frames to print | ||
plotdata.print_fignos = 'all' # list of figures to print | ||
plotdata.html = True # create html files of plots? | ||
plotdata.html_homelink = '../README.html' # pointer for top of index | ||
plotdata.html_movie = 'JSAnimation' # new style, or "4.x" for old style | ||
plotdata.latex = True # create latex file of plots? | ||
plotdata.latex_figsperline = 2 # layout of plots | ||
plotdata.latex_framesperline = 1 # layout of plots | ||
plotdata.latex_makepdf = False # also run pdflatex? | ||
|
||
return plotdata |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think .data_abl or .output_abl are generated any longer with the new
Makefile_abl
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch.