Skip to content

Commit

Permalink
Merge pull request #240 from luca-heltai/release-1.0
Browse files Browse the repository at this point in the history
Started version 1.0 release process.
  • Loading branch information
luca-heltai committed Nov 24, 2015
2 parents 66dd15a + 3768803 commit fe22a90
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 11 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ install:
- ./scripts/set_cache.sh
- mkdir build
- cd build
- cmake -GNinja -DCMAKE_INSTALL_PREFIX=/home/travis/deal2lkit-inst -DD2K_ENABLE_TESTING=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..
- cmake -GNinja -DCMAKE_INSTALL_PREFIX=/home/travis/deal2lkit-$BUILD_TYPE -DD2K_ENABLE_TESTING=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE ..
- ninja -j4 install
#- tar cvfz /home/travis/deal2lkit-CI-build.tgz /home/travis/deal2lkit-inst
- tar cfz /home/travis/deal2lkit-CI-$BUILD_TYPE.tgz /home/travis/deal2lkit-$BUILD_TYPE
- tar cfz /home/travis/dealii-CI-environment.tgz $PRG

script:
- ctest -j4 -V -R "${BUILD_TYPE,,}"
Expand All @@ -58,9 +59,8 @@ deploy:
api_key:
secure: JBIOZ2GRmxWduUKtM6E623y4lju4P7nKsa+DYh2qwrlSqQDrDoRPwGt9LW8T8l9CiMhvKbXTdzEsmQMdtHGzRW2GV9VU/lsugMTEGJMtjd/ly0dwTyscBhnBudLnk/z1lZB/wKgxi2r+fmsthRctvtzkIK8uRBqA0ivkAD9wFRU=
file:
- /home/travis/deal2lkit-CI-build.tgz
- $PRG/trilinos-serial-CI-build.tgz
- $PRG/dealii-trilinos-serial-CI-build.tgz
- /home/travis/deal2lkit-CI-$BUILD_TYPE.tgz
- /home/travis/dealii-CI-environment.tgz
skip_cleanup: true
on:
repo: mathlab/deal2lkit
Expand Down
35 changes: 30 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,8 @@ http://mathlab.github.io/deal2lkit

## 1. Deal.II Requirements: ##

Currently, the distributed source code requires the development
version of the deal.II library. It will not work with deal.II 8.3 and
previous versions, due to incompatibility issues.
Currently, the distributed source code requires version 8.4 of the
deal.II library.

2. Installation procedure:
==========================
Expand Down Expand Up @@ -83,7 +82,33 @@ for example, using wget
wget http://www.dealii.org/developer/doxygen/deal.tag
make doc

5. Licence Informations
=======================
4. Citing this work
===================

If you use this library, please consider citing the following works:

@techreport{SartoriGiulianiBardelloni-2015-a,
Author = {Alberto Sartori and Nicola Giuliani and Mauro Bardelloni and Luca Heltai},
Institution = {SISSA},
Number = {57/2015/MATE},
Title = {deal2lkit: a Toolkit Library for deal.II},
Year = {2015}}


@techreport{MaierBardelloniHeltai-2015-a,
Author = {Matthias Maier and Mauro Bardelloni and Luca Heltai},
Institution = {SISSA},
Title = {LinearOperator -- a generic, high-level expression syntax for linear algebra},
Year = {2015}}


@techreport{BangerthHeisterHeltai-2016-a,
Author = {W. Bangerth and T. Heister and L. Heltai and G. Kanschat and M. Kronbichler and M. Maier and B. Turcksin},
Institution = {Submitted},
Title = {The \texttt{deal.II} Library, Version 8.3},
Year = {2015}}

5. Licence Information
======================

See the LICENCE file in this directory.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.0.pre
1.0.0

0 comments on commit fe22a90

Please sign in to comment.