Skip to content

(feat) UTVD fluxlimiter #2374

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 14 commits into from
Aug 1, 2025
Merged

(feat) UTVD fluxlimiter #2374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a645b9b
Refactor tsp-adv. Move different interpolation scheme to separate files
Manangka Jun 23, 2025
e4f8898
Add the SVD-algorithm and the pseudoinverse method
Manangka Jun 27, 2025
dfeb932
Add the new unstructured TVD limiter
Manangka Jun 30, 2025
480d59e
Merge branch 'develop' into unstructured_fluxlimiter
Manangka Jul 1, 2025
1306626
Fix merge
Manangka Jul 1, 2025
fc0aa31
Add UTVD tests to existing unit tests. Fix correct stencil size on ex…
Manangka Jul 2, 2025
bf2dcc7
Apply review comments
Manangka Jul 7, 2025
bdbffa9
Fix lint error
Manangka Jul 7, 2025
49612ab
Apply review comments
Manangka Jul 8, 2025
aeb5f72
Apply review comment. Use pinv directly on the distance matrix omstea…
Manangka Jul 11, 2025
2b861a7
Merge branch 'develop' into unstructured_fluxlimiter
Manangka Jul 11, 2025
5f85da7
Merge branch 'develop' into unstructured_fluxlimiter
Manangka Jul 28, 2025
343b358
Merge branch 'develop' into unstructured_fluxlimiter
Manangka Jul 31, 2025
1949a18
Apply review comment
Manangka Jul 31, 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
1 change: 1 addition & 0 deletions .codespell.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Alph
wel
nam
gage
DisUtils
drob
delt
lke
Expand Down
114 changes: 111 additions & 3 deletions autotest/test_gwt_adv01.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import pytest
from framework import TestFramework

cases = ["adv01a", "adv01b", "adv01c"]
scheme = ["upstream", "central", "tvd"]
cases = ["adv01a", "adv01b", "adv01c", "adv01d"]
scheme = ["upstream", "central", "tvd", "utvd"]


def build_models(idx, test):
Expand Down Expand Up @@ -569,7 +569,115 @@ def check_output(idx, test):
]
cres3 = np.array(cres3)

creslist = [cres1, cres2, cres3]
cres4 = [
[
[
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
9.99999999e-01,
9.99999997e-01,
9.99999991e-01,
9.99999975e-01,
9.99999926e-01,
9.99999789e-01,
9.99999407e-01,
9.99998374e-01,
9.99995665e-01,
9.99988785e-01,
9.99971918e-01,
9.99932078e-01,
9.99841550e-01,
9.99643930e-01,
9.99229970e-01,
9.98398720e-01,
9.96800070e-01,
9.93857995e-01,
9.88681096e-01,
9.79978744e-01,
9.66015902e-01,
9.44652308e-01,
9.13514114e-01,
8.70328697e-01,
8.13410723e-01,
7.42224213e-01,
6.57879958e-01,
5.63390872e-01,
4.63530314e-01,
3.64233330e-01,
2.71628520e-01,
1.90935414e-01,
1.25541011e-01,
7.65316278e-02,
4.28052306e-02,
2.16851952e-02,
9.78980420e-03,
3.85619551e-03,
1.28879215e-03,
3.52115803e-04,
7.49350468e-05,
1.17646292e-05,
1.32776825e-06,
9.64125296e-08,
-5.86919920e-08,
-7.40823239e-08,
-6.31800862e-08,
-5.27398214e-08,
-4.32274354e-08,
-3.48423105e-08,
-2.76485491e-08,
-2.16203169e-08,
-1.66732861e-08,
-1.26895729e-08,
-9.53670757e-09,
-7.08114746e-09,
-5.19714853e-09,
-3.77193598e-09,
-2.70809957e-09,
-1.92404050e-09,
-1.35315643e-09,
-9.42300766e-10,
-6.49908787e-10,
-4.44059825e-10,
-3.00645032e-10,
-2.01734707e-10,
-1.34185608e-10,
-8.84931133e-11,
-5.78716880e-11,
-3.75358997e-11,
-2.41500917e-11,
-1.54150906e-11,
-9.76314930e-12,
-6.13633357e-12,
-3.82789021e-12,
-2.37025821e-12,
-1.07644858e-12,
-2.60415045e-12,
]
]
]
cres4 = np.array(cres4)

creslist = [cres1, cres2, cres3, cres4]

assert np.allclose(creslist[idx], conc), (
"simulated concentrations do not match with known solution."
Expand Down
114 changes: 111 additions & 3 deletions autotest/test_gwt_adv01_fmi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
from flopy.utils.gridutil import uniform_flow_field
from framework import TestFramework

cases = ["adv01a_fmi", "adv01b_fmi", "adv01c_fmi"]
scheme = ["upstream", "central", "tvd"]
cases = ["adv01a_fmi", "adv01b_fmi", "adv01c_fmi", "adv01d_fmi"]
scheme = ["upstream", "central", "tvd", "utvd"]


def build_models(idx, test):
Expand Down Expand Up @@ -539,7 +539,115 @@ def check_output(idx, test):
]
cres3 = np.array(cres3)

