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

Development_Miguel #6

Closed
wants to merge 55 commits into from
Closed

Development_Miguel #6

wants to merge 55 commits into from

Conversation

Leguark
Copy link
Member

@Leguark Leguark commented Jun 16, 2017

Try 6

Leguark and others added 30 commits March 31, 2017 10:21
@Leguark
Fixing some documentation Problems
0b69c5d
@Leguark
Update index.rst
cb64adf
@Leguark
Documentation update: Tutorial
de87d9c
@Leguark
Documentation update: Tutorial2
228e6db
@Leguark
Documentation update: Tutorial3
f39f0f4
@Leguark
Update tutorial.rst
5431cdc
@Leguark
3D dinamic model
999b0c8
@Leguark
Documentation update: Tutorial3
f275623
@Leguark
Documentation update: Tutorial3
02b7d7f
@Leguark
a battle not worth it fight
d90400f
@Leguark
Fabian example
2f210d6
@Leguark
Modify the thingy with the centers in pandas
9ce1260
@Leguark
Modify the thingy with the centers in pandas
3ee2039
@Leguark
changing stuff in coKriging
e568299
@Leguark
addint the option of getting the potential fields
d6e912d
@Leguark
comparing sandstone GeMpy vs Sandstone
0f075a5
@Leguark
vtk experimentation
b1fc744
@Leguark
tests a,b,c
ef1ae9c
@Leguark
learnt how to update all variables and constants without compiling
51944b9
@Leguark
solved faults bug
50ae2a1
@Leguark
faults problem solved
dcd6a92
@Leguark
fix bug
09de278
fix bug
9310312
DataManagement methods for adding, modifying and dropping interfaces …
88f09d7 
…and foliations from dataframes
vtkEditor notebook for basic 3d model visualization and interface poi…
1d2aaa4 
…nts modification
@Leguark
new test, addition of read vox and get formation numbers
fbf8f36
@Leguark
Merge remote-tracking branch 'origin/Development_Miguel' into Develop…
5d89087 
…ment_Miguel

# Conflicts:
#	.idea/workspace.xml
#	GeMpy/DataManagement.py
#	Prototype Notebook/Visualization.ipynb
@Leguark
fixed bug with first tests
f860934
implemented visualization with vtk
d163863
fixed minor bug in df modification
cd95d79
Leguark and others added 25 commits May 26, 2017 16:22
@Leguark
Faults Network!
6896b97
@Leguark
commiting test
8473a32 
Signed-off-by: Miguel de la Varga <varga@aices.rwth-aachen.de>
@Leguark
Merge branch 'Development_Alex' of https://github.com/nre-aachen/GeMpy …
c6c3de7 
…into Development_Miguel

# Conflicts:
#	.idea/workspace.xml
@Leguark
restructure
f1f967d
@Leguark
first tutorialand front
227f1b2
@Leguark
visualization vtk changes
2ea1ad0
vtk vis: made creation and assignment more flexible
40f6c33
vtk vis: made creation and assignment more flexible
c837336
@Leguark
first tutorial
3c8eeb7
VTK Visualization
6b9bc1b 
 - "5" now toggles between Actor and Camera interactor
VTK Visualization
7d608d5 
 - "5" now toggles between Actor and Camera interactor
 - fixed tiny bug of inactive Observer
@Leguark
Restructure of interpolator class
5629491
VTK Visualization
3491217 
 - basic interface plane visualization implemented
@Leguark
input data of tests
35241b8
@Leguark
whatever
c561ee5
@Leguark
Remove .idea from repo
f1246fa
@Leguark
Merge remote-tracking branch 'remotes/origin/Development_Alex' into D…
5fedc06 
…evelopment_Miguel

Conflicts:
	.idea/GeMpy.iml
	.idea/misc.xml
	.idea/workspace.xml
	Prototype Notebook/FabianThesis.ipynb
@Leguark
Merge remote-tracking branch 'remotes/origin/Development_Alex' into D…
c98d50a 
…evelopment_Miguel

a bit more towards the gravity
@Leguark
physics and fabianLess input data
85e56d1
@Leguark
fabianLess input data
ce4e7e9
@Leguark
gravity optimized ch2 of tutorial
634ed0f
@Leguark
More tutorial work
e42b164
@Leguark
add input data
f4ba07c
@Leguark
trying to merge
57b7459
@Leguark
Remove .idea from repo
64e0d4b
@Leguark Leguark closed this Jun 16, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@Leguark