0.2.3

AB-Ares · AB-Ares · commit 260d58c24c92 · 2021-07-06T15:19:17.000+02:00
Minimal update to fasten South polar cap example
diff --git a/README.md b/README.md
@@ -73,4 +73,4 @@ Alternatively, you can install Displacement-strain-planet via pip
 
 ## Cite
 You can cite the latest release of the package as:
-Adrien Broquet. (2021, June 15). AB-Ares/Displacement_strain_planet: 0.2.2 (Version 0.2.2). Zenodo. http://doi.org/10.5281/zenodo.4955926
+Adrien Broquet. (2021, June 15). AB-Ares/Displacement_strain_planet: 0.2.3 (Version 0.2.3). Zenodo. http://doi.org/10.5281/zenodo.4916799
diff --git a/docs/_build/doctrees/environment.pickle b/docs/_build/doctrees/environment.pickle
diff --git a/docs/_build/doctrees/index.doctree b/docs/_build/doctrees/index.doctree
diff --git a/docs/_build/doctrees/installation.doctree b/docs/_build/doctrees/installation.doctree
diff --git a/docs/_build/doctrees/references.doctree b/docs/_build/doctrees/references.doctree
diff --git a/docs/_build/html/examples.html b/docs/_build/html/examples.html
@@ -69,7 +69,7 @@
             
             
               <div class="version">
-                0.2.2
+                0.2.3
               </div>
             
           
diff --git a/docs/_build/html/genindex.html b/docs/_build/html/genindex.html
@@ -67,7 +67,7 @@
             
             
               <div class="version">
-                0.2.2
+                0.2.3
               </div>
             
           
diff --git a/docs/_build/html/index.html b/docs/_build/html/index.html
@@ -68,7 +68,7 @@
             
             
               <div class="version">
-                0.2.2
+                0.2.3
               </div>
             
           
diff --git a/docs/_build/html/installation.html b/docs/_build/html/installation.html
@@ -4,8 +4,7 @@
 <html class="writer-html5" lang="en" >
 <head>
   <meta charset="utf-8" />
-  <meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
-
+  
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   
   <title>Installation &mdash; Displacement_strain_planet</title>
@@ -70,7 +69,7 @@
             
             
               <div class="version">
-                0.2.2
+                0.2.3
               </div>
             
           
@@ -169,7 +168,7 @@
           <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
            <div itemprop="articleBody">
             
-  <section id="installation">
+  <div class="section" id="installation">
 <h1>Installation<a class="headerlink" href="#installation" title="Permalink to this headline">¶</a></h1>
 <p>The Displacement_strain_planet package requires <a class="reference external" href="https://github.com/SHTOOLS/SHTOOLS/">pyshtools</a> (&gt;=4.7.1). This package can be installed using either <cite>conda</cite> or <cite>pip</cite></p>
 <div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">conda</span> <span class="n">install</span> <span class="o">-</span><span class="n">c</span> <span class="n">conda</span><span class="o">-</span><span class="n">forge</span> <span class="n">pyshtools</span>  <span class="c1"># Linux and macOS only</span>
@@ -216,7 +215,7 @@ <h1>Installation<a class="headerlink" href="#installation" title="Permalink to t
 explicitly <code class="docutils literal notranslate"><span class="pre">python3</span></code> and <code class="docutils literal notranslate"><span class="pre">pip3</span></code> instead of <code class="docutils literal notranslate"><span class="pre">python</span></code> and <code class="docutils literal notranslate"><span class="pre">pip</span></code> in
 the above commands.</p>
 </div>
-</section>
+</div>
 
 
            </div>
diff --git a/docs/_build/html/objects.inv b/docs/_build/html/objects.inv
diff --git a/docs/_build/html/py-modindex.html b/docs/_build/html/py-modindex.html
@@ -70,7 +70,7 @@
             
             
               <div class="version">
-                0.2.2
+                0.2.3
               </div>
             
           
diff --git a/docs/_build/html/references.html b/docs/_build/html/references.html
@@ -4,8 +4,7 @@
 <html class="writer-html5" lang="en" >
 <head>
   <meta charset="utf-8" />
-  <meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
-
+  
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   
   <title>References &mdash; Displacement_strain_planet</title>
@@ -70,7 +69,7 @@
             
             
               <div class="version">
-                0.2.2
+                0.2.3
               </div>
             
           
@@ -169,7 +168,7 @@
           <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
            <div itemprop="articleBody">
             
-  <section id="references">
+  <div class="section" id="references">
 <h1>References<a class="headerlink" href="#references" title="Permalink to this headline">¶</a></h1>
 <p>Banerdt, W. B. (1986). Support of Long-Wavelength Loads on Venus and Implications for Internal Structure. <em>Journal of Geophysical Research: Planets</em>, 91.B1, pp. 403–419,
 doi:<a class="reference external" href="https://agupubs.onlinelibrary.wiley.com/doi/10.1029/JB091iB01p00403">10.1029/JB091iB01p00403</a>.</p>
