Skip to content

Commit c36726e

Browse files
committed
Update with AmgXWrapper-1.4
* Update version of AmgXWrapper (from `1.0-beta2` to `1.4`). * Update calls to AmgXWrapper routines (due to changes in API). * AmgXWrapper-1.4 requires to use PETSc-3.8+. Therefore, when configuring with AmgX, use PETSc-3.8+. * When checking for AmgX, find and keep only the first occurrence of `libamgxsh.so`. * When configuring with AmgX, do not check the version of OpenMPI anymore. * Do not check for Doxygen. * Bump version of PetIBM to 0.2.1
1 parent 53cb87f commit c36726e

File tree

124 files changed

+7801
-3775
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+7801
-3775
lines changed

CHANGELOG.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,29 @@
11
# PetIBM Change Log
22

3+
4+
---
5+
6+
## 0.2.1
7+
8+
---
9+
10+
### Added
11+
12+
### Changed
13+
14+
* Update version of AmgXWrapper (from `1.0-beta2` to `1.4`).
15+
* Update calls to AmgXWrapper routines (due to changes in API).
16+
* AmgXWrapper-1.4 requires to use PETSc-3.8+. Therefore, when configuring with AmgX, use PETSc-3.8+.
17+
18+
### Fixed
19+
20+
* When checking for AmgX, find and keep only the first occurrence of `libamgxsh.so`.
21+
22+
### Removed
23+
24+
* When configuring with AmgX, do not check the version of OpenMPI anymore.
25+
* Do not check for Doxygen.
26+
327
---
428

529
## 0.2.0

Makefile.in

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,8 @@ PRE_UNINSTALL = :
8787
POST_UNINSTALL = :
8888
subdir = .
8989
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
90-
am__aclocal_m4_deps = $(top_srcdir)/m4/check_version_openmpi.m4 \
91-
$(top_srcdir)/m4/configure_amgx.m4 \
90+
am__aclocal_m4_deps = $(top_srcdir)/m4/configure_amgx.m4 \
9291
$(top_srcdir)/m4/configure_cuda.m4 \
93-
$(top_srcdir)/m4/configure_doxygen.m4 \
9492
$(top_srcdir)/m4/configure_petsc.m4 \
9593
$(top_srcdir)/m4/package_utilities.m4 \
9694
$(top_srcdir)/configure.ac
@@ -229,15 +227,12 @@ CXXFLAGS = @CXXFLAGS@
229227
CYGPATH_W = @CYGPATH_W@
230228
DEFS = @DEFS@
231229
DEPDIR = @DEPDIR@
232-
DOXYGEN = @DOXYGEN@
233-
DOXYGEN_DIR = @DOXYGEN_DIR@
234230
ECHO_C = @ECHO_C@
235231
ECHO_N = @ECHO_N@
236232
ECHO_T = @ECHO_T@
237233
EGREP = @EGREP@
238234
EXEEXT = @EXEEXT@
239235
GREP = @GREP@
240-
HAVE_DOXYGEN = @HAVE_DOXYGEN@
241236
INSTALL = @INSTALL@
242237
INSTALL_DATA = @INSTALL_DATA@
243238
INSTALL_PROGRAM = @INSTALL_PROGRAM@

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ PetIBM solves the incompressible Navier-Stokes equations in two and three dimens
1919
## Dependencies (last tested)
2020

2121
* g++-4.9.2, g++-5.4.0
22-
* [PETSc](https://www.mcs.anl.gov/petsc/) 3.7.4
22+
* [PETSc](https://www.mcs.anl.gov/petsc/) 3.8.1
2323
* Python 2.7 (optional, for pre- and post-processing)
2424

2525
Note: Python and libraries have been installed using [`conda`](http://conda.pydata.org/docs/get-started.html) (4.3.1).

aclocal.m4

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1246,9 +1246,7 @@ AC_SUBST([am__tar])
12461246
AC_SUBST([am__untar])
12471247
]) # _AM_PROG_TAR
12481248

1249-
m4_include([m4/check_version_openmpi.m4])
12501249
m4_include([m4/configure_amgx.m4])
12511250
m4_include([m4/configure_cuda.m4])
1252-
m4_include([m4/configure_doxygen.m4])
12531251
m4_include([m4/configure_petsc.m4])
12541252
m4_include([m4/package_utilities.m4])

0 commit comments

Comments
 (0)