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

GEOPY-787 #586

Merged
merged 43 commits into from
Jul 14, 2023
Merged

GEOPY-787 #586

merged 43 commits into from
Jul 14, 2023

Conversation

domfournier
Copy link
Contributor

@domfournier domfournier commented Jul 13, 2023 •
edited by github-actions bot
Loading

GEOPY-787 - Base joint inversion driver (cross-gradient regularization)

domfournier and others added 30 commits June 22, 2023 13:56
@domfournier
Start adding unittest
4e59fce
@domfournier
Merge branch 'GEOPY-757' into GEOPY-787
1b66c28
@domfournier
Create sub-modules for joint cross gradient
93d8b34
@domfournier
Merge branch 'develop' into GEOPY-787
52edd94
@domfournier
First full run
5632f63
@domfournier
Change class attritube physical property for setter
3b4fee1
@domfournier
Create base joint class
52dd32f
@domfournier
Add cross gradient to write out of uijson
d6e448d
@domfournier
move initialize to base class
b63a7a4
@domfournier
Re-center global mesh. Use new n_active property
f7c4b85
@domfournier
Fix mesh origin shift to 3 octree level
23b591c
@domfournier
Add setter
aa7df88
@domfournier
Fix issue with transfer of groups under the joint. Update joint surve…
bdd8d8a 
…y test
@domfournier
Remove tile spatial from constants
96e61b2
@domfournier
First full run of cross scalar mag and density
4c7b30e
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
9ca26b7 
for more information, see https://pre-commit.ci
@domfournier
Move collocation of meshes to utils. Assert same dimension and origin
2d9dfa2
@domfournier
FIx save method for mvi
dfe8a78
@domfournier
Fix multipilers for joint survey
3e15a63
@domfournier
Fix gravity test
4fe5a92
@domfournier
Add scaling of tiles and joint misfits based on cell count
47baeb5
@domfournier
Change position of the block for coarser joint survey
8096512
@domfournier
Better handle of directives
79d25db
@domfournier
Adjust cross-gradient driver for directive change
c2e87eb
@domfournier
Updates some tests
3a1fa7a
@domfournier
Use driver's regularization for joint cross grad
020fc33
@domfournier
Re-use mapping from driver for regularizers
819c88b
@domfournier
Update lock files for simpeg-0.19.-dev2
bb22ba5
@domfournier
Fix for tiling. Add scales for all cross gradient terms
bdb9bae
@domfournier
Update cross-gradient test
fe89110
@domfournier
nicer handle of list
1700642
@domfournier
Merge branch 'develop' into GEOPY-787
442ca2f 
# Conflicts:
#	conda-py-3.10-lock.yml
#	conda-py-3.9-lock.yml
#	environments/conda-py-3.10-linux-64-dev.lock.yml
#	environments/conda-py-3.10-linux-64.lock.yml
#	environments/conda-py-3.10-osx-64-dev.lock.yml
#	environments/conda-py-3.10-osx-64.lock.yml
#	environments/conda-py-3.10-win-64-dev.lock.yml
#	environments/conda-py-3.10-win-64.lock.yml
#	environments/conda-py-3.9-linux-64-dev.lock.yml
#	environments/conda-py-3.9-linux-64.lock.yml
#	environments/conda-py-3.9-osx-64-dev.lock.yml
#	environments/conda-py-3.9-osx-64.lock.yml
#	environments/conda-py-3.9-win-64-dev.lock.yml
#	environments/conda-py-3.9-win-64.lock.yml
@domfournier
Fix issue with apparent resisivity formed in save
816d515
@domfournier
Fix some run tests
237a242
@domfournier
Fix issue with alpha_s
3fd9b29
benk-mira
benk-mira requested changes Jul 13, 2023
View reviewed changes
Copy link
Contributor

@benk-mira benk-mira left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mostly just cleanups. Well done man!

geoapps/inversion/driver.py Outdated Show resolved Hide resolved
geoapps/inversion/joint/joint_cross_gradient/driver.py Outdated Show resolved Hide resolved
geoapps/inversion/joint/joint_cross_gradient/driver.py Outdated Show resolved Hide resolved
geoapps/inversion/joint/joint_cross_gradient/driver.py Show resolved Hide resolved
geoapps/inversion/joint/joint_cross_gradient/driver.py Outdated Show resolved Hide resolved
geoapps/inversion/joint/joint_cross_gradient/params.py Outdated Show resolved Hide resolved
geoapps/inversion/joint/joint_cross_gradient/params.py Outdated Show resolved Hide resolved
geoapps/inversion/driver.py Outdated Show resolved Hide resolved
benk-mira
benk-mira approved these changes Jul 14, 2023
View reviewed changes
Copy link
Contributor

@benk-mira benk-mira left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Love it!

@domfournier domfournier merged commit be38ec7 into develop Jul 14, 2023
@domfournier domfournier deleted the GEOPY-787 branch July 14, 2023 19:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@benk-mira benk-mira benk-mira approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@domfournier @benk-mira