Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dc2d app #21

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open

Dc2d app #21

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c851568
add 2D DC simulation
sgkang Sep 17, 2019
31a30fa
add DC notebooks
sgkang Sep 17, 2019
827b3b6
update index page
sgkang Sep 17, 2019
b5e5a0e
minor update
sgkang Sep 17, 2019
b58380d
update DC notebooks
sgkang Sep 17, 2019
ea99967
add int
sgkang Sep 19, 2019
d487d48
incorporate doug and ren's suggestions
sgkang Oct 3, 2019
6845b19
add doi function in DC apps
sgkang Oct 3, 2019
d0e97d4
add pymatsolver
sgkang Oct 3, 2019
794b690
add files
sgkang Oct 3, 2019
897d9db
remove aspect
sgkang Oct 3, 2019
02ec4dd
add pymatsolver
sgkang Oct 3, 2019
3b6075b
add pymkl
sgkang Oct 3, 2019
0a41e66
add pymat solver
sgkang Oct 3, 2019
5de21c5
add try and except for pardiso
sgkang Oct 3, 2019
23013c2
use dc2d-app branch
sgkang Oct 3, 2019
a4cd462
run black
sgkang Oct 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add try and except for pardiso 
not sure why pardiso does not work on travis.
  • Loading branch information
@sgkang
sgkang committed Oct 3, 2019
commit 5de21c5c8bffa5d7c7bb2faccda7aaf051e98836
5 changes: 4 additions & 1 deletion geoscilabs/inversion/DCResistivity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import numpy as np
from pymatsolver import Pardiso
try:
from pymatsolver import Pardiso as Solver
except:
from SimPEG import Solver
from SimPEG import DC, Utils, Maps
from SimPEG import (
DataMisfit, Regularization, Optimization,
Expand Down
3 changes: 1 addition & 2 deletions requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
testipynb
pytest
flake8
black
pymatsolver
black
1 change: 0 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ numpy>=1.7
scipy>=1.0
matplotlib>2.1
ipywidgets
pymatsolver
SimPEG>=0.10.4
empymod
jupyter
Expand Down