Skip to content

Advection #122

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

Open
wants to merge 24 commits into
base: develop
Choose a base branch
from
Open

Advection #122

Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
50226a9
Initial plan
Copilot Aug 29, 2025
5450f78
Initial planning for semi-Lagrangian advection implementation
Copilot Aug 29, 2025
d773779
Implement core SemiLagrangianAdvection class with RK integrators
Copilot Aug 29, 2025
9f9763a
Simplify SemiLagrangianAdvection implementation with correct Rodin APIs
Copilot Aug 29, 2025
a48d83d
Update
cbritopacheco Aug 31, 2025
5e0a5ff
Change connectivity API
cbritopacheco Sep 1, 2025
df5942d
Remove uint
cbritopacheco Sep 1, 2025
835c68a
Update Eigen commit
cbritopacheco Sep 1, 2025
0e60324
Update transformation API and remove Eigen
cbritopacheco Sep 1, 2025
b81a7d1
Update
cbritopacheco Sep 1, 2025
648515a
Remove ISCD
cbritopacheco Sep 1, 2025
a28a7e7
CI
cbritopacheco Sep 1, 2025
9368506
Merge branch 'develop' of github.com:cbritopacheco/rodin into advection
cbritopacheco Sep 1, 2025
0a70c91
Update
cbritopacheco Sep 2, 2025
34bcaa6
Update
cbritopacheco Sep 2, 2025
c4d0db7
Update
cbritopacheco Sep 3, 2025
ea42a20
Update
cbritopacheco Sep 3, 2025
16446cb
Update
cbritopacheco Sep 4, 2025
19c9dd9
Update
cbritopacheco Sep 6, 2025
7707906
Update
cbritopacheco Sep 7, 2025
34a6eb5
Update
cbritopacheco Sep 8, 2025
3b56bcc
Add comprehensive unit and manufactured tests for Lagrangian and Flow…
Copilot Oct 19, 2025
8a03d75
Update
cbritopacheco Oct 19, 2025
2de2708
Update
cbritopacheco Oct 23, 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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ if (RODIN_BUILD_SRC)

# ---- Eigen ----
message(STATUS "Configuring Eigen3...")
find_package(Eigen3 3.4 CONFIG REQUIRED NO_MODULE)
find_package(Eigen3 3.3 CONFIG REQUIRED NO_MODULE)

