-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #9 from firedrakeproject/connorjward/merge-upstream
Merge upstream
- Loading branch information
Showing
41 changed files
with
232 additions
and
297 deletions.
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
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
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
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
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
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
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,98 @@ | ||
| #!/usr/bin/env sh | ||
|
|
||
| # | ||
| # slepcversion <gt,lt,le,ge,eq> major.minor[.subminor]" | ||
| # returns 1 on match else 0 | ||
| # | ||
| # For example: slepcversion gt 3.22.1" | ||
|
|
||
| if [ "X${SLEPC_DIR}" = "X" ] ; then | ||
| dir=$(dirname $0) | ||
| dir=$(dirname $dir) | ||
| dir=$(dirname $dir) | ||
| SLEPC_DIR=$(dirname $dir) | ||
| fi | ||
|
|
||
| file=${SLEPC_DIR}/include/slepcversion.h | ||
|
|
||
| if [ ! -f $file ]; then | ||
| echo "Unable to find slepcversion.h; ensure the environmental variable SLEPC_DIR is set correctly" | ||
| exit 1 | ||
| fi | ||
|
|
||
| major=`grep "#define SLEPC_VERSION_MAJOR" $file | tr -s ' ' | cut -d" " -f 3` | ||
| minor=`grep "#define SLEPC_VERSION_MINOR" $file | tr -s ' ' | cut -d" " -f 3` | ||
| subminor=`grep "#define SLEPC_VERSION_SUBMINOR" $file | tr -s ' ' | cut -d" " -f 3` | ||
| release=`grep "#define SLEPC_VERSION_RELEASE" $file | tr -s ' ' | cut -d" " -f 3` | ||
|
|
||
| if [ $# -lt 1 ]; then | ||
| echo ${major}.${minor}.${subminor} | ||
| exit 0 | ||
| fi | ||
|
|
||
| t=$1 | ||
| v=$2 | ||
|
|
||
| vmajor=`echo $v | cut -d"." -f 1` | ||
| vminor=`echo $v | cut -d"." -f 2` | ||
| vsubminor=`echo $v | cut -d"." -f 3` | ||
|
|
||
| if [ $# -lt 2 ]; then | ||
| echo "Usage: slepcversion <gt,lt,le,ge,eq> version" | ||
| echo "For example: slepcversion gt 3.22.1" | ||
| exit 1 | ||
| fi | ||
|
|
||
| eq () { | ||
| # if [ $release = 0 ]; then echo 0; exit 0; fi | ||
| if [ $major != $vmajor ]; then echo 0; exit 0; fi | ||
| if [ $minor != $vminor ]; then echo 0; exit 0; fi | ||
| if [ "${vsubminor}X" = "X" ]; then echo 1; exit 0; fi | ||
| if [ $subminor != $vsubminor ]; then echo 0; exit 0; fi | ||
| echo 1 | ||
| } | ||
|
|
||
| lt () { | ||
| # if [ $release = 0 ]; then echo 0; exit 0; fi | ||
| if [ $major -lt $vmajor ]; then echo 1; exit 0; fi | ||
| if [ $major -gt $vmajor ]; then echo 0; exit 0; fi | ||
| if [ $minor -lt $vminor ]; then echo 1; exit 0; fi | ||
| if [ $minor -gt $vminor ]; then echo 0; exit 0; fi | ||
| if [ "${vsubminor}X" = "X" ]; then echo 0; exit 0; fi | ||
| if [ $subminor -lt $vsubminor ]; then echo 1; exit 0; fi | ||
| echo 0 | ||
| } | ||
|
|
||
| le () { | ||
| # if [ $release = 0 ]; then echo 0; exit 0; fi | ||
| if [ $major -lt $vmajor ]; then echo 1; exit 0; fi | ||
| if [ $major -gt $vmajor ]; then echo 0; exit 0; fi | ||
| if [ $minor -lt $vminor ]; then echo 1; exit 0; fi | ||
| if [ $minor -gt $vminor ]; then echo 0; exit 0; fi | ||
| if [ "${vsubminor}X" = "X" ]; then echo 0; exit 0; fi | ||
| if [ $subminor -le $vsubminor ]; then echo 1; exit 0; fi | ||
| echo 0 | ||
| } | ||
|
|
||
| gt () { | ||
| if [ $major -gt $vmajor ]; then echo 1; exit 0; fi | ||
| if [ $major -lt $vmajor ]; then echo 0; exit 0; fi | ||
| if [ $minor -gt $vminor ]; then echo 1; exit 0; fi | ||
| if [ $minor -lt $vminor ]; then echo 0; exit 0; fi | ||
| if [ "${vsubminor}X" = "X" ]; then echo 1; exit 0; fi | ||
| if [ $subminor -gt $vsubminor ]; then echo 1; exit 0; fi | ||
| echo 0 | ||
| } | ||
|
|
||
| ge () { | ||
| if [ $major -gt $vmajor ]; then echo 1; exit 0; fi | ||
| if [ $major -lt $vmajor ]; then echo 0; exit 0; fi | ||
| if [ $minor -gt $vminor ]; then echo 1; exit 0; fi | ||
| if [ $minor -lt $vminor ]; then echo 0; exit 0; fi | ||
| if [ "${vsubminor}X" = "X" ]; then echo 1; exit 0; fi | ||
| if [ $subminor -ge $vsubminor ]; then echo 1; exit 0; fi | ||
| echo 0 | ||
| } | ||
|
|
||
| ${t} | ||
|
|
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
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
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
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
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 |
|---|---|---|
|
|
@@ -5,17 +5,25 @@ CHANGES: SLEPc for Python | |
| :Author: Lisandro Dalcin | ||
| :Contact: [email protected] | ||
|
|
||
| Development | ||
| =========== | ||
|
|
||
| - In slepc4py now `EPS.getEigenpair()` and `EPS.getEigenvalue()` will return a real value | ||
| instead of a complex, if the problem is of Hermitian or generalized Hermitian type. | ||
| Release 3.22.2 | ||
| ============== | ||
|
|
||
| - Update to SLEPc 3.22.2. | ||
|
|
||
|
|
||
| Release 3.22.1 | ||
| ============== | ||
|
|
||
| - Update to SLEPc 3.22.1. | ||
|
|
||
|
|
||
| Release 3.22.0 | ||
| ============== | ||
|
|
||
| - Update to SLEPc 3.22.0. | ||
| - In slepc4py now `EPS.getEigenpair()` and `EPS.getEigenvalue()` will return a real value | ||
| instead of a complex, if the problem is of Hermitian or generalized Hermitian type. | ||
|
|
||
|
|
||
| Release 3.21.2 | ||
|
|
||
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
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 |
|---|---|---|
|
|
@@ -21,7 +21,7 @@ | |
| """ | ||
|
|
||
| __author__ = 'Lisandro Dalcin' | ||
| __version__ = '3.22.0' | ||
| __version__ = '3.22.2' | ||
| __credits__ = 'SLEPc Team <[email protected]>' | ||
|
|
||
| # ----------------------------------------------------------------------------- | ||
|
|
||
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
Oops, something went wrong.