Skip to content
This repository has been archived by the owner on May 28, 2019. It is now read-only.

Commit

Permalink
Merge branch 'master' into platform-1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
daniviga committed Nov 17, 2016
2 parents f2138d4 + bc28d54 commit 0030cab
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 12 deletions.
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## License

Copyright (C) 2014-2015, GEM Foundation.
Copyright (C) 2014-2016, GEM Foundation.

OpenQuake is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
Expand Down
68 changes: 57 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
OpenQuake Platform
==================

![OpenQuake Logo](https://www.globalquakemodel.org/media/storage/oq-logo.png)

A web-based risk assessment platform which offers an interactive environment for modeling, viewing, exploring, and managing earthquake risk.

User can access, manipulate, share and add data, models and tools for integrated assessment of earthquake risk.
Expand All @@ -9,19 +11,63 @@ User can access, manipulate, share and add data, models and tools for integrated

This platform has been created by the [GEM Foundation](http://www.globalquakemodel.org/gem/).


## License

Copyright (C) 2014-2015, GEM Foundation.
The OpenQuake Platform is released under the **[GNU Affero Public License 3](https://github.com/gem/oq-platform/blob/master/LICENSE.md)**.

## Contacts

* Support forum: https://groups.google.com/forum/#!forum/openquake-users
* Twitter: [@gem_devs](https://twitter.com/gem_devs)
* Email: [email protected]
* IRC: [irc.freenode.net](https://webchat.freenode.net/), channel #openquake

## Thanks

The OpenQuake Engine is developed by the **[Global Earthquake Model Foundation (GEM)](http://gem.foundation)** with the support of
![](https://www.globalquakemodel.org/media/sponsor/aus.png)
![](https://www.globalquakemodel.org/media/sponsor/cidigen.png)
![](https://www.globalquakemodel.org/media/sponsor/sg_170x104.jpg)
![](https://www.globalquakemodel.org/media/sponsor/gfz.png)
![](https://www.globalquakemodel.org/media/sponsor/pcn.jpg)
![](https://www.globalquakemodel.org/media/sponsor/nied.png)
![](https://www.globalquakemodel.org/media/sponsor/nset.png)
![](https://www.globalquakemodel.org/media/sponsor/morst.jpg)
![](https://www.globalquakemodel.org/media/sponsor/RCN.jpg)
![](https://www.globalquakemodel.org/media/sponsor/swiss_1.jpg)
![](https://www.globalquakemodel.org/media/sponsor/tem.jpg)
![](https://www.globalquakemodel.org/media/sponsor/TCIP-01.png)
![](https://www.globalquakemodel.org/media/sponsor/nerc.png)
![](https://www.globalquakemodel.org/media/sponsor/usaid_BsOsE8Z_QZnaG6c.jpg)
![](https://www.globalquakemodel.org/media/sponsor/FUNVISIS_GEM_logo.png)

***

![](https://www.globalquakemodel.org/media/sponsor/FMGlobal.jpg)
![](https://www.globalquakemodel.org/media/sponsor/hannoverRe.jpg)
![](https://www.globalquakemodel.org/media/sponsor/Nephila.jpg)
![](https://www.globalquakemodel.org/media/sponsor/munichre_HwOCwR4.jpg)
![](https://www.globalquakemodel.org/media/sponsor/zurich_3eh504q.jpg)
![](https://www.globalquakemodel.org/media/sponsor/Air_JlQh6Ke.jpg)
![](https://www.globalquakemodel.org/media/sponsor/sur_170x104.jpg)
![](https://www.globalquakemodel.org/media/sponsor/EUCENTRE_BRAw8x4.jpg)
![](https://www.globalquakemodel.org/media/sponsor/GiroJ.jpg)
![](https://www.globalquakemodel.org/media/sponsor/arup.jpg)
![](https://www.globalquakemodel.org/media/sponsor/OYO_1.jpg)

OpenQuake is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
***

OpenQuake is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
![](https://www.globalquakemodel.org/media/sponsor/OECD.jpg)
![](https://www.globalquakemodel.org/media/sponsor/worldbank_2.jpg)
![](https://www.globalquakemodel.org/media/sponsor/ISDR.jpg)
![](https://www.globalquakemodel.org/media/sponsor/Unesco.jpg)
![](https://www.globalquakemodel.org/media/sponsor/iaspei.jpg)
![](https://www.globalquakemodel.org/media/sponsor/iaee.jpg)
![](https://www.globalquakemodel.org/media/sponsor/istructe.jpg)
![](https://www.globalquakemodel.org/media/sponsor/cssc.jpg)
![](https://www.globalquakemodel.org/media/sponsor/IRDRICSU.png)
![](https://www.globalquakemodel.org/media/sponsor/EERI_GEM.png)

You should have received a copy of the GNU Affero General Public License
along with OpenQuake. If not, see http://www.gnu.org/licenses/agpl-3.0.html.
If you would like to help support development of OpenQuake, please contact us at [[email protected]](mailto:[email protected]).
For more info visit the GEM website at https://www.globalquakemodel.org/gem/organisation/partners/

0 comments on commit 0030cab

Please sign in to comment.