From af46b3c017f3e25a55acda9abdd7da92cebf284d Mon Sep 17 00:00:00 2001 From: Logan Bishop-Van Horn Date: Tue, 3 Oct 2023 07:51:24 -0700 Subject: [PATCH] Typo in solver (#43) * Update solver.py, fix typo --- docs/notebooks/logo.ipynb | 6 +++--- docs/notebooks/mesh.ipynb | 2 +- docs/notebooks/polygons.ipynb | 8 ++++---- docs/notebooks/py-mesh.ipynb | 4 ++-- docs/notebooks/quickstart.ipynb | 12 ++++++------ docs/notebooks/screening.ipynb | 8 ++++---- tdgl/solver/solver.py | 4 ++-- tdgl/version.py | 2 +- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/notebooks/logo.ipynb b/docs/notebooks/logo.ipynb index 180de5c..9784bc5 100644 --- a/docs/notebooks/logo.ipynb +++ b/docs/notebooks/logo.ipynb @@ -233,7 +233,7 @@ "name": "stderr", "output_type": "stream", "text": [ - "Constructing Voronoi polygons: 100%|██████████████████████████████████████████████████████████████████████████| 4347/4347 [00:00<00:00, 22681.73it/s]\n" + "Constructing Voronoi polygons: 100%|██████████████████████████████████████████████████████████████████████████| 4347/4347 [00:00<00:00, 21773.64it/s]\n" ] }, { @@ -276,7 +276,7 @@ "name": "stderr", "output_type": "stream", "text": [ - "Simulating: 100%|███████████████████████████████████████████████████████████████████████████████████████████████▉| 800/800 [01:55<00:00, 6.90tau/s ]\n" + "Simulating: 100%|███████████████████████████████████████████████████████████████████████████████████████████████▉| 800/800 [01:58<00:00, 6.75tau/s ]\n" ] } ], @@ -9471,7 +9471,7 @@ { "data": { "text/html": [ - "
SoftwareVersion
tdgl0.6.0; git revision e6d3811 [2023-09-27]
Numpy1.24.3
SciPy1.10.1
matplotlib3.7.1
cupyNone
numba0.57.1
IPython8.14.0
Python3.10.11 | packaged by conda-forge | (main, May 10 2023, 19:01:19) [Clang 14.0.6 ]
OSposix [darwin]
Number of CPUsPhysical: 10, Logical: 10
BLAS InfoOPENBLAS
Wed Sep 27 14:58:29 2023 PDT
" + "
SoftwareVersion
tdgl0.6.1; git revision 9572d48 [2023-10-02]
Numpy1.24.3
SciPy1.10.1
matplotlib3.7.1
cupyNone
numba0.57.1
IPython8.14.0
Python3.10.11 | packaged by conda-forge | (main, May 10 2023, 19:01:19) [Clang 14.0.6 ]
OSposix [darwin]
Number of CPUsPhysical: 10, Logical: 10
BLAS InfoOPENBLAS
Mon Oct 02 16:52:12 2023 PDT
" ], "text/plain": [ "" diff --git a/docs/notebooks/mesh.ipynb b/docs/notebooks/mesh.ipynb index 1f2fba7..27722d5 100644 --- a/docs/notebooks/mesh.ipynb +++ b/docs/notebooks/mesh.ipynb @@ -29,7 +29,7 @@ "name": "stderr", "output_type": "stream", "text": [ - "Constructing Voronoi polygons: 100%|████████████████████████████████████████████████████████████████████████████| 525/525 [00:00<00:00, 21170.12it/s]\n" + "Constructing Voronoi polygons: 100%|████████████████████████████████████████████████████████████████████████████| 525/525 [00:00<00:00, 21066.62it/s]\n" ] } ], diff --git a/docs/notebooks/polygons.ipynb b/docs/notebooks/polygons.ipynb index 015e50f..cf2acb8 100644 --- a/docs/notebooks/polygons.ipynb +++ b/docs/notebooks/polygons.ipynb @@ -469,9 +469,9 @@ "name": "stderr", "output_type": "stream", "text": [ - "Constructing Voronoi polygons: 100%|████████████████████████████████████████████████████████████████████████████| 459/459 [00:00<00:00, 16417.53it/s]\n", - "Constructing Voronoi polygons: 100%|████████████████████████████████████████████████████████████████████████████| 459/459 [00:00<00:00, 17100.75it/s]\n", - "Constructing Voronoi polygons: 100%|████████████████████████████████████████████████████████████████████████████| 459/459 [00:00<00:00, 17710.51it/s]\n" + "Constructing Voronoi polygons: 100%|████████████████████████████████████████████████████████████████████████████| 459/459 [00:00<00:00, 16324.68it/s]\n", + "Constructing Voronoi polygons: 100%|████████████████████████████████████████████████████████████████████████████| 459/459 [00:00<00:00, 17198.83it/s]\n", + "Constructing Voronoi polygons: 100%|████████████████████████████████████████████████████████████████████████████| 459/459 [00:00<00:00, 16808.86it/s]\n" ] }, { @@ -520,7 +520,7 @@ { "data": { "text/html": [ - "
SoftwareVersion
tdgl0.6.0; git revision e6d3811 [2023-09-27]
Numpy1.24.3
SciPy1.10.1
matplotlib3.7.1
cupyNone
numba0.57.1
IPython8.14.0
Python3.10.11 | packaged by conda-forge | (main, May 10 2023, 19:01:19) [Clang 14.0.6 ]
OSposix [darwin]
Number of CPUsPhysical: 10, Logical: 10
BLAS InfoOPENBLAS
Wed Sep 27 14:54:08 2023 PDT
" + "
SoftwareVersion
tdgl0.6.1; git revision 9572d48 [2023-10-02]
Numpy1.24.3
SciPy1.10.1
matplotlib3.7.1
cupyNone
numba0.57.1
IPython8.14.0
Python3.10.11 | packaged by conda-forge | (main, May 10 2023, 19:01:19) [Clang 14.0.6 ]
OSposix [darwin]
Number of CPUsPhysical: 10, Logical: 10
BLAS InfoOPENBLAS
Mon Oct 02 16:47:42 2023 PDT
" ], "text/plain": [ "" diff --git a/docs/notebooks/py-mesh.ipynb b/docs/notebooks/py-mesh.ipynb index 9190b89..4e01796 100644 --- a/docs/notebooks/py-mesh.ipynb +++ b/docs/notebooks/py-mesh.ipynb @@ -184,7 +184,7 @@ "name": "stderr", "output_type": "stream", "text": [ - "Constructing Voronoi polygons: 100%|██████████████████████████████████████████████████████████████████████████| 4190/4190 [00:00<00:00, 22042.31it/s]\n" + "Constructing Voronoi polygons: 100%|██████████████████████████████████████████████████████████████████████████| 4190/4190 [00:00<00:00, 22005.96it/s]\n" ] }, { @@ -361,7 +361,7 @@ { "data": { "text/html": [ - "
SoftwareVersion
tdgl0.6.0; git revision e6d3811 [2023-09-27]
Numpy1.24.3
SciPy1.10.1
matplotlib3.7.1
cupyNone
numba0.57.1
IPython8.14.0
Python3.10.11 | packaged by conda-forge | (main, May 10 2023, 19:01:19) [Clang 14.0.6 ]
OSposix [darwin]
Number of CPUsPhysical: 10, Logical: 10
BLAS InfoOPENBLAS
Wed Sep 27 14:53:58 2023 PDT
" + "
SoftwareVersion
tdgl0.6.1; git revision 9572d48 [2023-10-02]
Numpy1.24.3
SciPy1.10.1
matplotlib3.7.1
cupyNone
numba0.57.1
IPython8.14.0
Python3.10.11 | packaged by conda-forge | (main, May 10 2023, 19:01:19) [Clang 14.0.6 ]
OSposix [darwin]
Number of CPUsPhysical: 10, Logical: 10
BLAS InfoOPENBLAS
Mon Oct 02 16:47:33 2023 PDT
" ], "text/plain": [ "" diff --git a/docs/notebooks/quickstart.ipynb b/docs/notebooks/quickstart.ipynb index fdb87bd..24eefc1 100644 --- a/docs/notebooks/quickstart.ipynb +++ b/docs/notebooks/quickstart.ipynb @@ -277,7 +277,7 @@ "name": "stderr", "output_type": "stream", "text": [ - "Constructing Voronoi polygons: 100%|██████████████████████████████████████████████████████████████████████████| 4633/4633 [00:00<00:00, 21408.45it/s]\n" + "Constructing Voronoi polygons: 100%|██████████████████████████████████████████████████████████████████████████| 4633/4633 [00:00<00:00, 21986.42it/s]\n" ] } ], @@ -368,8 +368,8 @@ "name": "stderr", "output_type": "stream", "text": [ - "Thermalizing: 100%|█████████████████████████████████████████████████████████████████████████████████████████████▉| 100/100 [00:09<00:00, 10.37tau/s ]\n", - "Simulating: 100%|███████████████████████████████████████████████████████████████████████████████████████████████▉| 150/150 [00:26<00:00, 5.70tau/s ]\n" + "Thermalizing: 100%|█████████████████████████████████████████████████████████████████████████████████████████████▉| 100/100 [00:09<00:00, 10.57tau/s ]\n", + "Simulating: 100%|███████████████████████████████████████████████████████████████████████████████████████████████▉| 150/150 [00:24<00:00, 6.06tau/s ]\n" ] } ], @@ -7478,7 +7478,7 @@ "name": "stderr", "output_type": "stream", "text": [ - "Simulating: 100%|███████████████████████████████████████████████████████████████████████████████████████████████▉| 200/200 [00:50<00:00, 3.94tau/s ]\n" + "Simulating: 100%|███████████████████████████████████████████████████████████████████████████████████████████████▉| 200/200 [00:47<00:00, 4.18tau/s ]\n" ] } ], @@ -12256,7 +12256,7 @@ "name": "stderr", "output_type": "stream", "text": [ - "Simulating: 100%|███████████████████████████████████████████████████████████████████████████████████████████████▉| 200/200 [00:39<00:00, 5.01tau/s ]\n" + "Simulating: 100%|███████████████████████████████████████████████████████████████████████████████████████████████▉| 200/200 [00:42<00:00, 4.67tau/s ]\n" ] } ], @@ -25570,7 +25570,7 @@ { "data": { "text/html": [ - "
SoftwareVersion
tdgl0.6.0; git revision e6d3811 [2023-09-27]
Numpy1.24.3
SciPy1.10.1
matplotlib3.7.1
cupyNone
numba0.57.1
IPython8.14.0
Python3.10.11 | packaged by conda-forge | (main, May 10 2023, 19:01:19) [Clang 14.0.6 ]
OSposix [darwin]
Number of CPUsPhysical: 10, Logical: 10
BLAS InfoOPENBLAS
Wed Sep 27 15:04:27 2023 PDT
" + "
SoftwareVersion
tdgl0.6.1; git revision 9572d48 [2023-10-02]
Numpy1.24.3
SciPy1.10.1
matplotlib3.7.1
cupyNone
numba0.57.1
IPython8.14.0
Python3.10.11 | packaged by conda-forge | (main, May 10 2023, 19:01:19) [Clang 14.0.6 ]
OSposix [darwin]
Number of CPUsPhysical: 10, Logical: 10
BLAS InfoOPENBLAS
Mon Oct 02 16:53:47 2023 PDT
" ], "text/plain": [ "" diff --git a/docs/notebooks/screening.ipynb b/docs/notebooks/screening.ipynb index ecc287b..ff1272e 100644 --- a/docs/notebooks/screening.ipynb +++ b/docs/notebooks/screening.ipynb @@ -141,7 +141,7 @@ "name": "stderr", "output_type": "stream", "text": [ - "Constructing Voronoi polygons: 100%|██████████████████████████████████████████████████████████████████████████| 2862/2862 [00:00<00:00, 23193.77it/s]\n" + "Constructing Voronoi polygons: 100%|██████████████████████████████████████████████████████████████████████████| 2862/2862 [00:00<00:00, 22186.22it/s]\n" ] } ], @@ -227,7 +227,7 @@ "name": "stderr", "output_type": "stream", "text": [ - "Simulating: 100%|███████████████████████████████████████████████████████████████████████████████████████████████████▊| 5/5 [00:00<00:00, 11.04tau/s ]\n" + "Simulating: 100%|███████████████████████████████████████████████████████████████████████████████████████████████████▊| 5/5 [00:00<00:00, 10.21tau/s ]\n" ] } ], @@ -334,7 +334,7 @@ "name": "stderr", "output_type": "stream", "text": [ - "Simulating: 100%|███████████████████████████████████████████████████████████████████████████████████████████████████▉| 5/5 [00:55<00:00, 11.18s/tau ]\n" + "Simulating: 100%|███████████████████████████████████████████████████████████████████████████████████████████████████▉| 5/5 [00:59<00:00, 11.85s/tau ]\n" ] } ], @@ -420,7 +420,7 @@ { "data": { "text/html": [ - "
SoftwareVersion
tdgl0.6.0; git revision e6d3811 [2023-09-27]
Numpy1.24.3
SciPy1.10.1
matplotlib3.7.1
cupyNone
numba0.57.1
IPython8.14.0
Python3.10.11 | packaged by conda-forge | (main, May 10 2023, 19:01:19) [Clang 14.0.6 ]
OSposix [darwin]
Number of CPUsPhysical: 10, Logical: 10
BLAS InfoOPENBLAS
Wed Sep 27 14:53:18 2023 PDT
" + "
SoftwareVersion
tdgl0.6.1; git revision 9572d48 [2023-10-02]
Numpy1.24.3
SciPy1.10.1
matplotlib3.7.1
cupyNone
numba0.57.1
IPython8.14.0
Python3.10.11 | packaged by conda-forge | (main, May 10 2023, 19:01:19) [Clang 14.0.6 ]
OSposix [darwin]
Number of CPUsPhysical: 10, Logical: 10
BLAS InfoOPENBLAS
Mon Oct 02 16:56:13 2023 PDT
" ], "text/plain": [ "" diff --git a/tdgl/solver/solver.py b/tdgl/solver/solver.py index 583fc35..165e099 100644 --- a/tdgl/solver/solver.py +++ b/tdgl/solver/solver.py @@ -459,7 +459,7 @@ def solve_for_observables( mu = operators.mu_laplacian_lu(rhs) if use_cupy and not use_cupy_solver: mu = cupy.asarray(mu) - normal_current = -(operators.mu_gradient @ mu) - 0 * dA_dt + normal_current = -(operators.mu_gradient @ mu) - dA_dt return mu, supercurrent, normal_current def get_induced_vector_potential( @@ -572,7 +572,7 @@ def update( (current_A_applied - prev_A_applied) / dt, self.normalized_directions, ) - if not options.include_screening and xp.any(xp.absolute(dA_dt) > 0): + if xp.any(xp.absolute(dA_dt) > 0): # Update the link exponents only if the applied vector potential # has actually changed. operators.set_link_exponents(current_A_applied) diff --git a/tdgl/version.py b/tdgl/version.py index 888bf88..d159974 100644 --- a/tdgl/version.py +++ b/tdgl/version.py @@ -1,4 +1,4 @@ -__version_info__ = (0, 6, 0) +__version_info__ = (0, 6, 1) __version__ = ".".join(map(str, __version_info__))