if (RODIN_WITH_PLOT)
# ---- Magnum ----
Expand Down
2 changes: 1 addition & 1 deletion src/Rodin/Assembly/OpenMP.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ namespace Rodin::Assembly
{
const auto& fe = fes.getFiniteElement(faceDim, i);
const auto& mapping =
fes.getMapping({ faceDim, i }, value);
fes.getPullback({ faceDim, i }, value);
for (Index local = 0; local < fe.getCount(); local++)
{
const Index global = fes.getGlobalIndex({ faceDim, i }, local);
Expand Down
2 changes: 1 addition & 1 deletion src/Rodin/Assembly/Sequential.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ namespace Rodin::Assembly
if (essBdr.size() == 0 || essBdr.count(mesh.getAttribute(faceDim, i)))
{
const auto& fe = fes.getFiniteElement(faceDim, i);
const auto& mapping = fes.getMapping({ faceDim, i }, value);
const auto& mapping = fes.getPullback({ faceDim, i }, value);
for (Index local = 0; local < fe.getCount(); local++)
{
const Index global = fes.getGlobalIndex({ faceDim, i }, local);
Expand Down
55 changes: 27 additions & 28 deletions src/Rodin/Geometry/Connectivity.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,9 +436,9 @@ namespace Rodin::Geometry
case Polytope::Type::Point:
{
assert(dim == 0);
assert(p.size() == 0);
assert(p.size() == 1);
out.resize(1);
out[0] = { Polytope::Type::Point, { { i } } };
out[0] = { Polytope::Type::Point, { { p(0) } } };
return;
}
case Polytope::Type::Segment:
Expand All @@ -448,7 +448,6 @@ namespace Rodin::Geometry
if (dim == 0)
{
out.resize(2);
out[0].geometry = Polytope::Type::Point;
out[0] = { Polytope::Type::Point, { { p(0) } } };
out[1] = { Polytope::Type::Point, { { p(1) } } };
}
Expand Down Expand Up @@ -510,9 +509,9 @@ namespace Rodin::Geometry
{
out.resize(4);
out[0] = { Polytope::Type::Segment, { { p(0), p(1) } } };
out[1] = { Polytope::Type::Segment, { { p(1), p(3) } } };
out[2] = { Polytope::Type::Segment, { { p(3), p(2) } } };
out[3] = { Polytope::Type::Segment, { { p(2), p(0) } } };
out[1] = { Polytope::Type::Segment, { { p(1), p(2) } } };
out[2] = { Polytope::Type::Segment, { { p(2), p(3) } } };
out[3] = { Polytope::Type::Segment, { { p(3), p(0) } } };
}
else if (dim == 2)
{
Expand Down Expand Up @@ -543,18 +542,18 @@ namespace Rodin::Geometry
out.resize(6);
out[0] = { Polytope::Type::Segment, { { p(0), p(1) } } };
out[1] = { Polytope::Type::Segment, { { p(0), p(2) } } };
out[2] = { Polytope::Type::Segment, { { p(1), p(2) } } };
out[3] = { Polytope::Type::Segment, { { p(1), p(3) } } };
out[4] = { Polytope::Type::Segment, { { p(2), p(3) } } };
out[5] = { Polytope::Type::Segment, { { p(3), p(0) } } };
out[2] = { Polytope::Type::Segment, { { p(0), p(3) } } };
out[3] = { Polytope::Type::Segment, { { p(1), p(2) } } };
out[4] = { Polytope::Type::Segment, { { p(1), p(3) } } };
out[5] = { Polytope::Type::Segment, { { p(2), p(3) } } };
}
else if (dim == 2)
{
out.resize(4);
out[0] = { Polytope::Type::Triangle, { { p(0), p(1), p(3) } } };
out[1] = { Polytope::Type::Triangle, { { p(0), p(1), p(2) } } };
out[2] = { Polytope::Type::Triangle, { { p(0), p(2), p(3) } } };
out[3] = { Polytope::Type::Triangle, { { p(1), p(2), p(3) } } };
out[0] = { Polytope::Type::Triangle, { { p(1), p(2), p(3) } } };
out[1] = { Polytope::Type::Triangle, { { p(0), p(3), p(2) } } };
out[2] = { Polytope::Type::Triangle, { { p(0), p(1), p(3) } } };
out[3] = { Polytope::Type::Triangle, { { p(0), p(2), p(1) } } };
}
else if (dim == 3)
{
Expand Down Expand Up @@ -585,24 +584,24 @@ namespace Rodin::Geometry
else if (dim == 1)
{
out.resize(9);
out[0] = { Polytope::Type::Segment, { { p(0), p(1) } } };
out[1] = { Polytope::Type::Segment, { { p(0), p(2) } } };
out[2] = { Polytope::Type::Segment, { { p(0), p(3) } } };
out[3] = { Polytope::Type::Segment, { { p(1), p(2) } } };
out[4] = { Polytope::Type::Segment, { { p(1), p(4) } } };
out[5] = { Polytope::Type::Segment, { { p(2), p(5) } } };
out[6] = { Polytope::Type::Segment, { { p(3), p(4) } } };
out[7] = { Polytope::Type::Segment, { { p(3), p(5) } } };
out[8] = { Polytope::Type::Segment, { { p(4), p(5) } } };
out[0] = { Polytope::Type::Segment, {{ p(0), p(1) }} };
out[1] = { Polytope::Type::Segment, {{ p(1), p(2) }} };
out[2] = { Polytope::Type::Segment, {{ p(2), p(0) }} };
out[3] = { Polytope::Type::Segment, {{ p(3), p(4) }} };
out[4] = { Polytope::Type::Segment, {{ p(4), p(5) }} };
out[5] = { Polytope::Type::Segment, {{ p(5), p(3) }} };
out[6] = { Polytope::Type::Segment, {{ p(0), p(3) }} };
out[7] = { Polytope::Type::Segment, {{ p(1), p(4) }} };
out[8] = { Polytope::Type::Segment, {{ p(2), p(5) }} };
}
else if (dim == 2)
{
out.resize(5);
out[0] = { Polytope::Type::Triangle, { { p(0), p(1), p(2) } } };
out[1] = { Polytope::Type::Quadrilateral, { { p(0), p(1), p(3), p(4) } } };
out[2] = { Polytope::Type::Quadrilateral, { { p(1), p(2), p(4), p(5) } } };
out[3] = { Polytope::Type::Quadrilateral, { { p(2), p(0), p(5), p(3) } } };
out[4] = { Polytope::Type::Triangle, { { p(3), p(4), p(5) } } };
out[0] = { Polytope::Type::Triangle, { { p(0), p(2), p(1) } } };
out[1] = { Polytope::Type::Quadrilateral,{ { p(0), p(1), p(4), p(3) } } };
out[2] = { Polytope::Type::Quadrilateral,{ { p(1), p(2), p(5), p(4) } } };
out[3] = { Polytope::Type::Quadrilateral,{ { p(2), p(0), p(3), p(5) } } };
out[4] = { Polytope::Type::Triangle, { { p(3), p(4), p(5) } } };
}
else if (dim == 3)
{
Expand Down
3 changes: 0 additions & 3 deletions src/Rodin/Geometry/Connectivity.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@
#ifndef RODIN_GEOMETRY_CONNECTIVITY_H
#define RODIN_GEOMETRY_CONNECTIVITY_H

#include <set>
#include <vector>
#include <iostream>
#include <unordered_map>
#include <boost/bimap.hpp>
#include <boost/bimap/vector_of.hpp>
#include <boost/bimap/unordered_set_of.hpp>
Expand Down
9 changes: 0 additions & 9 deletions src/Rodin/Geometry/MarchingTriangles.h
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion src/Rodin/Geometry/Mesh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,9 @@ namespace Rodin::Geometry
for (size_t j = 0; j < h - 1; j++)
{
build.polytope(g, {
i + j * w, (i + 1) + j * w , i + (j + 1) * w, (i + 1) + (j + 1) * w });
i + j * w, ( i + 1) + j * w,
(i + 1) + (j + 1) * w, i + (j + 1) * w
});
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/Rodin/Geometry/Point.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ namespace Rodin::Geometry
}
case 2:
{
const auto& jac = getJacobian();
const auto& jac = this->getJacobian();
const Real a = jac.coeff(0, 0);
const Real b = jac.coeff(0, 1);
const Real c = jac.coeff(1, 0);
Expand Down
Loading
Loading