Skip to content
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

Faster bound #149

Merged
merged 57 commits into from
Jan 10, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
028a4e4
fixed indexing error
mjberger Aug 21, 2015
1e2d77c
larger format for ascii otuput
mjberger Aug 22, 2015
8c6dce4
new test dir - should get zero error for linear solution
mjberger Aug 22, 2015
c6a20b3
new test dir - should get zero error for 3d linear solution
mjberger Aug 22, 2015
b3e3a04
fixing 3d filpatch bug. test case for exact solution
mjberger Aug 24, 2015
18fb97b
new 3d exact test problem
mjberger Aug 24, 2015
b9b4bd2
bug fix in setting cfl: was overwriting cflgrid with each dim step
mjberger Aug 28, 2015
984adf5
save arrays of grids permanently instead of recomputing each step
mjberger Sep 1, 2015
00c47a7
cleaning advanc
mjberger Sep 2, 2015
d89733a
fixing merge conflicts from updated master with new timings
mjberger Sep 2, 2015
cacb348
after merge with master to update
mjberger Sep 2, 2015
3ffc47f
working 3d filpatch. need to clean it
mjberger Sep 3, 2015
5193a04
cleaned var names in 3d
mjberger Sep 3, 2015
065d7fb
working on linearly exact example, updated subr.
mjberger Sep 3, 2015
e674f9b
forgot to include this file in test - prints max error when called
mjberger Sep 3, 2015
b6faaaa
accidentally checked in wrong version
mjberger Sep 3, 2015
e042293
including Makefile
mjberger Sep 3, 2015
1371076
substituted one more place for array of grids traversal
mjberger Sep 4, 2015
0fc0627
took out one more call to prepgrids
mjberger Sep 4, 2015
e7ff972
fix merge conflict from combining ghostCellBugFix and initAdvanceFix
mjberger Sep 4, 2015
4eb0233
new and modified routines for faster bc handling
mjberger Sep 8, 2015
acf67a4
and this new routine is in its own file
mjberger Sep 8, 2015
22a6ed3
forgot to include reclaiming of bndry list space
mjberger Sep 8, 2015
02e329d
put new routine intfilList in intfil.f90, to avoid changing all those…
mjberger Sep 8, 2015
f735501
took out intfilList from Makefile since moved the new subr. into intfil
mjberger Sep 8, 2015
0f7d12b
checking in intfil containing intfilList.f90 in same file
mjberger Sep 8, 2015
54765bf
added parallel construct for new arraybased lists of grids
mjberger Sep 9, 2015
6a06618
working on 3d too. also fixed minor nstop bug
mjberger Sep 10, 2015
dcdcd2f
changed 2 more calling sequences. richardson doesnt work
mjberger Sep 11, 2015
be8c68a
only one change to calling seq. in 3d
mjberger Sep 11, 2015
001a69a
rolling back, changed wrong thing
mjberger Sep 11, 2015
39f9cc9
another bug in filpatch - this time in i_coarse, leading to incorrect…
mjberger Sep 12, 2015
6c5cb9e
fixed bug in filpatch when computing negative coarse indices. working…
mjberger Sep 14, 2015
ec380ab
larger format statement to go with larger node size that now includes…
mjberger Sep 14, 2015
5c8f961
to include 3d linearly exact test case
mjberger Sep 14, 2015
6677aaf
missed a shared var construct, changed default number of bndry nbors …
mjberger Sep 14, 2015
8bf10ca
removing debugging line
mjberger Sep 14, 2015
b49d854
reversed order of i and j loops for catch friedliness
mjberger Sep 14, 2015
2e72480
still adjusting how big to make bndry list; left out z dir in interse…
mjberger Sep 15, 2015
e5d559e
replaced float with real(,kind=8)
mjberger Sep 15, 2015
e2056f6
minor edits
mjberger Sep 15, 2015
98a6c6a
accidentally deleted a line
mjberger Sep 15, 2015
057b257
implemented restart capability for boundary lists; modified organizat…
mjberger Sep 22, 2015
f941ec5
changed format statement to allow for larger number of grids
mjberger Sep 29, 2015
dfad6bc
enlarged format statement for big calcs
mjberger Oct 2, 2015
27cd1bb
enlarging more format statements
mjberger Oct 2, 2015
5416c51
changed format statement
mjberger Oct 6, 2015
053893c
messed up format statement enlargement
mjberger Oct 7, 2015
897ef9f
enlarged format statements
mjberger Oct 7, 2015
216b7d8
enlarged format statement and clarified error message
mjberger Oct 13, 2015
141be04
enlarged format statement
mjberger Oct 14, 2015
f125f0f
after updating with latest master
mjberger Oct 15, 2015
802834e
cleaned up dummy argument from nodget routines
mjberger Oct 24, 2015
731cc74
cleaning up nodget
mjberger Oct 24, 2015
45cc255
updated regression data for tests/advection_3d_swirl for change of ma…
rjleveque Oct 24, 2015
7b02d02
merged master into fasterBound branch to update #149
rjleveque Jan 10, 2016
81180c9
Merge pull request #2 from rjleveque/fasterBound
mjberger Jan 10, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
159 changes: 159 additions & 0 deletions dev/advection_2d_linearTest/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@

# 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 = amrclaw # Clawpack package to use
EXE = xamr # Executable to create
SETRUN_FILE = setrun.py # File containing function to make data
OUTDIR = _output # Directory for output
SETPLOT_FILE = setplot.py # File containing function to set plots
PLOTDIR = _plots # Directory for plots

