Skip to content
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

Packaged code for PyPI by gemaakmd #20

Open
wants to merge 4 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
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.venv
__pycache__
test_env
build
gemaakmd_diffusion2d.egg-info
dist
36 changes: 36 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,48 @@ The code used in this exercise is based on [Chapter 7 of the book "Learning Scie

## Project description

This code solves the diffusion equation in 2D over a square domain which is at a certain temperature and a circular disc at the center which is at a higher temperature. This code solves the diffusion equation using the Finite Difference Method. The thermal diffusivity and initial conditions of the system can be changed by the user. The code produces four plots at various timepoints of the simulation. The diffusion process can be clearly observed in these plots.

## Installing the package

To install from TestPyPI (at the time this README is written, the latest version on TestPyPI is 0.0.14):

```pip3 install -i https://test.pypi.org/simple/ gemaakmd-diffusion2d===0.0.14```

or you can install without specifcying the version:

```pip3 install -i https://test.pypi.org/simple/ gemaakmd-diffusion2d```

### Using pip3 to install from PyPI

At the time this README is written, latest version on PyPI is 0.0.14.

```pip3 install gemaakmd-diffusion2d===0.0.14```

or you can install without specifcying the version:

```pip3 install gemaakmd-diffusion2d```

### Required dependencies

It is recommended to use the latest version of matplotlib.

Matplotlib:

```pip3 install matplotlib```

Numpy:

```pip3 install numpy```

## Running this package

You can include this line to use the solve() method:

```from gemaakmd_diffusion2d import diffusion2d```

``` diffusion2d.solve()```

## Citing


Empty file added __init__.py
Empty file.
81 changes: 0 additions & 81 deletions diffusion2d.py

This file was deleted.

Empty file.
74 changes: 74 additions & 0 deletions gemaakmd_diffusion2d/diffusion2d.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
"""
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 gemaakmd_diffusion2d.output import create_plots, output_plots

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

def solve(dx = 0.1, dy = 0.1, D = 4):
# plate size, mms
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

# 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_plots(fig, u, n, dt, T_cold, T_hot, fig_counter)

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

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()
return

def create_plots(fig, u, n, dt, T_cold, T_hot, fig_counter):
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
25 changes: 25 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
from setuptools import setup
import setuptools

# Read the README.md file. so this shows up as the Project Description in the PyPI/TestPyPI page.
with open("README.md", "r", encoding="utf-8") as fh:
long_description = fh.read()

setup(
name="gemaakmd_diffusion2d",
version="0.0.14",
author="Muhammad Gema Akbar",
description="SSE Python Exercise",
long_description=long_description,
long_description_content_type="text/markdown",
url="https://github.com/mgemaakbar/diffusion2D",
package_dir={"": "."},
packages=setuptools.find_packages(where="."),
install_requires=[
"matplotlib>=3.9.0",
"numpy>=2.1.0"
Comment on lines +19 to +20
Copy link
Member

Choose a reason for hiding this comment

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

Was there a particular reason for enforcing relatively newer versions for matplotlib and numpy?

Copy link
Author

Choose a reason for hiding this comment

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

The only reason was this package/code was tested on my machine with relatively newer version of matplotlib and numpy.

]
# entry_points={
# 'console_scripts': ['package-import-name = <path-to-main-function-with-dots>']
# }
)