From b9e93cf82315ca497bafb480f337a81f3c54abd6 Mon Sep 17 00:00:00 2001 From: dccowan Date: Tue, 15 Aug 2023 11:48:39 -0700 Subject: [PATCH] fix errors --- _ext/__pycache__/edit_on_github.cpython-310.pyc | Bin 0 -> 1292 bytes _ext/__pycache__/purpose.cpython-310.pyc | Bin 0 -> 5833 bytes conf.py | 11 ++++++----- content/files/weight.rst | 2 +- content/programs/mviinv.rst | 2 +- content/programs/mvisen.rst | 2 -- content/programs/pfweight.rst | 6 +++--- reference.bib | 12 ++++++------ references.rst | 4 +--- 9 files changed, 18 insertions(+), 21 deletions(-) create mode 100644 _ext/__pycache__/edit_on_github.cpython-310.pyc create mode 100644 _ext/__pycache__/purpose.cpython-310.pyc diff --git a/_ext/__pycache__/edit_on_github.cpython-310.pyc b/_ext/__pycache__/edit_on_github.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..180bd4bede91f0ff5b8cfe1377fbce9b51850e37 GIT binary patch literal 1292 zcmZuw!EV$r5Vf6bk}hr4R)7#(BE)4S+C^$5Bvc_JKyW}kP)@5AQ8sor-X?KmJ1yO& zC%7VU<<{Qdm&}n9zkoO}cDe{E9C>E!jK}ldc*M#|AHj&fe50RzgudIw--E#72~70> z1Vtl6F(m~aVW-K6P>=c_(8!}b8i4j`NF&faO7_uUY5u9dU+27f7qfSoRf>x$)*?_eNMTK!Q%zjFPq8TxZu^Hvi>?}eZ?u8q;jj@ec{AC{L^({AmZCoSqwA(9hTA(2`#%5&+RHqvE{C-Pm``D<+aM^O zp%%^XjI`KkuO*ax^Z}8#H{brxb*HryGnVPI;pq`)$Dk%Mt+E`9I@S5vz&GKgi}9_8 z2|5Sk+yC%8I1sW-wFxp&9q_5S$$*SRR7nRaS)9IcWxoqE@Qjz%wX{%V55!j_uYvlx z^X$+SH zP@<6;8~Kw$OpI^Oj5e;E1jK`DG6Vq9LNd{DDl1-1mGP}*h)|AW6G~Rt@)-~KGU24* z1!WTMkQwFD5j2RTZ7>trM60x9W?8ecE>h?Qy9%M)8j4^-Dl#n@bCE}p%EfU4iHstb z99XWNov@`a>lSrl!zPz8uEVz401;syN2Cw(7FovddGZcyXBfm{So=@0?!%%*=dQV- z5FYMUJ~Z`Wg=wJ41?kEL)OXaNH*yKinxKS+V{-12+O$b+UM2-Ea}Ce?QFIkwPchxp_aM5m&AEzK@fwyfn1jHCNdkN&iL`L#nicjrx_Hj#uV}Up bq@yg_Ed^}~_Sk~&9yE%=2uEHNEwB9s=89Q> literal 0 HcmV?d00001 diff --git a/_ext/__pycache__/purpose.cpython-310.pyc b/_ext/__pycache__/purpose.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..3fe69b288dd6502e815822f4545ee415f6b076fe GIT binary patch literal 5833 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 IR|}l~0l8zbM*si- literal 0 HcmV?d00001 diff --git a/conf.py b/conf.py index f9e8b8d..7de6766 100644 --- a/conf.py +++ b/conf.py @@ -15,7 +15,6 @@ import sys import os import shlex -import shlex sys.path.append(os.path.abspath('./_ext')) @@ -37,10 +36,12 @@ 'sphinx.ext.mathjax', 'sphinxcontrib.bibtex', 'edit_on_github', - 'purpose', - 'example', + # 'purpose', + # 'example', ] +bibtex_bibfiles = ['reference.bib'] + # Number figures numfig = True @@ -68,9 +69,9 @@ # built documents. # # The short X.Y version. -version = '2.0' +version = '1.0' # The full version, including alpha/beta/rc tags. -release = '2.0' +release = '1.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/content/files/weight.rst b/content/files/weight.rst index dd2cadf..6b9667a 100644 --- a/content/files/weight.rst +++ b/content/files/weight.rst @@ -3,7 +3,7 @@ Weights file ============ -This file supplies the user-based weights that acts upon the model objective function. Each set of weights correspond to the functions (e.g., :math:`w_x`) within the :ref:`model objective function `. For ease, the weights in geographic coordinates are provided by the user. The following is the file structure is for the weights file: +This file supplies the user-based weights that acts upon the model objective function. Each set of weights correspond to the functions (e.g., :math:`w_x`) within the model objective function. For ease, the weights in geographic coordinates are provided by the user. The following is the file structure is for the weights file: .. figure:: ../../images/weightsInp.png diff --git a/content/programs/mviinv.rst b/content/programs/mviinv.rst index 62202e9..7d5d790 100644 --- a/content/programs/mviinv.rst +++ b/content/programs/mviinv.rst @@ -99,7 +99,7 @@ The parameters within the control file are: - ``remGamma``: This is a number that places (de-)emphasis on the remenant magnetization components (and extra scaling of **S,T** compents versus **P**). If ``null`` is chosen, the trade-off between induced and remanent components are 0.5. The higher the number, the stronger the inversion will try to recover an induced model. -- ``SMOOTH_MOD``: This option was not available in previous versions of the code and can be used to define the reference model in and out of the derivative terms. The options are: ``SMOOTH_MOD_DIF`` (reference model is defined in the derivative terms) and ``SMOOTH_MOD`` (reference model is defined in only the smallest term). See equation :eq:`mof` for details. +- ``SMOOTH_MOD``: This option was not available in previous versions of the code and can be used to define the reference model in and out of the derivative terms. The options are: ``SMOOTH_MOD_DIF`` (reference model is defined in the derivative terms) and ``SMOOTH_MOD`` (reference model is defined in only the smallest term). - ``w1.dat``: Name of the :ref:`weights file ` containing weighting matrices for the *P* component. If ``null`` is entered, default values of unity are used. diff --git a/content/programs/mvisen.rst b/content/programs/mvisen.rst index ef2f154..cf4affb 100644 --- a/content/programs/mvisen.rst +++ b/content/programs/mvisen.rst @@ -41,8 +41,6 @@ The input parameters for the control file are: ``itol=2``: the user defines the threshold level and ``eps`` is the threshold to be used. If ``null`` is entered on this line, a default relative reconstruction error of 0.05 (e.g. 5%) is used and the relative threshold level is calculated (i.e., ``itol=1`` , ``eps=0.05``). - **NOTE** The detailed explanation of threshold level and reconstruction error can be found in the :ref:`wavelet section ` of this manual. - Example of input file ~~~~~~~~~~~~~~~~~~~~~ diff --git a/content/programs/pfweight.rst b/content/programs/pfweight.rst index da38f25..0867fdc 100644 --- a/content/programs/pfweight.rst +++ b/content/programs/pfweight.rst @@ -38,8 +38,8 @@ The input parameters for the control file are: | =2 for distance weighting. - ``alpha``, ``znot``: Parameters defining the depth weighting function: - | When ``iwt=1``, ``alpha`` and ``znot`` are used as :math:`\alpha` and :math:`z_0` to define the :ref:`depth weighting ` - | When ``iwt=2``, ``alpha`` and ``znot`` are used as :math:`\alpha` and :math:`(R_o)` to define the :ref:`distance weighting ` + | When ``iwt=1``, ``alpha`` and ``znot`` are used as :math:`\alpha` and :math:`z_0` to define the depth weighting + | When ``iwt=2``, ``alpha`` and ``znot`` are used as :math:`\alpha` and :math:`(R_o)` to define the distance weighting | **NOTE 1**: If ``null`` is entered on this line (line 6), then the program sets ``alpha=3`` and calculates the value of :math:`z_o` based upon the mesh and data location. This is true for ``iwt=1`` or ``iwt=2`` | **NOTE 2**: For most inversions, setting this input line to ``null`` is recommended. The option for inputing :math:`\alpha` and :math:`z_o` is provided for experienced users who would like to investigate the effect of the generalized depth weighting for special purposes. The value of :math:`\alpha` should normally be close to 3.0. Smaller values of give rise to weaker weighting as distance increases from the observation locations. @@ -54,4 +54,4 @@ Example of input file Output files ------------ -The program outputs ``x_weight.txt``. A file in the format, which contains weights for each cell, based on :ref:`depth weighting ` (x = "depth") or :ref:`distance weighting ` (x = "distance"). A log file ``pfweight.log`` is also written. +The program outputs ``x_weight.txt``. A file in the format, which contains weights for each cell, based on depth weighting (x = "depth") or distance weighting (x = "distance"). A log file ``pfweight.log`` is also written. diff --git a/reference.bib b/reference.bib index 3f7d296..adbf4fb 100644 --- a/reference.bib +++ b/reference.bib @@ -422,7 +422,7 @@ @Article{DavisLi11 Author = {K Davis and Y Li}, Journal = {Geophysical Journal International}, Year = {2011}, - Pages = {157-–166}, + Pages = {157-�166}, Volume = {185} } @@ -431,7 +431,7 @@ @InProceedings{DavisLi10b Author = {K Davis and Y Li}, Booktitle = {Expanded Abstracts}, Year = {2010}, - Pages = {1172-–1177}, + Pages = {1172-�1177}, Publisher = {{80th Annual Internat. Mtg. Soc. Expl. Geophys.}}, Volume = {29} } @@ -1482,7 +1482,7 @@ @Article{PaineHaederle01 Author = {J Paine and M Haederle and M Flis}, Journal = {Exploration Geophysics}, Year = {2001}, - Pages = {238-–242}, + Pages = {238-�242}, Volume = {32}, Issue = {3 \& 4} @@ -1788,7 +1788,7 @@ @Article{SmithWessel90 } @TechReport{OGS04, - Title = {{Ontario airborne geophysical surveys, magnetic data, Central Abitibi Destor - Porcupine – Pipestone Faults Area}}, + Title = {{Ontario airborne geophysical surveys, magnetic data, Central Abitibi Destor - Porcupine � Pipestone Faults Area}}, Author = {Ontario~Geologic~Survey}, Institution = {Ontario Geological Survey}, Year = {2004}, @@ -1889,7 +1889,7 @@ @Book{Vacquier51 } @Article{vanStaal03, - Title = {{Geology and Tectonic History of the Bathurst Supergroup, Bathurst Mining Camp, and Its Relationship to Coeval Rocks in Southwestern New Brunswick and Adjacent Maine – A Synthesis}}, + Title = {{Geology and Tectonic History of the Bathurst Supergroup, Bathurst Mining Camp, and Its Relationship to Coeval Rocks in Southwestern New Brunswick and Adjacent Maine � A Synthesis}}, Author = {C R {Van Staal}}, Journal = {{Econimic Geology, Monograph 11}}, Year = {2003}, @@ -2059,7 +2059,7 @@ @Article{Zhdanov04 Author = {M. S. Zhdanov and R. G. Ellis and S. Mukherjee}, Journal = {Geophysics}, Year = {2004}, - Pages = {925–937}, + Pages = {925--937}, Volume = {69}, Owner = {kdavis}, diff --git a/references.rst b/references.rst index df0a20a..2308f2c 100644 --- a/references.rst +++ b/references.rst @@ -4,6 +4,4 @@ References ========== .. bibliography:: reference.bib - :cited: - :style: alpha - :encoding: latex+latin + :all: