Skip to content

Commit 3ede3d3

Browse files
committed
Fix src/bouss/amr2.f90 call to set_fgout, adding nvar
This was modified in the shallow/amr2.f90 code to support more fgout flexibility in clawpack#624, and this change is also required in the bouss version. Also enhanced the examples/bouss README files a bit.
1 parent 3ac6822 commit 3ede3d3

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

examples/bouss/README.txt

+6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11

2+
GeoClaw Boussinesq solver examples
3+
24
The radial_flat subdirectory contains one example using the Boussinesq
35
solver introduced in Clawpack v5.10.0.
46

@@ -14,8 +16,12 @@ OpenMP along with MPI. Some flags have to be set as environment variables
1416
or directly in the application Makefile, e.g. see the lines commented out in
1517
radial_flat/Makefile.
1618

19+
The file setenv.sh illustrates how you might set some environment
20+
variables for the bash shell.
21+
1722
A file petscMPIoptions is also required to set some PETSc parameters for the
1823
iterative method used to solve the large sparse linear systems that arise at
1924
each refinement level when the Boussinesq equations are solved.
2025
One of the environment variables mentioned above points to this file, and a
2126
sample is included in this directory.
27+

examples/bouss/radial_flat/README.rst

+9
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ A Gaussian hump of water at the origin spreads out over a flat bottom,
88
as specified by the topo file `flat100.txt` (uniform water depth 100 m).
99
The equations are solved in Cartesian coordinates with the SGN equations.
1010

11+
Running the GeoClaw Boussinesq solvers requires PETSc and MPI.
12+
For more details see the documentation
13+
https://www.clawpack.org/bouss2d.html
14+
and
15+
$CLAW/geoclaw/examples/bouss/README.txt
16+
Run
17+
make check
18+
in this directory to check if things seem ok for running this code.
19+
1120
A flagregion specified by `RuledRectangle_Diagonal.data` (that is created by
1221
code in `setrun.py` is used to allow flagging for refinement to
1322
level 2 only near the diagonal (for abs(x-y) < 1000). The code is set up to

src/2d/bouss/amr2.f90

+2-2
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ program amr2
513513
call read_dtopo_settings() ! specifies file with dtopo from earthquake
514514
call read_topo_settings(rest) ! specifies topography (bathymetry) files
515515
call set_qinit() ! specifies file with dh if this used instead
516-
call set_fgout(rest) ! Fixed grid settings
516+
call set_fgout(rest,nvar) ! Fixed grid settings
517517
call setup_variable_friction() ! Variable friction parameter
518518
call set_storm() ! Set storm parameters
519519
call set_regions() ! Set refinement regions
@@ -548,7 +548,7 @@ program amr2
548548
call read_topo_settings(rest) ! specifies topography (bathymetry) files
549549
call set_qinit() ! specifies file with dh if this used instead
550550

551-
call set_fgout(rest) ! Fixed grid settings
551+
call set_fgout(rest,nvar) ! Fixed grid settings
552552
call setup_variable_friction() ! Variable friction parameter
553553
call set_multilayer() ! Set multilayer SWE parameters
554554
call set_storm() ! Set storm parameters

0 commit comments

Comments
 (0)