Skip to content

Packaged code for PyPI by caihy #2

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.

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,27 @@ The code used in this exercise is based on [Chapter 7 of the book "Learning Scie

## Project description

This package contains a Python implementation of the 2D diffusion equation. The diffusion equation is a partial
differential equation that describes how a quantity (e.g., heat, particles, etc.) diffuses
through a medium.

## Installing the package

pip install dist\caihy_diffusion2d-0.0.2-py3-none-any.whl

### Using pip3 to install from PyPI

pip install -i https://test.pypi.org/simple/ caihy-diffusion2d --extra-index-url https://pypi.org/simple

### Required dependencies

numpy
matplotlib

## Running this package
Copy link
Member

Choose a reason for hiding this comment

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

Is was expected that you write instructions on how to run the functionality in your package.

Copy link
Author

Choose a reason for hiding this comment

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

I will add them later


?

## Citing

Cat?
81 changes: 0 additions & 81 deletions diffusion2d.py

This file was deleted.

Empty file added diffusion2d/__init__.py
Empty file.
76 changes: 76 additions & 0 deletions diffusion2d/diffusion2d.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
"""
Solving the two-dimensional diffusion equation

Example acquired from https://scipython.com/book/chapter-7-matplotlib/examples/the-two-dimensional-diffusion-equation/
"""

import numpy as np
import matplotlib.pyplot as plt
from diffusion2d.output import create_plot, output_plots

def solve():
# plate size, mm
w = h = 10.
# intervals in x-, y- directions, mm
dx = dy = 0.1
# Thermal diffusivity of steel, mm^2/s
D = 4.

# Initial cold temperature of square domain
T_cold = 300

# Initial hot temperature of circular disc at the center
T_hot = 700

# Number of discrete mesh points in X and Y directions
nx, ny = int(w / dx), int(h / dy)

# Computing a stable time step
dx2, dy2 = dx * dx, dy * dy
dt = dx2 * dy2 / (2 * D * (dx2 + dy2))

print("dt = {}".format(dt))

u0 = T_cold * np.ones((nx, ny))
u = u0.copy()

# Initial conditions - circle of radius r centred at (cx,cy) (mm)
r = min(h, w) / 4.0
cx = w / 2.0
cy = h / 2.0
r2 = r ** 2
for i in range(nx):
for j in range(ny):
p2 = (i * dx - cx) ** 2 + (j * dy - cy) ** 2
if p2 < r2:
u0[i, j] = T_hot


def do_timestep(u_nm1, u, D, dt, dx2, dy2):
# Propagate with forward-difference in time, central-difference in space
u[1:-1, 1:-1] = u_nm1[1:-1, 1:-1] + D * dt * (
(u_nm1[2:, 1:-1] - 2 * u_nm1[1:-1, 1:-1] + u_nm1[:-2, 1:-1]) / dx2
+ (u_nm1[1:-1, 2:] - 2 * u_nm1[1:-1, 1:-1] + u_nm1[1:-1, :-2]) / dy2)

u_nm1 = u.copy()
return u_nm1, u


# Number of timesteps
nsteps = 101
# Output 4 figures at these timesteps
n_output = [0, 10, 50, 100]
fig_counter = 0
fig = plt.figure()

# Time loop
for n in range(nsteps):
u0, u = do_timestep(u0, u, D, dt, dx2, dy2)

# Create figure
if n in n_output:
fig_counter += 1
im = create_plot(T_cold, T_hot, dt, u, fig_counter, fig, n)

# Plot output figures
output_plots(fig, im)
15 changes: 15 additions & 0 deletions diffusion2d/output.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import matplotlib.pyplot as plt

def create_plot(T_cold, T_hot, dt, u, fig_counter, fig, n):
ax = fig.add_subplot(220 + fig_counter)
im = ax.imshow(u.copy(), cmap=plt.get_cmap('hot'), vmin=T_cold, vmax=T_hot) # image for color bar axes
ax.set_axis_off()
ax.set_title('{:.1f} ms'.format(n * dt * 1000))
return im

def output_plots(fig, im):
fig.subplots_adjust(right=0.85)
cbar_ax = fig.add_axes([0.9, 0.15, 0.03, 0.7])
cbar_ax.set_xlabel('$T$ / K', labelpad=20)
fig.colorbar(im, cax=cbar_ax)
plt.show()
27 changes: 27 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
[build-system]
requires = ["setuptools", "wheel"]


[tool.setuptools.packages]
find = {where = ["."], include = ["diffusion2d"]}

[project]
name = "caihy_diffusion2d"
description = "diffusion FDM"
readme = "README.md"
keywords = ["toy", "simulation"]
authors = [
{name = "Henry Cai"}
]
classifiers = [
"Programming Language :: Python :: 3"
]
dependencies = [
"numpy",
"matplotlib"
]
version = "0.0.2"
[project.urls]
Homepage = "https://github.com/Simulation-Software-Engineering/diffusion2D"
[project.scripts]
solver = "diffusion2d.diffusion2d:solve"