From eda23944113a6525e7a332c9c003f075ececd4cd Mon Sep 17 00:00:00 2001 From: seogi_macbook Date: Mon, 27 Jun 2016 13:04:30 -0700 Subject: [PATCH 1/5] fix bug for omega. --- SimPEG/EM/Analytics/FDEMDipolarfields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SimPEG/EM/Analytics/FDEMDipolarfields.py b/SimPEG/EM/Analytics/FDEMDipolarfields.py index 7b79a680..b643e649 100644 --- a/SimPEG/EM/Analytics/FDEMDipolarfields.py +++ b/SimPEG/EM/Analytics/FDEMDipolarfields.py @@ -114,7 +114,7 @@ def E_inductive_from_ElectricDipoleWholeSpace(XYZ, srcLoc, sig, f, current=1., l """ mu = mu_0*(1+kappa) epsilon = epsilon_0*epsr - sig_hat = sig + 1j*omeg*epsilon + sig_hat = sig + 1j*omega(f)*epsilon XYZ = Utils.asArray_N_x_Dim(XYZ, 3) # Check From a289b656cd50d0602bd8ada1e2a004cd3181c5dc Mon Sep 17 00:00:00 2001 From: seogi_macbook Date: Wed, 29 Jun 2016 13:09:11 -0700 Subject: [PATCH 2/5] Fixes for kwargs variables in FDEMDipolarfields.py --- SimPEG/EM/Analytics/FDEMDipolarfields.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SimPEG/EM/Analytics/FDEMDipolarfields.py b/SimPEG/EM/Analytics/FDEMDipolarfields.py index b643e649..e65bbdd1 100644 --- a/SimPEG/EM/Analytics/FDEMDipolarfields.py +++ b/SimPEG/EM/Analytics/FDEMDipolarfields.py @@ -160,7 +160,7 @@ def J_from_ElectricDipoleWholeSpace(XYZ, srcLoc, sig, f, current=1., length=1., Add description of parameters """ - Ex, Ey, Ez = E_from_ElectricDipoleWholeSpace(XYZ, srcLoc, sig, f, current=1., length=1., orientation='X', kappa=1., epsr=1.) + Ex, Ey, Ez = E_from_ElectricDipoleWholeSpace(XYZ, srcLoc, sig, f, current=current, length=length, orientation=orientation, kappa=kappa, epsr=epsr) Jx = sig*Ex Jy = sig*Ey Jz = sig*Ez @@ -175,7 +175,7 @@ def J_galvanic_from_ElectricDipoleWholeSpace(XYZ, srcLoc, sig, f, current=1., le Add description of parameters """ - Ex_galvanic, Ey_galvanic, Ez_galvanic = E_galvanic_from_ElectricDipoleWholeSpaced(XYZ, srcLoc, sig, f, current=1., length=1., orientation='X', kappa=1., epsr=1.) + Ex_galvanic, Ey_galvanic, Ez_galvanic = E_galvanic_from_ElectricDipoleWholeSpaced(XYZ, srcLoc, sig, f, current=current, length=length, orientation=orientation, kappa=kappa, epsr=epsr) Jx_galvanic = sig*Ex_galvanic Jy_galvanic = sig*Ey_galvanic Jz_galvanic = sig*Ez_galvanic @@ -190,7 +190,7 @@ def J_inductive_from_ElectricDipoleWholeSpace(XYZ, srcLoc, sig, f, current=1., l Add description of parameters """ - Ex_inductive, Ey_inductive, Ez_inductive = E_inductive_from_ElectricDipoleWholeSpaced(XYZ, srcLoc, sig, f, current=1., length=1., orientation='X', kappa=1., epsr=1.) + Ex_inductive, Ey_inductive, Ez_inductive = E_inductive_from_ElectricDipoleWholeSpaced(XYZ, srcLoc, sig, f, current=current, length=length, orientation=orientation, kappa=kappa, epsr=epsr) Jx_inductive = sig*Ex_inductive Jy_inductive = sig*Ey_inductive Jz_inductive = sig*Ez_inductive @@ -248,7 +248,7 @@ def B_from_ElectricDipoleWholeSpace(XYZ, srcLoc, sig, f, current=1., length=1., Add description of parameters """ - Hx, Hy, Hz = H_from_ElectricDipoleWholeSpace(XYZ, srcLoc, sig, f, current=1., length=1., orientation='X', kappa=1., epsr=1.) + Hx, Hy, Hz = H_from_ElectricDipoleWholeSpace(XYZ, srcLoc, sig, f, current=current, length=length, orientation=orientation, kappa=kappa, epsr=epsr) Bx = mu*Hx By = mu*Hy Bz = mu*Hz From ea62998250db5be2ae5b19e7bbee7b515c4ec59d Mon Sep 17 00:00:00 2001 From: Lindsey Heagy Date: Wed, 13 Jul 2016 12:15:15 -0700 Subject: [PATCH 3/5] use codecov.io --- .travis.yml | 2 +- README.rst | 6 +++++- docs/index.rst | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6fab6238..9a921a04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,7 +59,7 @@ script: # Calculate coverage after_success: - coveralls --config_file .coveragerc - + - bash <(curl -s https://codecov.io/bash) - if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then if [ ${TEST_DIR} == "tests/docs" ]; then python scripts/fetch_gae_sdk.py $(dirname "${GAE_PYTHONPATH}"); diff --git a/README.rst b/README.rst index 85777c4c..8a5b22a5 100644 --- a/README.rst +++ b/README.rst @@ -28,7 +28,11 @@ SimPEG .. image:: http://img.shields.io/badge/GITTER-JOIN_CHAT-brightgreen.svg?style=flat-square :alt: gitter chat room at https://gitter.im/simpeg/simpeg :target: https://gitter.im/simpeg/simpeg - + +.. image:: https://codecov.io/gh/simpeg/simpeg/branch/master/graph/badge.svg +  :target: https://codecov.io/gh/simpeg/simpeg + + Simulation and Parameter Estimation in Geophysics - A python package for simulation and gradient based parameter estimation in the context of geophysical applications. The vision is to create a package for finite volume simulation with applications to geophysical imaging and subsurface flow. To enable the understanding of the many different components, this package has the following features: diff --git a/docs/index.rst b/docs/index.rst index fd6959bc..91b07871 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -24,6 +24,10 @@ SimPEG Documentation :target: https://coveralls.io/r/simpeg/simpeg?branch=master :alt: Coverage status +.. image:: https://codecov.io/gh/simpeg/simpeg/branch/master/graph/badge.svg +  :target: https://codecov.io/gh/simpeg/simpeg + + Simulation and Parameter Estimation in Geophysics - A python package for simulation and gradient based parameter estimation in the context of geophysical applications. Our vision is to create a package for finite volume simulation with applications to geophysical imaging and subsurface flow. To enable the understanding of the many different components, this package has the following features: From 4e583fc5662368ee5ae20376ce43be7f75c80a33 Mon Sep 17 00:00:00 2001 From: Lindsey Heagy Date: Wed, 13 Jul 2016 13:40:38 -0700 Subject: [PATCH 4/5] fix indentation level --- docs/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.rst b/docs/index.rst index 91b07871..dc78f64c 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -25,7 +25,7 @@ SimPEG Documentation :alt: Coverage status .. image:: https://codecov.io/gh/simpeg/simpeg/branch/master/graph/badge.svg -  :target: https://codecov.io/gh/simpeg/simpeg + :target: https://codecov.io/gh/simpeg/simpeg Simulation and Parameter Estimation in Geophysics - A python package for simulation and gradient based parameter estimation in the context of geophysical applications. From 09ec5621aee0ac77b9b941778a0929232ffdb3ec Mon Sep 17 00:00:00 2001 From: Lindsey Heagy Date: Wed, 13 Jul 2016 19:46:27 -0700 Subject: [PATCH 5/5] remove coveralls --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9a921a04..a6fba42c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,7 +58,6 @@ script: # Calculate coverage after_success: - - coveralls --config_file .coveragerc - bash <(curl -s https://codecov.io/bash) - if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then if [ ${TEST_DIR} == "tests/docs" ]; then