creslist = [cres1, cres2, cres3]
cres4 = [
[
[
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
9.99999999e-01,
9.99999997e-01,
9.99999991e-01,
9.99999975e-01,
9.99999926e-01,
9.99999789e-01,
9.99999407e-01,
9.99998374e-01,
9.99995665e-01,
9.99988785e-01,
9.99971918e-01,
9.99932078e-01,
9.99841550e-01,
9.99643930e-01,
9.99229970e-01,
9.98398720e-01,
9.96800070e-01,
9.93857995e-01,
9.88681096e-01,
9.79978744e-01,
9.66015902e-01,
9.44652308e-01,
9.13514114e-01,
8.70328697e-01,
8.13410723e-01,
7.42224213e-01,
6.57879958e-01,
5.63390872e-01,
4.63530314e-01,
3.64233330e-01,
2.71628520e-01,
1.90935414e-01,
1.25541011e-01,
7.65316278e-02,
4.28052306e-02,
2.16851952e-02,
9.78980420e-03,
3.85619551e-03,
1.28879215e-03,
3.52115803e-04,
7.49350468e-05,
1.17646292e-05,
1.32776825e-06,
9.64125296e-08,
-5.86919920e-08,
-7.40823239e-08,
-6.31800862e-08,
-5.27398214e-08,
-4.32274354e-08,
-3.48423105e-08,
-2.76485491e-08,
-2.16203169e-08,
-1.66732861e-08,
-1.26895729e-08,
-9.53670757e-09,
-7.08114746e-09,
-5.19714853e-09,
-3.77193598e-09,
-2.70809957e-09,
-1.92404050e-09,
-1.35315643e-09,
-9.42300766e-10,
-6.49908787e-10,
-4.44059825e-10,
-3.00645032e-10,
-2.01734707e-10,
-1.34185608e-10,
-8.84931133e-11,
-5.78716880e-11,
-3.75358997e-11,
-2.41500917e-11,
-1.54150906e-11,
-9.76314930e-12,
-6.13633357e-12,
-3.82789021e-12,
-2.37025821e-12,
-1.07644858e-12,
-2.60415045e-12,
]
]
]
cres4 = np.array(cres4)

creslist = [cres1, cres2, cres3, cres4]

assert np.allclose(creslist[idx], conc), (
"simulated concentrations do not match with known solution."
Expand Down
114 changes: 111 additions & 3 deletions autotest/test_gwt_adv01_gwtgwt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import pytest
from framework import TestFramework

cases = ["adv01a_gwtgwt", "adv01b_gwtgwt", "adv01c_gwtgwt"]
scheme = ["upstream", "central", "tvd"]
cases = ["adv01a_gwtgwt", "adv01b_gwtgwt", "adv01c_gwtgwt", "adv01d_gwtgwt"]
scheme = ["upstream", "central", "tvd", "utvd"]
gdelr = 1.0

# solver settings
Expand Down Expand Up @@ -668,7 +668,115 @@ def check_output(idx, test):
]
cres3 = np.array(cres3)

creslist = [cres1, cres2, cres3]
cres4 = [
[
[
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
1.00000000e00,
9.99999999e-01,
9.99999997e-01,
9.99999991e-01,
9.99999975e-01,
9.99999926e-01,
9.99999789e-01,
9.99999407e-01,
9.99998374e-01,
9.99995665e-01,
9.99988785e-01,
9.99971918e-01,
9.99932078e-01,
9.99841550e-01,
9.99643930e-01,
9.99229970e-01,
9.98398720e-01,
9.96800070e-01,
9.93857995e-01,
9.88681096e-01,
9.79978744e-01,
9.66015902e-01,
9.44652308e-01,
9.13514114e-01,
8.70328697e-01,
8.13410723e-01,
7.42224213e-01,
6.57879958e-01,
5.63390872e-01,
4.63530314e-01,
3.64233330e-01,
2.71628520e-01,
1.90935414e-01,
1.25541011e-01,
7.65316278e-02,
4.28052306e-02,
2.16851952e-02,
9.78980420e-03,
3.85619551e-03,
1.28879215e-03,
3.52115803e-04,
7.49350468e-05,
1.17646292e-05,
1.32776825e-06,
9.64125296e-08,
-5.86919920e-08,
-7.40823239e-08,
-6.31800862e-08,
-5.27398214e-08,
-4.32274354e-08,
-3.48423105e-08,
-2.76485491e-08,
-2.16203169e-08,
-1.66732861e-08,
-1.26895729e-08,
-9.53670757e-09,
-7.08114746e-09,
-5.19714853e-09,
-3.77193598e-09,
-2.70809957e-09,
-1.92404050e-09,
-1.35315643e-09,
-9.42300766e-10,
-6.49908787e-10,
-4.44059825e-10,
-3.00645032e-10,
-2.01734707e-10,
-1.34185608e-10,
-8.84931133e-11,
-5.78716880e-11,
-3.75358997e-11,
-2.41500917e-11,
-1.54150906e-11,
-9.76314930e-12,
-6.13633357e-12,
-3.82789021e-12,
-2.37025821e-12,
-1.07644858e-12,
-2.60415045e-12,
]
]
]
cres4 = np.array(cres4)

creslist = [cres1, cres2, cres3, cres4]

assert np.allclose(creslist[idx], conc), (
"simulated concentrations do not match with known solution."
Expand Down
Loading
Loading