Skip to content

Commit 1b9812a

Browse files
christianlangevinlangevin
christianlangevin
and
langevin
authored
fix(dispersion): fix error in velocity-dependent dispersion (MODFLOW-ORG#2849)
* fix(dispersion): fix error in velocity-dependent dispersion * Add test * update prudic problems to run * codespell * format * update two more tests --------- Co-authored-by: Christian Langevin <clange001@gmail.com>
1 parent be42aa4 commit 1b9812a

21 files changed

Lines changed: 1031 additions & 505 deletions

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,3 +164,5 @@ autotest/notebooks/
164164

165165
**/*.lock
166166
doc/ReleaseNotes/develop.tex
167+
168+
agent

‎autotest/data/prudic2004t2fmiats/result_conc_lak1.txt‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
3.946695993733677321e-20
2+
5.841760209983931779e-07
3+
9.503595567964486413e-06
4+
7.228611463435878723e-05
5+
9.599472654197360733e-03
6+
6.616248563980418884e-02
7+
2.546103507386118792e-01
8+
7.031181460169079189e-01
9+
1.548096551251338493e+00
10+
5.132548684315324294e+00
11+
1.012560208935574302e+01
12+
1.568803574350635976e+01
13+
2.105374932752823725e+01
14+
2.576913000791746100e+01
15+
2.966389817728552103e+01
16+
3.273067374606088009e+01
17+
3.504444403167181576e+01
18+
3.675351194924647302e+01
19+
3.799023192558858852e+01
20+
3.887601792990431449e+01
21+
3.924521760282820537e+01
22+
3.955309131289669011e+01
23+
3.999327949802879800e+01
24+
4.030823308879824651e+01
25+
4.053507753359108534e+01
26+
4.070104714099753096e+01
27+
4.082428668642304359e+01
28+
4.091749360312129369e+01
29+
4.098960964905287341e+01
30+
4.102562973626425702e+01

‎autotest/data/prudic2004t2fmiats/result_conc_sfr3.txt‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
4.561883281559069858e-22
2+
3.397992774066123660e-08
3+
5.914455771260204122e-07
4+
4.488785390723664142e-06
5+
6.877179457940160376e-04
6+
4.921695401661725817e-03
7+
1.962992350388420570e-02
8+
5.623523513642667698e-02
9+
1.286962368801582712e-01
10+
4.958065781394497828e-01
11+
1.116772191621480337e+00
12+
1.996772174581915582e+00
13+
3.134047687042586627e+00
14+
4.524116280376802024e+00
15+
6.154364777670968678e+00
16+
7.988833188958001763e+00
17+
9.983003298898781352e+00
18+
1.208878457924403804e+01
19+
1.426522298311673076e+01
20+
1.647608167651275934e+01
21+
1.758193696486405955e+01
22+
1.868248122872778794e+01
23+
2.085247003828336432e+01
24+
2.295162795571463121e+01
25+
2.493664115110276924e+01
26+
2.677554082784887868e+01
27+
2.843879651137127951e+01
28+
2.991315175037628293e+01
29+
3.119024029710690016e+01
30+
3.186685787909062384e+01

‎autotest/data/prudic2004t2fmiats/result_conc_sfr4.txt‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
1.211403647176283591e-19
2+
3.415649001836543548e-07
3+
5.793892504869104548e-06
4+
4.287771275635317503e-05
5+
5.644941355149168428e-03
6+
3.899220583938624307e-02
7+
1.503626380935387252e-01
8+
4.161471458439955362e-01
9+
9.184478137653059315e-01
10+
3.075872937141383101e+00
11+
6.129839540248957164e+00
12+
9.615635057662210272e+00
13+
1.310612664150500528e+01
14+
1.634685031814327161e+01
15+
1.923742055408221319e+01
16+
2.175776731981030920e+01
17+
2.392987127702238581e+01
18+
2.581493127630747608e+01
19+
2.746844410553827487e+01
20+
2.894190940197370310e+01
21+
2.963781691454718725e+01
22+
3.029723789166134296e+01
23+
3.150457915942141085e+01
24+
3.261080893711081785e+01
25+
3.361738078241489802e+01
26+
3.452527414939951456e+01
27+
3.533149161099590430e+01
28+
3.603722058877914947e+01
29+
3.664372729265917172e+01
30+
3.696384451100282575e+01

‎autotest/data/prudic2004t2fmiats/times.txt‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
1.000000000000000000e+00
2+
1.010000000000000000e+02
3+
2.010000000000000000e+02
4+
3.010000000000000000e+02
5+
5.010000000000000000e+02
6+
7.010000000000000000e+02
7+
9.010000000000000000e+02
8+
1.101000000000000000e+03
9+
1.301000000000000000e+03
10+
1.701000000000000000e+03
11+
2.101000000000000000e+03
12+
2.501000000000000000e+03
13+
2.901000000000000000e+03
14+
3.301000000000000000e+03
15+
3.701000000000000000e+03
16+
4.101000000000000000e+03
17+
4.501000000000000000e+03
18+
4.901000000000000000e+03
19+
5.301000000000000000e+03
20+
5.701000000000000000e+03
21+
5.901000000000000000e+03
22+
6.101000000000000000e+03
23+
6.501000000000000000e+03
24+
6.901000000000000000e+03
25+
7.301000000000000000e+03
26+
7.701000000000000000e+03
27+
8.101000000000000000e+03
28+
8.501000000000000000e+03
29+
8.901000000000000000e+03
30+
9.132250000000000000e+03

‎autotest/data/prudic2004test2/result_conc_lak1.txt‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
3.946695993733677321e-20
2+
7.271859709511532821e-02
3+
4.848782615652296180e-01
4+
1.662035165223629152e+00
5+
3.950710218428516995e+00
6+
7.393292181740688029e+00
7+
1.169768671110336022e+01
8+
1.639103734750406716e+01
9+
2.100485463540374909e+01
10+
2.520627028366814670e+01
11+
2.882256765132581933e+01
12+
3.180081892014997891e+01
13+
3.415390640004499545e+01
14+
3.595827405808478971e+01
15+
3.731725452549591182e+01
16+
3.832328576480752247e+01
17+
3.906351640460611918e+01
18+
3.960714706197857993e+01
19+
4.000550444995003119e+01
20+
4.029757400472045248e+01
21+
4.051295453888511844e+01
22+
4.067400436609644743e+01
23+
4.079585707225022873e+01
24+
4.088942263526283227e+01
25+
4.096260898391662408e+01
26+
4.102107474306527024e+01

‎autotest/data/prudic2004test2/result_conc_sfr3.txt‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
4.561883281559069858e-22
2+
6.220055253210382724e-03
3+
4.365650172069184681e-02
4+
1.591224016907649974e-01
5+
4.070024720509314853e-01
6+
8.309919051616850849e-01
7+
1.455701471523141555e+00
8+
2.291432630480306543e+00
9+
3.337294278336156328e+00
10+
4.591904320554266228e+00
11+
6.041320671731020830e+00
12+
7.662460127001715193e+00
13+
9.425077011926832782e+00
14+
1.129562819705824062e+01
15+
1.324118091723489421e+01
16+
1.523400989115116388e+01
17+
1.724586422126587593e+01
18+
1.923979250596273260e+01
19+
2.120314283828646751e+01
20+
2.310265422663942303e+01
21+
2.490626232462137679e+01
22+
2.659109922261144021e+01
23+
2.813339068623159989e+01
24+
2.952206699371564724e+01
25+
3.074713288560063518e+01
26+
3.181454501206812679e+01

‎autotest/data/prudic2004test2/result_conc_sfr4.txt‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
1.211403647176283591e-19
2+
4.321983853644033313e-02
3+
2.891580829082446291e-01
4+
9.953880554552647641e-01
5+
2.378890872491798980e+00
6+
4.482659772481422777e+00
7+
7.155088405396810458e+00
8+
1.013761418634608447e+01
9+
1.316911872099027114e+01
10+
1.606372329038213920e+01
11+
1.871911162675321449e+01
12+
2.109557333637513210e+01
13+
2.318686365731605292e+01
14+
2.502063584593275536e+01
15+
2.663979836164712012e+01
16+
2.808349246206826777e+01
17+
2.938768959809461023e+01
18+
3.057451857679416207e+01
19+
3.166693781236556404e+01
20+
3.267188665805912962e+01
21+
3.359162558993364911e+01
22+
3.442845473952839797e+01
23+
3.518025052582500223e+01
24+
3.584817965692557351e+01
25+
3.643220755778465048e+01
26+
3.693812811267823548e+01

‎autotest/data/prudic2004test2gwtgwt/result_conc_lak1.txt‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
-1.732298350794156910e-19
2-
5.973728964367847061e-02
3-
4.184859415417780393e-01
4-
1.489099811360406811e+00
5-
3.633377796464407616e+00
6-
6.931932666431149137e+00
7-
1.112069961121108186e+01
8-
1.573922122003188129e+01
9-
2.031731119877053260e+01
10-
2.451166231686721630e+01
11-
2.813213316188354440e+01
12-
3.112671516426926743e+01
13-
3.349799268099551597e+01
14-
3.531839567172077921e+01
15-
3.668555780220282259e+01
16-
3.769491668386211813e+01
17-
3.843599092972889508e+01
18-
3.897895754123781131e+01
19-
3.937536112883096706e+01
20-
3.966425592482838880e+01
21-
3.987767875136835727e+01
22-
4.003643078664034505e+01
23-
4.015576523248191165e+01
24-
4.024691460295692025e+01
25-
4.031790644986959649e+01
26-
4.037443370071348880e+01
1+
3.946695993733677321e-20
2+
7.271859709511532821e-02
3+
4.848782615652296180e-01
4+
1.662035165223629152e+00
5+
3.950710218428516995e+00
6+
7.393292181740688029e+00
7+
1.169768671110336022e+01
8+
1.639103734750406716e+01
9+
2.100485463540374909e+01
10+
2.520627028366814670e+01
11+
2.882256765132581933e+01
12+
3.180081892014997891e+01
13+
3.415390640004499545e+01
14+
3.595827405808478971e+01
15+
3.731725452549591182e+01
16+
3.832328576480752247e+01
17+
3.906351640460611918e+01
18+
3.960714706197857993e+01
19+
4.000550444995003119e+01
20+
4.029757400472045248e+01
21+
4.051295453888511844e+01
22+
4.067400436609644743e+01
23+
4.079585707225022873e+01
24+
4.088942263526283227e+01
25+
4.096260898391662408e+01
26+
4.102107474306527024e+01

‎autotest/data/prudic2004test2gwtgwt/result_conc_sfr3.txt‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
-7.590676881984978603e-23
2-
5.103046904219765006e-03
3-
3.756709190871650172e-02
4-
1.419627593634194551e-01
5-
3.723032958900645562e-01
6-
7.739574656567637101e-01
7-
1.373245634517228586e+00
8-
2.181561695661374589e+00
9-
3.200310323158610526e+00
10-
4.429411056320887496e+00
11-
5.858228753400835487e+00
12-
7.468712065095015618e+00
13-
9.230057049141151992e+00
14-
1.111167607042699679e+01
15-
1.308237121454015117e+01
16-
1.510492318812385193e+01
17-
1.714131647946915749e+01
18-
1.917315218297901680e+01
19-
2.116361775639958154e+01
20-
2.308042966573104593e+01
21-
2.489457123709044239e+01
22-
2.658238772064699162e+01
23-
2.812191240722319563e+01
24-
2.949817634468430683e+01
25-
3.070580866698000833e+01
26-
3.175049553218045162e+01
1+
4.561883281559069858e-22
2+
6.220055253210382724e-03
3+
4.365650172069184681e-02
4+
1.591224016907649974e-01
5+
4.070024720509314853e-01
6+
8.309919051616850849e-01
7+
1.455701471523141555e+00
8+
2.291432630480306543e+00
9+
3.337294278336156328e+00
10+
4.591904320554266228e+00
11+
6.041320671731020830e+00
12+
7.662460127001715193e+00
13+
9.425077011926832782e+00
14+
1.129562819705824062e+01
15+
1.324118091723489421e+01
16+
1.523400989115116388e+01
17+
1.724586422126587593e+01
18+
1.923979250596273260e+01
19+
2.120314283828646751e+01
20+
2.310265422663942303e+01
21+
2.490626232462137679e+01
22+
2.659109922261144021e+01
23+
2.813339068623159989e+01
24+
2.952206699371564724e+01
25+
3.074713288560063518e+01
26+
3.181454501206812679e+01

0 commit comments

Comments
 (0)