Skip to content

Commit

Permalink
Merge pull request #551 from geoscixyz/dougoldenburg-patch-2
Browse files Browse the repository at this point in the history
Landing page: index.rst
  • Loading branch information
lheagy authored Jan 23, 2019
2 parents 52c563c + 04fd2f7 commit 96ad69c
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[bumpversion]
current_version = 0.0.4
current_version = 0.0.5
files = conf.py _templates/footer.html

2 changes: 1 addition & 1 deletion _templates/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</div>
<br>
<div class="col-md-8" align="left" font-size="11px">
<a href="https://github.com/geoscixyz/em/releases/tag/0.0.4">Version 0.0.4</a>
<a href="https://github.com/geoscixyz/em/releases/tag/0.0.5">Version 0.0.5</a>
</div>
<br>
<div class="col-md-8" align="left" font-size="11px">
Expand Down
4 changes: 3 additions & 1 deletion app.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# application: emgeosci
# version: 1
runtime: python37
runtime: python27
api_version: 1
threadsafe: yes

handlers:

Expand Down
4 changes: 2 additions & 2 deletions conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@
# built documents.
#
# The short X.Y version.
version = '0.0.4'
version = '0.0.5'
# The full version, including alpha/beta/rc tags.
release = '0.0.4'
release = '0.0.5'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
67 changes: 40 additions & 27 deletions index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ and the exponential increase in computer power allows us to solve problems
that were not possible a few years ago. It is also becoming more common-place to
acquire laboratory or in-situ measurements of physical properties and these
are essential links in tying geophysics to questions about the earth. The
other advance is the open-source technology that
other advance is the open-source technology that
allows technical material and ideas to be generated by multiple contributors
through sources like Github_ . Cloud-based computing environments and
open source software have also opened up portals for interacting with equations
Expand All @@ -54,47 +54,60 @@ throughout the communinity.
What is EM GeoSci?
------------------

The emphasis is on physical principles of electromagnetic methods and their
application in solving problems. Rigorous analytic solutions of the EM
problems with specific transmitting fields and earth models is left to
existing books and research papers. Also, the resource does not concentrate
upon the scientific computing aspects to numerically solve Maxwell’s
equations. We do however, make much use of software that can perform those
functions. Rather, our emphasis is on using analytic and numerical solutions
to understand electromagnetic fields and fluxes obtained from various types
of transmitters in different geological environments.

Our emphasis is on fundamentals and applications and correspondingly
:ref:`case_histories_index` play an essential role. These provide the
motivation for using electromagnetics and show the success, or not, of their
application in making an impact upon the problem at hand.

Examples are available through `Jupyter Notebooks`_ and can be run through Binders_.
The simulations use the open-source Simulation and Parameter Estimation package
SimPEG_.
EM GeoSci is an open-source resource that emphasizes the physical principles
of electromagnetic methods and their application in solving geoscience
problems. Rigorous analytic solutions of the EM problems with specific
transmitting fields and earth models are left to existing books and research
papers, and so too are the computational details required to numerically solve
Maxwell’s equations. Our emphasis is on using analytic and numerical solutions
to understand electromagnetic fields and fluxes obtained from various types of
transmitters in different geological environments and to show how different EM
surveys, using controlled or natural sources, can be applied in practise.
`Case Histories <https://em.geosci.xyz/content/case_histories/index.html#case-histories-index>`_
play an essential role. They allow readers to make the
connection between the geoscience problem, the EM survey, and the eventual
outcome. Understanding the fundamental physics is facilitated through the use
of `Jupyter Notebooks <https://mybinder.org/v2/gh/geoscixyz/em-apps/master?filepath=index.ipynb>`_
which allow users to visualize fields and
explore understanding by changing parameters. The simulations use the open-
source package `SimPEG <https://simpeg.xyz>`_ (Simulation and Parameter
Estimation in Geophysics).


.. image:: https://mybinder.org/badge.svg
:target: https://mybinder.org/v2/gh/geoscixyz/em-apps/master?filepath=index.ipynb
:alt: Binder

.. _Jupyter Notebooks: https://github.com/geoscixyz/em_examples
.. _Binders: https://mybinder.org/v2/gh/geoscixyz/em-apps/master?filepath=index.ipynb
.. _SimPEG: http://simpeg.xyz

This resource is Open Source and while currently being led by brilliant
and enthusiastic graduate students and faculty at UBC, the vision is to have
experts, worldwide, contribute. Join the development on Github_ or
`get in touch <http://geosci.xyz/contact>`_!

EM GeoSci and the SEG
---------------------

.. image:: https://upload.wikimedia.org/wikipedia/en/thumb/4/4d/SEG_2016_logo.svg/1200px-SEG_2016_logo.svg.png
:align: right
:alt: SEG logo
:width: 35%
:target: https://seg.org/

EM GeoSci served as the main "textbook" resource for the `SEG 2017
Distinguished Instructor Short Course
<https://seg.org/Education/Courses/DISC/2017-DISC-Doug-Oldenburg>`_
on “Geophysical Electromagnetics: Fundamentals and Applications”. We are
grateful that the SEG supported us in our open-source experiment and allowed
us to substitute EM GeoSci for the traditional hardcopy book that accompanies
the DISC. The `Case Histories <https://em.geosci.xyz/content/case_histories/index.html#case-histories-index>`_,
which form an important component of EM GeoSci, are presented within
a synoptic Seven-Step framework that is linked to original, published and
copyrighted papers. We are grateful that the SEG has allowed us to adapt
figures and content from their publications.


EM GeoSci is under construction
-------------------------------

EM GeoSci is under active construction. We are working to fill in blank
pages and address todo's. Our goal is to have a mature version available by the
end of 2017. In the meantime, we are making this resource available and
end of 2019. In the meantime, we are making this resource available and
`inviting contributions for case histories <http://disc2017.geosci.xyz/#contribute>`_.
We welcome `feedback <http://geosci.xyz/contact>`_ about the useability of the site and the technical details.

Expand Down

0 comments on commit 96ad69c

Please sign in to comment.