Skip to content

0.2.2->0.2.3 #5

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Jun 11, 2025
Merged

0.2.2->0.2.3 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b8a469
refactored grids.py, added trim_bc tests
scaomath Jun 6, 2025
4063d25
stencil operations reset bc to None
scaomath Jun 6, 2025
cf1c857
changed the behavior of pad_and_impose_bc to include ghost cells
scaomath Jun 10, 2025
56c4118
updated padding behavior to have a fallback
scaomath Jun 10, 2025
5a7c9df
fixed the behavior of impose_bc for 1.5 offset
scaomath Jun 11, 2025
9da51cd
update a lid-driven cavity example
scaomath Jun 11, 2025
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
22 changes: 16 additions & 6 deletions examples/Kolmogrov2d_rk4_fvm_forced_turbulence.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions examples/Kolmogrov2d_rk4_spectral_forced_turbulence.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"cells": [
{
"cell_type": "code",
"execution_count": 2,
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
"import torch\n",
"import torch.fft as fft\n",
"\n",
"from torch_cfd.grids import Grid\n",
"from torch_cfd.initial_conditions import vorticity_field\n",
"from torch_cfd.initial_conditions import filtered_vorticity_field\n",
"from torch_cfd.forcings import KolmogorovForcing\n",
"from torch_cfd.spectral import *\n",
"from torch_cfd.equations import *\n",
Expand All @@ -26,7 +26,7 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -53,7 +53,7 @@
"\n",
"grid = Grid(shape=(n, n), domain=((0, diam), (0, diam)), device=device)\n",
"\n",
"vort_init = vorticity_field(grid, peak_wavenumber, random_state=random_state, batch_size=batch_size).data\n",
"vort_init = filtered_vorticity_field(grid, peak_wavenumber, random_state=random_state, batch_size=batch_size).data\n",
"vort_hat = fft.rfft2(vort_init).to(device)\n",
"\n",
"\n",
Expand Down
294 changes: 294 additions & 0 deletions examples/Lid-driven_cavity_rk4_fvm.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions fno/data_gen/data_gen_Kolmogorov2d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import torch
import torch.fft as fft
import torch.nn.functional as F
from torch_cfd.finite_differences import curl_2d
from torch_cfd.forcings import KolmogorovForcing

Expand Down
5 changes: 3 additions & 2 deletions fno/data_gen/data_gen_McWilliams2d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@

import torch
import torch.fft as fft
import torch.nn.functional as F

from torch_cfd.grids import Grid
from torch_cfd.initial_conditions import vorticity_field
from torch_cfd.initial_conditions import filtered_vorticity_field
from torch_cfd.equations import *

from solvers import get_trajectory_imex
Expand Down Expand Up @@ -131,7 +132,7 @@ def main(args):

vort_init = torch.stack(
[
vorticity_field(
filtered_vorticity_field(
grid, peak_wavenumber, random_state=random_state + idx + k
).data
for k in range(batch_size)
Expand Down
12 changes: 6 additions & 6 deletions torch_cfd/advection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ def __init__(
grid: Grid,
bcs_c: Tuple[boundaries.BoundaryConditions, ...],
bcs_v: Tuple[boundaries.BoundaryConditions, ...],
offsets: Tuple[Tuple[float, ...], ...] = ((1.5, 0.5), (0.5, 1.5)),
offsets: Tuple[Tuple[float, ...], ...] = ((1.0, 0.5), (0.5, 1.0)),
**kwargs,
):
super().__init__()
Expand Down Expand Up @@ -281,10 +281,9 @@ def forward(self, cs: GridVariableVector, v: GridVariableVector) -> GridVariable
# flux's bc will become None
flux = GridVariableVector(tuple(c * u for c, u in zip(cs, v)))

# Apply boundary conditions to flux if not periodic
flux = GridVariableVector(
tuple(bc.impose_bc(f) for f, bc in zip(flux, self.flux_bcs))
)
# wrap flux with boundary conditions to flux if not periodic
flux = GridVariableVector(tuple(GridVariable(f.data, offset, f.grid, bc) for f, offset, bc in zip(flux, self.offsets, self.flux_bcs)))


# Return negative divergence of flux
# after taking divergence the bc becomes None
Expand Down Expand Up @@ -642,13 +641,14 @@ def __init__(
boundaries.periodic_boundary_conditions(ndim=2),
boundaries.periodic_boundary_conditions(ndim=2),
),
advect: type[nn.Module] = AdvectionVanLeer,
limiter: Callable = van_leer_limiter,
**kwargs,
):
super().__init__()

self.advect = nn.ModuleList(
AdvectionVanLeer(
advect(
grid=grid,
offset=offset,
bc_c=bc,
Expand Down
Loading