Skip to content

Commit

Permalink
Update with AmgXWrapper-1.4
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
mesnardo committed May 12, 2018
1 parent 53cb87f commit c36726e
Show file tree
Hide file tree
Showing 124 changed files with 7,801 additions and 3,775 deletions.
24 changes: 24 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
# PetIBM Change Log


---

## 0.2.1

---

### Added

### Changed

* 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+.

### Fixed

* When checking for AmgX, find and keep only the first occurrence of `libamgxsh.so`.

### Removed

* When configuring with AmgX, do not check the version of OpenMPI anymore.
* Do not check for Doxygen.

---

## 0.2.0
Expand Down
7 changes: 1 addition & 6 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,8 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/check_version_openmpi.m4 \
$(top_srcdir)/m4/configure_amgx.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/configure_amgx.m4 \
$(top_srcdir)/m4/configure_cuda.m4 \
$(top_srcdir)/m4/configure_doxygen.m4 \
$(top_srcdir)/m4/configure_petsc.m4 \
$(top_srcdir)/m4/package_utilities.m4 \
$(top_srcdir)/configure.ac
Expand Down Expand Up @@ -229,15 +227,12 @@ CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DOXYGEN = @DOXYGEN@
DOXYGEN_DIR = @DOXYGEN_DIR@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GREP = @GREP@
HAVE_DOXYGEN = @HAVE_DOXYGEN@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ PetIBM solves the incompressible Navier-Stokes equations in two and three dimens
## Dependencies (last tested)

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

Note: Python and libraries have been installed using [`conda`](http://conda.pydata.org/docs/get-started.html) (4.3.1).
Expand Down
2 changes: 0 additions & 2 deletions aclocal.m4
Original file line number Diff line number Diff line change
Expand Up @@ -1246,9 +1246,7 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR

m4_include([m4/check_version_openmpi.m4])
m4_include([m4/configure_amgx.m4])
m4_include([m4/configure_cuda.m4])
m4_include([m4/configure_doxygen.m4])
m4_include([m4/configure_petsc.m4])
m4_include([m4/package_utilities.m4])
Loading

0 comments on commit c36726e

Please sign in to comment.