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

feat(vsc): New viscosity package for GWF model type #1071

Merged
merged 32 commits into from
Nov 15, 2022
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
51c6836
feat(vsc): New viscosity package for GWF model type
emorway-usgs Oct 25, 2022
e94362e
forgot about meson
emorway-usgs Oct 25, 2022
57436cc
meson
emorway-usgs Oct 25, 2022
7b4a88e
attempt to fix some GNU compile errors
emorway-usgs Oct 25, 2022
6e6d45e
not sure what the hang up is, grasping...
emorway-usgs Oct 26, 2022
5a84ea3
removing stray (unused) variables in new vsc package
emorway-usgs Oct 26, 2022
835699c
Addresses some of the review comments
emorway-usgs Oct 27, 2022
95903ba
Switching up how head-dependent boundary packages, specifically DRN, …
emorway-usgs Oct 27, 2022
06ad7fd
forgot to remove some unused variables with last edits
emorway-usgs Oct 27, 2022
dce2081
Viscosity chapter for Supplemental Technical Information document
emorway-usgs Oct 28, 2022
a0cbfc6
forgot to update makefile in ./make
emorway-usgs Oct 28, 2022
3315d85
fix 2 deallocations
emorway-usgs Oct 28, 2022
a73c878
Update makefile with the one from #1067
emorway-usgs Oct 29, 2022
3a3287c
makefile
emorway-usgs Oct 29, 2022
35d798d
Revert "makefile"
emorway-usgs Oct 29, 2022
a3a293d
Merge branch 'develop' into vsc
emorway-usgs Oct 31, 2022
fef6b04
Retrying makefile after running build_makefiles.py
emorway-usgs Oct 31, 2022
fa5be12
new autotest includes a data file that should have submitted previously
emorway-usgs Oct 31, 2022
ddb0831
Clean-up unused variables & hiccup fix
emorway-usgs Oct 31, 2022
e097e0c
- Code now accounts for viscosity within HFB
emorway-usgs Nov 3, 2022
a266ab3
deallocate in the wrong spot
emorway-usgs Nov 3, 2022
736b861
Address review comments
emorway-usgs Nov 7, 2022
2bfec82
fprettify
emorway-usgs Nov 7, 2022
a93e633
refactor vsc definition file and make corresponding changes in autote…
emorway-usgs Nov 8, 2022
e6a19c0
Remove unused variables
emorway-usgs Nov 8, 2022
f23ddbc
Resolve releaseNotes conflict, restore HFB condsat_modify function
emorway-usgs Nov 9, 2022
eeeb09b
After redoing vsc.dfn, update associated tex files
emorway-usgs Nov 9, 2022
98212c1
Backup K arrays should initially be allocated size zero and reallocat…
emorway-usgs Nov 10, 2022
112b6fc
fprettify
emorway-usgs Nov 10, 2022
0fdc071
Reconfigure how vsc autotests are verified. Relative check of sim re…
emorway-usgs Nov 14, 2022
bfbf4f2
oy vey
emorway-usgs Nov 15, 2022
cb641cf
few minor polishes on VSC
langevin-usgs Nov 15, 2022
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
152 changes: 152 additions & 0 deletions autotest/data/vsc04-laktab/stg-vol-surfarea.dat
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
stage,Volume,Surf Area
29.5656,0,0
29.602176,7645.54858,3870.96
29.638752,15291.09716,7741.92
29.675328,22936.64574,11612.88
29.711904,30582.19432,15483.84
29.74848,38227.7429,19354.8
29.785056,45873.29148,23225.76
29.821632,53518.84006,27096.72
29.858208,61164.38864,30967.68
29.894784,68809.93722,34838.64
29.93136,76455.4858,38709.6
29.967936,84101.03438,42580.56
30.004512,91746.58296,46451.52
30.041088,99392.13154,50322.48
30.077664,107037.6801,54193.44
30.11424,114683.2287,58064.4
30.150816,122328.7773,61935.36
30.187392,129974.3259,65806.32
30.223968,137619.8744,69677.28
30.260544,145265.423,73548.24
30.29712,152910.9716,77419.2
30.333696,160556.5202,81290.16
30.370272,168202.0688,85161.12
30.406848,175847.6173,89032.08
30.443424,183493.1659,92903.04
30.48,191138.7145,96774
30.516576,198784.2631,100644.96
30.553152,206429.8117,104515.92
30.589728,214075.3602,108386.88
30.626304,221720.9088,112257.84
30.66288,229366.4574,116128.8
30.699456,237012.006,119999.76
30.736032,244657.5546,123870.72
30.772608,252303.1031,127741.68
30.809184,259948.6517,131612.64
30.84576,267594.2003,135483.6
30.882336,275239.7489,139354.56
30.918912,282885.2975,143225.52
30.955488,290530.846,147096.48
30.992064,298176.3946,150967.44
31.02864,305821.9432,154838.4
31.065216,313467.4918,158709.36
31.101792,321113.0404,162580.32
31.138368,328758.5889,166451.28
31.174944,336404.1375,170322.24
31.21152,344049.6861,174193.2
31.248096,351695.2347,178064.16
31.284672,359340.7833,181935.12
31.321248,366986.3318,185806.08
31.357824,374631.8804,189677.04
31.3944,382277.429,193548
31.430976,389922.9776,197418.96
31.467552,397568.5262,201289.92
31.504128,405214.0747,205160.88
31.540704,412859.6233,209031.84
31.57728,420505.1719,212902.8
31.613856,428150.7205,216773.76
31.650432,435796.2691,220644.72
31.687008,443441.8176,224515.68
31.723584,451087.3662,228386.64
31.76016,458732.9148,232257.6
31.796736,466378.4634,236128.56
31.833312,474024.012,239999.52
31.869888,481669.5605,243870.48
31.906464,489315.1091,247741.44
31.94304,496960.6577,251612.4
31.979616,504606.2063,255483.36
32.016192,512251.7548,259354.32
32.052768,519897.3034,263225.28
32.089344,527542.852,267096.24
32.12592,535188.4006,270967.2
32.162496,542833.9492,274838.16
32.199072,550479.4977,278709.12
32.235648,558125.0463,282580.08
32.272224,565770.5949,286451.04
32.3088,573416.1435,290322
32.345376,581061.6921,294192.96
32.381952,588707.2406,298063.92
32.418528,596352.7892,301934.88
32.455104,603998.3378,305805.84
32.49168,611643.8864,309676.8
32.528256,619289.435,313547.76
32.564832,626934.9835,317418.72
32.601408,634580.5321,321289.68
32.637984,651287.4716,325160.64
32.67456,672525.1066,329031.6
32.711136,693762.7415,332902.56
32.747712,715000.3764,336773.52
32.784288,736238.0114,340644.48
32.820864,757475.6463,344515.44
32.85744,778713.2813,348386.4
32.894016,799950.9162,352257.36
32.930592,821188.5512,356128.32
32.967168,842426.1861,359999.28
33.003744,863663.8211,363870.24
33.04032,884901.456,367741.2
33.076896,906139.0909,371612.16
33.113472,927376.7259,375483.12
33.150048,948614.3608,379354.08
33.186624,969851.9958,383225.04
33.2232,991089.6307,387096
33.259776,1012327.266,390966.96
33.296352,1033564.901,394837.92
33.332928,1054802.536,398708.88
33.369504,1076040.17,402579.84
33.40608,1097277.805,406450.8
33.442656,1118515.44,410321.76
33.479232,1139753.075,414192.72
33.515808,1160990.71,418063.68
33.552384,1182228.345,421934.64
33.58896,1203465.98,425805.6
33.625536,1224703.615,429676.56
33.662112,1245941.25,433547.52
33.698688,1267178.885,437418.48
33.735264,1288416.52,441289.44
33.77184,1309654.155,445160.4
33.808416,1330891.79,449031.36
33.844992,1352129.425,452902.32
33.881568,1373367.06,456773.28
33.918144,1394604.695,460644.24
33.95472,1415842.33,464515.2
33.991296,1437079.965,468386.16
34.027872,1458317.599,472257.12
34.064448,1479555.234,476128.08
34.101024,1500792.869,479999.04
34.1376,1522030.504,483870
34.174176,1543268.139,487740.96
34.210752,1564505.774,491611.92
34.247328,1585743.409,495482.88
34.283904,1606981.044,499353.84
34.32048,1628218.679,503224.8
34.357056,1649456.314,507095.76
34.393632,1670693.949,510966.72
34.430208,1691931.584,514837.68
34.466784,1713169.219,518708.64
34.50336,1734406.854,522579.6
34.539936,1755644.489,526450.56
34.576512,1776882.124,530321.52
34.613088,1798119.759,534192.48
34.649664,1819357.394,538063.44
34.68624,1840595.028,541934.4
34.722816,1861832.663,545805.36
34.759392,1883070.298,549676.32
34.795968,1904307.933,553547.28
34.832544,1925545.568,557418.24
34.86912,1946783.203,561289.2
34.905696,1968020.838,565160.16
34.942272,1989258.473,569031.12
34.978848,2010496.108,572902.08
35.015424,2031733.743,576773.04
35.052,2052971.378,580644
2 changes: 1 addition & 1 deletion autotest/test_gwf_returncodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
name = "gwf_ret_codes01"
base_ws = os.path.join("temp", name)
if not os.path.isdir(base_ws):
os.makedirs(base_ws)
os.makedirs(base_ws, exist_ok=True)
app = "mf6"
if sys.platform.lower() == "win32":
app += ".exe"
Expand Down
Loading