@@ -183,7 +182,7 @@ <h1>References<a class="headerlink" href="#references" title="Permalink to this
 doi:<a class="reference external" href="https://science.sciencemag.org/content/339/6120/671">10.1126/science.1231530</a>.</p>
 <p>Wieczorek, M. A. and M. Meschede (2018). SHTools : Tools for working with spherical harmonics. <em>Geochemistry, Geophysics, Geosystems</em>.
 doi:<a class="reference external" href="https://agupubs.onlinelibrary.wiley.com/doi/full/10.1029/2018GC007529">10.1029/2018GC007529</a>.</p>
-</section>
+</div>
 
 
            </div>
diff --git a/docs/_build/html/search.html b/docs/_build/html/search.html
@@ -70,7 +70,7 @@
             
             
               <div class="version">
-                0.2.2
+                0.2.3
               </div>
             
           
diff --git a/docs/_build/html/source/Displacement_strain_planet.B1986_nmax.html b/docs/_build/html/source/Displacement_strain_planet.B1986_nmax.html
@@ -69,7 +69,7 @@
             
             
               <div class="version">
-                0.2.2
+                0.2.3
               </div>
             
           
diff --git a/docs/_build/html/source/Displacement_strain_planet.Displacement_strain.html b/docs/_build/html/source/Displacement_strain_planet.Displacement_strain.html
@@ -68,7 +68,7 @@
             
             
               <div class="version">
-                0.2.2
+                0.2.3
               </div>
             
           
diff --git a/docs/_build/html/source/Displacement_strain_planet.html b/docs/_build/html/source/Displacement_strain_planet.html
@@ -69,7 +69,7 @@
             
             
               <div class="version">
-                0.2.2
+                0.2.3
               </div>
             
           
diff --git a/docs/conf.py b/docs/conf.py
@@ -5,7 +5,7 @@
 year = datetime.date.today().year
 project = "Displacement_strain_planet"
 author = "Adrien Broquet"
-version = "0.2.2"
+version = "0.2.3"
 
 
 # General configuration
diff --git a/examples/Mars_SouthPolarCap_displacement.py b/examples/Mars_SouthPolarCap_displacement.py
@@ -2,7 +2,7 @@
 import matplotlib.pyplot as plt
 import pyshtools as pysh
 from cmcrameri import cm
-from Displacement_strain_planet import Thin_shell_matrix_nmax
+from Displacement_strain_planet import Thin_shell_matrix_nmax, Thin_shell_matrix
 
 #################################################################
 # In this example, we solve for the displacement of the surface at
@@ -38,6 +38,7 @@
 mass = gm / G  # Mass of the planet
 g0 = gm / R ** 2  # Mean gravitational
 # attraction of the planet
+rhobar = mass * 3.0 / 4.0 / np.pi / R ** 3
 
 # Parameters
 c = 60e3  # Mean Crustal thickness
@@ -54,6 +55,7 @@
 print("Polar cap density is %.2f kg m-3" % (rhol))
 
 args_param_m = (g0, R, c, Te, rhom, rhoc, rhol, lmax, E, v, mass)
+args_param_m2 = (g0, R, c, Te, rhom, rhoc, rhol, rhobar, lmax, E, v)
 args_expand = dict(lmax=5 * lmax, lmax_calc=lmax)
 args_fig = dict(figsize=(12, 10), dpi=100)
 args_plot = dict(tick_interval=[45, 30], colorbar="bottom", cmap=cm.roma_r)
@@ -68,27 +70,28 @@
 while residuals > 5:
     iter += 1
     if iter == 1:
-        w_deflec = Thin_shell_matrix_nmax(
+        (w_deflec, sols,) = Thin_shell_matrix_nmax(
             *args_param_m,
             dc_lm=zeros.copy(),
             drhom_lm=zeros.copy(),
             H_lm=topo.copy(),
             nmax=1
-        )[0]
+        )[
+            ::10
+        ]  # get first and last arrays
         min1 = R - np.min(
             pysh.SHCoeffs.from_array(w_deflec).expand(lmax_calc=lmax).data
         )
     else:
-        w_deflec = Thin_shell_matrix_nmax(
-            *args_param_m,
+        w_deflec = Thin_shell_matrix(
+            *args_param_m2,
+            first_inv=False,
+            lambdify_func=sols,
             dc_lm=zeros.copy(),
             drhom_lm=zeros.copy(),
-            H_lm=(topo - w_deflec).copy(),
-            nmax=1
+            H_lm=(topo - w_deflec).copy()
         )[0]
-        min2 = R - np.min(
-            pysh.SHCoeffs.from_array(w_deflec).expand(lmax_calc=lmax).data
-        )
+        min2 = -np.min(pysh.SHCoeffs.from_array(w_deflec).expand(lmax_calc=lmax).data)
         residuals = np.abs(min1 - min2)
         print(
             "Iteration %s, maximum flexure %.3f km, residuals %.3f km"
diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
 
 setup(
     name="Displacement_strain_planet",
-    version="0.2.2",
+    version="0.2.3",
     description="Planetary crustal thickness, displacement, "
     + "stress and strain calculations in spherical harmonics.",
     long_description=long_description,

-Original file line number
+Diff line change
               <div class="version">
 -                0.2.2
 +                0.2.3
               </div>