Skip to content

Commit ea5c18a

Browse files
committed
[GEOPY-2029] Merge remote-tracking branch 'upstream/develop' into GEOPY-2029-fixup
# Conflicts: # environments/py-3.10-linux-64-dev.conda.lock.yml # environments/py-3.10-linux-64.conda.lock.yml # environments/py-3.10-win-64-dev.conda.lock.yml # environments/py-3.10-win-64.conda.lock.yml # environments/py-3.11-linux-64-dev.conda.lock.yml # environments/py-3.11-linux-64.conda.lock.yml # environments/py-3.11-win-64-dev.conda.lock.yml # environments/py-3.11-win-64.conda.lock.yml # environments/py-3.12-linux-64-dev.conda.lock.yml # environments/py-3.12-linux-64.conda.lock.yml # environments/py-3.12-win-64-dev.conda.lock.yml # environments/py-3.12-win-64.conda.lock.yml # py-3.10.conda-lock.yml # py-3.11.conda-lock.yml # py-3.12.conda-lock.yml
2 parents 4b488cc + 7771a2b commit ea5c18a

48 files changed

Lines changed: 412 additions & 153 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

docs/_toc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ chapters:
1111
- file: inversion/regularization
1212
- file: inversion/mesh_design
1313
- file: inversion/joint_inversion
14+
- file: inversion/depth_of_investigation
1415
- file: case_study/introduction
1516
sections:
1617
- file: case_study/background

docs/case_study/airborne_tem.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# extension: .py
66
# format_name: light
77
# format_version: '1.5'
8-
# jupytext_version: 1.16.2
8+
# jupytext_version: 1.16.7
99
# kernelspec:
1010
# display_name: Python 3 (ipykernel)
1111
# language: python

docs/case_study/background.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# extension: .py
66
# format_name: light
77
# format_version: '1.5'
8-
# jupytext_version: 1.16.2
8+
# jupytext_version: 1.16.7
99
# kernelspec:
1010
# display_name: Python 3 (ipykernel)
1111
# language: python

docs/case_study/dc_resistivity.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# extension: .py
66
# format_name: light
77
# format_version: '1.5'
8-
# jupytext_version: 1.16.2
8+
# jupytext_version: 1.16.7
99
# kernelspec:
1010
# display_name: Python 3 (ipykernel)
1111
# language: python

docs/case_study/gravity.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# extension: .py
66
# format_name: light
77
# format_version: '1.5'
8-
# jupytext_version: 1.16.2
8+
# jupytext_version: 1.16.7
99
# kernelspec:
1010
# display_name: Python 3 (ipykernel)
1111
# language: python

docs/case_study/introduction.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# extension: .py
66
# format_name: light
77
# format_version: '1.5'
8-
# jupytext_version: 1.16.2
8+
# jupytext_version: 1.16.7
99
# kernelspec:
1010
# display_name: Python 3 (ipykernel)
1111
# language: python

docs/case_study/joint_inversion.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# extension: .py
66
# format_name: light
77
# format_version: '1.5'
8-
# jupytext_version: 1.16.2
8+
# jupytext_version: 1.16.7
99
# kernelspec:
1010
# display_name: Python 3 (ipykernel)
1111
# language: python

docs/case_study/magnetic.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# extension: .py
66
# format_name: light
77
# format_version: '1.5'
8-
# jupytext_version: 1.16.2
8+
# jupytext_version: 1.16.7
99
# kernelspec:
1010
# display_name: Python 3 (ipykernel)
1111
# language: python

docs/case_study/tipper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# extension: .py
66
# format_name: light
77
# format_version: '1.5'
8-
# jupytext_version: 1.16.2
8+
# jupytext_version: 1.16.7
99
# kernelspec:
1010
# display_name: Python 3 (ipykernel)
1111
# language: python

docs/inversion/data_misfit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# extension: .py
66
# format_name: light
77
# format_version: '1.5'
8-
# jupytext_version: 1.16.2
8+
# jupytext_version: 1.16.7
99
# kernelspec:
1010
# display_name: Python 3 (ipykernel)
1111
# language: python

0 commit comments

Comments
 (0)