OVERWRITE ?= True # False ==> make a copy of OUTDIR first
RESTART ?= False # Should = clawdata.restart in setrun

# 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 ?=


# ---------------------------------
# List of sources for this program:
# ---------------------------------

AMRLIB = $(CLAW)/amrclaw/src/2d

MODULES = \
$(AMRLIB)/amr_module.f90 \
$(AMRLIB)/regions_module.f90 \
$(AMRLIB)/gauges_module.f90

SOURCES = \
qinit.f \
qtrue.f \
setprob.f \
bc2amr.f \
flag2refine2.f90 \
$(CLAW)/riemann/src/rpn2_advection.f \
$(CLAW)/riemann/src/rpt2_advection.f \
$(AMRLIB)/amr2.f90 \
$(AMRLIB)/setaux.f90 \
$(AMRLIB)/domain.f \
$(AMRLIB)/b4step2.f90 \
$(AMRLIB)/qad.f \
$(AMRLIB)/src2.f90 \
$(AMRLIB)/src1d.f90 \
$(AMRLIB)/advanc.f \
$(AMRLIB)/bound.f90 \
$(AMRLIB)/stepgrid.f \
$(AMRLIB)/stepgrid_dimSplit.f \
$(AMRLIB)/auxcoarsen.f \
$(AMRLIB)/fixcapaq.f \
$(AMRLIB)/estdt.f \
$(AMRLIB)/init_iflags.f \
$(AMRLIB)/igetsp.f \
$(AMRLIB)/reclam.f \
$(AMRLIB)/birect.f \
$(AMRLIB)/cleanup.f \
$(AMRLIB)/colate2.f \
$(AMRLIB)/bufnst2.f \
$(AMRLIB)/spest2.f \
./valout.f \
$(AMRLIB)/flagregions2.f90 \
$(AMRLIB)/errest.f \
$(AMRLIB)/errf1.f \
$(AMRLIB)/gfixup.f \
$(AMRLIB)/filval.f90 \
$(AMRLIB)/filpatch.f90 \
$(AMRLIB)/prefilp.f90 \
$(AMRLIB)/flglvl2.f \
$(AMRLIB)/flagger.f \
$(AMRLIB)/prepregstep.f \
$(AMRLIB)/prepbigstep.f \
$(AMRLIB)/fluxad.f \
$(AMRLIB)/fluxsv.f \
$(AMRLIB)/ginit.f \
$(AMRLIB)/grdfit2.f \
$(AMRLIB)/intfil.f \
$(AMRLIB)/moment.f \
$(AMRLIB)/nestck2.f \
$(AMRLIB)/prepf.f \
$(AMRLIB)/prepc.f \
$(AMRLIB)/projec2.f \
$(AMRLIB)/signs.f \
$(AMRLIB)/findcut.f \
$(AMRLIB)/smartbis.f \
$(AMRLIB)/putnod.f \
$(AMRLIB)/putsp.f \
$(AMRLIB)/regrid.f \
$(AMRLIB)/setgrd.f \
$(AMRLIB)/setuse.f \
$(AMRLIB)/stst1.f \
$(AMRLIB)/tick.f \
$(AMRLIB)/trimbd.f90 \
$(AMRLIB)/update.f \
$(AMRLIB)/nodget.f \
$(AMRLIB)/upbnd.f \
$(AMRLIB)/basic.f \
$(AMRLIB)/outval.f \
$(AMRLIB)/copysol.f \
$(AMRLIB)/outvar.f \
$(AMRLIB)/outmsh.f \
$(AMRLIB)/outtre.f \
$(AMRLIB)/setflags.f \
$(AMRLIB)/shiftset2.f \
$(AMRLIB)/conck.f \
$(AMRLIB)/domshrink.f \
$(AMRLIB)/domprep.f \
$(AMRLIB)/domup.f \
$(AMRLIB)/domcopy.f \
$(AMRLIB)/coarsen.f \
$(AMRLIB)/intcopy.f \
$(AMRLIB)/preintcopy.f \
$(AMRLIB)/icall.f \
$(AMRLIB)/preicall.f \
$(AMRLIB)/step2.f90 \
$(AMRLIB)/step2x.f90 \
$(AMRLIB)/step2y.f90 \
$(AMRLIB)/flux2.f \
$(AMRLIB)/flux2_dimSplit.f \
$(AMRLIB)/inlinelimiter.f \
$(AMRLIB)/cstore.f \
$(AMRLIB)/saveqc.f \
$(AMRLIB)/check.f \
$(AMRLIB)/restrt.f \
$(AMRLIB)/quick_sort1.f \
$(AMRLIB)/opendatafile.f \
$(AMRLIB)/addflags.f \
$(AMRLIB)/domgrid.f \
$(AMRLIB)/drivesort.f \
$(AMRLIB)/flagcheck.f \
$(AMRLIB)/setdomflags.f \
$(AMRLIB)/setIndices.f \
$(AMRLIB)/setPhysBndry.f \
$(AMRLIB)/setPhysBndryFlags.f \
$(AMRLIB)/coarseGridFlagSet.f \
$(AMRLIB)/griddomcopy.f \
$(AMRLIB)/griddomshrink.f \
$(AMRLIB)/griddomup.f \
$(AMRLIB)/baseCheck.f \
$(AMRLIB)/init_alloc.f90 \
$(AMRLIB)/restrt_alloc.f90 \
$(AMRLIB)/resize_alloc.f90 \
# $(AMRLIB)/resize_alloc_static.f90 \

#-------------------------------------------------------------------
# Include Makefile containing standard definitions and make options:
include $(CLAWMAKE)

Loading