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

Release 6.5.0 #1845

Closed
wants to merge 202 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
202 commits
Select commit Hold shift + click to select a range
7b5f3d7
ci(release): update version to 6.5.0.dev1, reset IDEVELOPMODE to 1
github-actions[bot] Feb 8, 2024
4f2bdd7
Merge pull request #1595 from MODFLOW-USGS/post-release-6.4.3-reset
wpbonelli Feb 8, 2024
e338e83
ci: remove release reset step, validate cff, make citation from cff (…
wpbonelli Feb 8, 2024
967f168
fix(par): first version of message cache for MPI traffic (#1582)
mjr-deltares Feb 8, 2024
6004b5a
chore(timer.f90): cleanup docstrings in Timer utility (#1600)
emorway-usgs Feb 9, 2024
b0f1919
chore(ListReader.f90): cleanup docstrings in ListReader utility (#1592)
emorway-usgs Feb 9, 2024
ffd8294
fix(mvr): improve water mover performance (#1605)
langevin-usgs Feb 9, 2024
7f37518
docs(mf6io): correct description of CDIST in gwfgwf/gwtgwt (#1606)
langevin-usgs Feb 9, 2024
67f1891
feat(idm): update TDIS package for IDM (#1579)
mjreno Feb 9, 2024
55add1c
feat(GWE): Introduce Groundwater Energy Transport (#1493)
emorway-usgs Feb 9, 2024
26a447e
docs(DEVELOPER.MD): update Windows compiler install recommendations (…
wpbonelli Feb 12, 2024
07f2a9a
ci: upload test artifacts on failure (#1602)
wpbonelli Feb 12, 2024
e4703cf
doc: update HPC documents (#1613)
jdhughes-usgs Feb 12, 2024
7bc29b7
test: use v14 of executables distribution (#1614)
wpbonelli Feb 13, 2024
d111606
ci: don't trigger compiler checks on push or PR (#1615)
wpbonelli Feb 13, 2024
1bbf0a6
ci(release): update version to 6.4.4, reset IDEVELOPMODE to 1
github-actions[bot] Feb 13, 2024
ebf84ac
ci(release): fix wording in release PR description (#1618)
wpbonelli Feb 13, 2024
e14690d
Merge branch 'develop' into post-release-6.4.4-reset
langevin-usgs Feb 13, 2024
b06026b
update readme.md from dev1 to dev2
langevin-usgs Feb 13, 2024
b45da8b
Merge pull request #1619 from MODFLOW-USGS/post-release-6.4.4-reset
wpbonelli Feb 13, 2024
e31e79b
docs(release): improve release procedure documentation (#1620)
wpbonelli Feb 14, 2024
b77cd26
test: make downloaded/rebuilt programs optional (#1621)
wpbonelli Feb 15, 2024
c39c811
doc: update .hpc/README.md (#1622)
jdhughes-usgs Feb 15, 2024
886e394
test(framework): remove setup() method (#1623)
wpbonelli Feb 15, 2024
74a6cd8
test(framework): make functions private (rename with leading _) (#1624)
wpbonelli Feb 15, 2024
9253449
test: remove executables v14 workaround from 7bc29b7 (#1626)
wpbonelli Feb 16, 2024
c05c9a1
test: remove unused test script, fix test_examples.py (#1629)
wpbonelli Feb 16, 2024
27d3565
feat(SWF): Introduce Surface Water Flow (SWF) Model (#1630)
langevin-usgs Feb 16, 2024
a602d18
refactor(swf-disl): remove unused routines (#1631)
langevin-usgs Feb 18, 2024
95aec27
ci(release): add distribution for ARM macs (#1625)
wpbonelli Feb 18, 2024
e2497f0
chore(lak): fix format statement to eliminate ifort warning (#1632)
jdhughes-usgs Feb 18, 2024
45744b5
refactor: matching dfn and module filenames (#1607)
wpbonelli Feb 19, 2024
1ae17de
fix(sfr): resolve divide by zero issue (#1633)
jdhughes-usgs Feb 19, 2024
5d1cb50
refactor(swf): minor cleanup (#1634)
langevin-usgs Feb 20, 2024
6f8b4af
refactor(dfn2f90): use dfns.txt input file, add options (#1603)
wpbonelli Feb 20, 2024
075fb12
docs: update DEVELOPER.md (#1635)
jdhughes-usgs Feb 20, 2024
b50f2a4
docs: update release notes (#1636)
jdhughes-usgs Feb 20, 2024
04402ff
fix(BND): fix issue with negative cond and auxmult (#1640)
jdhughes-usgs Feb 21, 2024
fa29361
ci: remove compiler checks schedule trigger (#1641)
wpbonelli Feb 22, 2024
214c1ee
ci(release): statically linked gfortran build for ARM macs (#1643)
wpbonelli Feb 23, 2024
ab6d3f8
docs: fix typo in supplemental info (#1645)
wpbonelli Feb 23, 2024
61b0883
feat(PRT): introduce Particle Tracking (PRT) model (#1389)
wpbonelli Feb 23, 2024
577b14d
fix(lak): fix issue with outlet observations (#1646)
jdhughes-usgs Feb 23, 2024
0950ba8
refactor(misc): improve doc (#1647)
langevin-usgs Feb 23, 2024
8d07992
refactor: move hyeff function to separate module (#1650)
wpbonelli Feb 26, 2024
9af21a0
refactor(discretization): move dis modules to src/Model/Discretizatio…
wpbonelli Feb 27, 2024
a666ed4
ci: update rules in fortran style script (#1651)
wpbonelli Feb 28, 2024
8ea03bd
refactor(npf): remove minimum saturated thickness (#1654)
jdhughes-usgs Mar 4, 2024
58bd349
- minor changes to get GWE parallel (#1656)
mjr-deltares Mar 4, 2024
78fcade
fix(buy): coupled GWF models with BUY require interface model (#1657)
mjr-deltares Mar 6, 2024
fb24b2c
test(gwe/uze): relax sln comparison failing on ARM macs (#1658)
wpbonelli Mar 6, 2024
5a4d398
test(PRT): move import statements into check fns (#1660)
wpbonelli Mar 6, 2024
adce911
ci: don't test large models with ifx (#1661)
wpbonelli Mar 6, 2024
668b8d2
fix(disl): copy disl%reach_bottom into disbase%bot (#1662)
langevin-usgs Mar 6, 2024
26eb1ef
test(gwe): New autotest for GWE that will facilitate additional paral…
emorway-usgs Mar 7, 2024
af7e80b
test(framework): fix workspace selection and comparison logic (#1664)
wpbonelli Mar 7, 2024
2b39d40
ci: support dir path in fortran style script (#1666)
wpbonelli Mar 7, 2024
f8885ec
refactor(npf): remove mfnwt and mfusg development conductance options…
jdhughes-usgs Mar 8, 2024
7b31cff
readme: update MODFLOW paper and report references (#1667)
jdhughes-usgs Mar 8, 2024
3e7198d
style: update doxygen comments (#1668)
jdhughes-usgs Mar 8, 2024
486c809
ci(large.yml): multiple fixes/refactoring (#1669)
wpbonelli Mar 9, 2024
80aec42
test: avoid warnings from 3rd party libs (#1670)
wpbonelli Mar 10, 2024
30b3738
test(PRT): cleanup/speedup voronoi DISV grid tests (#1671)
wpbonelli Mar 11, 2024
6a7a2bd
refactor(idm): updates in preparation for keystring input types (#1610)
mjreno Mar 11, 2024
b0d37f7
test(par/gwe): second autotest for parallel gwe (#1665)
emorway-usgs Mar 11, 2024
2a34c3b
feat(sfw): implement conveyance concept (#1673)
langevin-usgs Mar 14, 2024
c99aa8b
ci(parallel): add mf6 parallel test on windows (#1672)
wpbonelli Mar 15, 2024
00d7d97
feat(overland flow): SWF now works with DIS/DISV (#1675)
langevin-usgs Mar 15, 2024
9aeeaa4
ci(parallel): fix windows parallel mf6 build (#1677)
wpbonelli Mar 17, 2024
743c4ea
ci(parallel): re-enable linux/mac, forgot to restore after debugging …
wpbonelli Mar 18, 2024
563a201
ci: test oldest supported python (currently 3.9) (#1680)
wpbonelli Mar 18, 2024
a015e68
fix(PRT): fix conditionals controlling particle advance (#1681)
wpbonelli Mar 19, 2024
bb3763c
ci(parallel): add parallel windows distribution (#1682)
wpbonelli Mar 22, 2024
0153b73
ci(parallel): use GITHUB_WORKSPACE for petsc dll path (#1683)
wpbonelli Mar 24, 2024
79c5ff0
test(vcatch): add v-catchment overland flow test for SWF (#1684)
langevin-usgs Mar 26, 2024
a2bdd9e
refactor(swf-dfw): remove slope as input variable (#1686)
langevin-usgs Mar 26, 2024
0a3aa98
ci(parallel): nightly cache warming for mf6 parallel oneapi component…
wpbonelli Mar 27, 2024
23306af
feat(cdb): add critical depth boundary (CDB) package for SWF (#1689)
langevin-usgs Mar 28, 2024
75c66a9
feat(dis2d): New 2D discretization package for SWF overland flow (#1693)
langevin-usgs Apr 2, 2024
c4bdc11
fix(idm) fix fortran definition file path (#1691)
mjreno Apr 2, 2024
ac659c2
perf(PRT): allocate cell defn arrays lazily (#1690)
wpbonelli Apr 2, 2024
89c8e75
ci(parallel): factor out petsc action, save petsc cache nightly (#1697)
wpbonelli Apr 2, 2024
147cd61
feat(disv1d): simplify and replace DISL with DISV1D (#1699)
langevin-usgs Apr 2, 2024
02052a9
feat(input): add package export option for layered input parameters (…
mjreno Apr 3, 2024
b548242
ci: trim cached oneapi versions (#1700)
wpbonelli Apr 3, 2024
9721877
refactor(export_array): testing (#1702)
langevin-usgs Apr 3, 2024
7bca1de
ci: move from mamba to pixi (#1696)
Hofer-Julian Apr 3, 2024
f31f84f
ci: refactor pixi config and usages (#1703)
wpbonelli Apr 4, 2024
5ba14e9
ci(release): pixi fix in os tag step (#1705)
wpbonelli Apr 4, 2024
9d3ca95
ci(compilers): add intel 2024, trim intel versions, drop gcc 7-10 (#1…
wpbonelli Apr 5, 2024
d928fe4
ci(release): restore pre-pixi release workflows (#1708)
wpbonelli Apr 5, 2024
fcf8e39
ci(docs): install exes to build examples, fix pixi usage (#1711)
wpbonelli Apr 8, 2024
f5edfad
fix(prt): fix timing-related issues (#1709)
wpbonelli Apr 8, 2024
7d1e183
fix(ci): update pixi.lock (modified from #1713) (#1715)
mjr-deltares Apr 11, 2024
69aeca1
Update pixi.lock file (#1716)
Hofer-Julian Apr 11, 2024
7fb4b26
fix(ats-budget): fix cumulative budget for failed/retried ATS timeste…
langevin-usgs Apr 11, 2024
e3761d3
patch(swf): coordinate invariant flow calculations (#1712)
langevin-usgs Apr 11, 2024
a7fed86
ci(pixi): pin pixi to 0.19.1, setup-pixi to 0.5.2 for now (#1718)
wpbonelli Apr 11, 2024
6e283e4
fix(test): numpy resize not reliable in test_gwf_ats_lak01.py (#1722)
langevin-usgs Apr 11, 2024
b2b9c47
fix(tsp-apt): pair the user-specified concentration for finf with rej…
emorway-usgs Apr 12, 2024
4a08efc
test(distribution): use no_parallel marker for dist tests, update pix…
wpbonelli Apr 12, 2024
10e3a7f
ci: add test job for arm mac with gfortran (#1721)
wpbonelli Apr 12, 2024
edea4f1
fix(sfr): fix groundwater discharge to reach issue (#1717)
jdhughes-usgs Apr 12, 2024
b8bdf61
feat(disv2d): add DISV2D grid support for SWF overland flow (#1726)
langevin-usgs Apr 15, 2024
e645e17
test(prt): remove bad flopy usages from triangle and ternary tests (#…
wpbonelli Apr 15, 2024
6d84eda
test(framework): remove very verbose warnings on simulation failure (…
wpbonelli Apr 16, 2024
94ba5b9
chore(deps): bump prefix-dev/setup-pixi from 0.5.2 to 0.6.0 (#1736)
dependabot[bot] Apr 16, 2024
1d6e6b1
chore(pixi): use custom install task for internal dev dependencies (#…
wpbonelli Apr 17, 2024
a3e7f56
fix(grb): fix binary grid output (#1739)
langevin-usgs Apr 17, 2024
bbcb039
fix(uzf): rename uzf package variables to avoid name clashes (#1742)
langevin-usgs Apr 18, 2024
dcb65f2
fix(par): GNC is not supported in parallel (#1738)
mjr-deltares Apr 18, 2024
f7a2bd7
stress package loaders allocated duplicate iper/ionper variables (#1732)
mjreno Apr 18, 2024
30e5e9e
perf(UZF): add deprecation warning for SIMULATE_GWSEEP (#1743)
emorway-usgs Apr 18, 2024
91034f6
fix(sfr): update budget and table output for inactive reaches (#1729)
jdhughes-usgs Apr 18, 2024
0b848fd
feat(par): connect IMS preconditioner and convergence rules to PETSc …
mjr-deltares Apr 18, 2024
f3a4c0c
refactor(mf6ivar): discover dfns dynamically (#1745)
wpbonelli Apr 18, 2024
bba6446
fix(typos): fixed a variety of typos throughout project (#1748)
mwtoews Apr 19, 2024
0e228cf
ci(release): support model selection for docs/dfns/examples (#1746)
wpbonelli Apr 19, 2024
b4f7e33
fix(par): XT3D on exchange no longer hangs simulation (#1750)
mjr-deltares Apr 19, 2024
fc99eec
- accidentally left logging enabled (#1751)
mjr-deltares Apr 19, 2024
82f34c9
fix(gwf-lak): fix and test lakes set to inactive (#1678)
langevin-usgs Apr 19, 2024
9ce6787
feat(sfr): add time varying bed hydraulic conductivity option (#1747)
jdhughes-usgs Apr 20, 2024
cea54b2
ci(release): fix model selection options for dist scripts (#1752)
wpbonelli Apr 21, 2024
7758101
docs: add codespell source and docs check (#1754)
jdhughes-usgs Apr 22, 2024
eec27f7
refactor(ts): skip search for repeated boundary time series file (#1649)
ScottBoyce Apr 22, 2024
6580a75
feat(MVE): adding support for energy mover package (#1740)
emorway-usgs Apr 22, 2024
be7bca5
refactor(gwf-sfr): refactor sfr for kinematic wave option (#1755)
jdhughes-usgs Apr 23, 2024
eb609b7
refactor(codespell): modify codespell ignore words (#1759)
jdhughes-usgs Apr 23, 2024
61dc017
feat(PRT): local z option for particle release point package (#1756)
wpbonelli Apr 23, 2024
4c0c013
test(prt): limit prt autotest results plotting (#1757)
jdhughes-usgs Apr 25, 2024
0853c9f
refactor(export): include griddata block and array-based period param…
mjreno Apr 25, 2024
ba54d04
test(PRT): set iflowface in test_prt_triangle.py (#1764)
wpbonelli Apr 25, 2024
c2efa39
fix(par): improve CSV report for convergence in parallel mode (#1766)
mjr-deltares May 1, 2024
9b959fe
feat(HPC): dfn changes for HPC package (#1763)
spaulins-usgs May 1, 2024
574f1f3
fix(test_gwe_drycell_cond0): user reporting better performance with s…
emorway-usgs May 1, 2024
5d26730
Update `pixi.lock` (#1768)
github-actions[bot] May 3, 2024
4bfb27a
docs: fix broken url in developer.md (#1773)
ScottBoyce May 5, 2024
df31dcf
fix(idm): allow filein tags in mfsim.nam options block (#1770)
mjreno May 6, 2024
9c0dbef
test(modflow6-testmodels): reinstate excluded models (#1767)
wpbonelli May 6, 2024
b1399b6
feat(swf): implement proper perturbation for jacobian calculation (#1…
langevin-usgs May 6, 2024
17d62ea
fix(msvs): update mf5to6/zbud6 msvs files, include in validation scri…
wpbonelli May 7, 2024
e6202c0
fix(par): fix backtracking and residual norm calculation for certain …
mjr-deltares May 8, 2024
832d98a
fix(mf6io): synchronize mf6io with descriptions in forthcoming SuppTe…
emorway-usgs May 13, 2024
a6415f7
refactor: separate format/spell checks, parallelize, rename scripts (…
wpbonelli May 13, 2024
dca518a
feat(idm): support binary for regular, numeric list input blocks (#1783)
mjreno May 13, 2024
60e5d42
chore(deps): bump prefix-dev/setup-pixi from 0.6.0 to 0.7.0 (#1785)
dependabot[bot] May 13, 2024
e741afb
fix(scripts): create shared memory objects in main function (#1788)
wpbonelli May 14, 2024
0eb7644
refactor(prt): define istatus=9, subcell with no exit face (#1790)
wpbonelli May 14, 2024
4502cdd
refactor(prt): remove euler and test methods from ternary soln (#1789)
wpbonelli May 14, 2024
ef3fc1a
feat(geomutil): add polygon area routine (#1791)
wpbonelli May 14, 2024
b6e2b6b
fix(mf6io): apply suggested change to DSP write-up for consistency wi…
emorway-usgs May 14, 2024
d591a8e
test(idm): add exchange binary input tests (#1784)
mjreno May 14, 2024
3be7a5b
refactor(prt): move min tracking level to 1, use mem mgr for particle…
wpbonelli May 14, 2024
9fcfa7e
feat(par): add HPC configuration file for parallel (#1769)
mjr-deltares May 14, 2024
6ec2730
docs(ioguide): remove swf from ioguide for release (#1793)
langevin-usgs May 14, 2024
5388819
fix(ptc): DEV_PTC_OUTPUT support for parallel simulations (#1795)
jdhughes-usgs May 14, 2024
dccdfba
fix(par): suppress BUY message for interface models (#1794)
mjr-deltares May 14, 2024
e39aac3
chore(SolutionGroup.f90): cleanup docstrings in SolutionGroup class (…
emorway-usgs May 14, 2024
124f550
ci(docs): remove outdated script, update test step in docs.yml (#1798)
wpbonelli May 14, 2024
b0712d1
fix(prt): multiple bugfixes, enhancements, refactoring, cleanup (#1799)
wpbonelli May 15, 2024
11ce82d
refactor(prt): misc cleanup/refactoring, benchmark shared face routin…
wpbonelli May 15, 2024
f71f084
docs(mf6io): preparing docs for release (#1797)
langevin-usgs May 15, 2024
a84dfc0
style(mf6core): corrected minor spelling errors in comments (#1802)
vivekbedekar May 15, 2024
2f5a93a
refactor(prt): cleanup, refactoring, optimization in dis/disv methods…
wpbonelli May 15, 2024
cd200b6
fix(prt-prp): fix particle release point package logging (#1805)
wpbonelli May 15, 2024
521dcae
docs(DEVELOPER.md): mention ifx support, show pixi and native cmds (#…
wpbonelli May 15, 2024
bc0c78c
test(ex-prt): snapshot testing for prt/mp7 example endpoints (#1807)
wpbonelli May 16, 2024
7bb59de
refactor(methoddisv): share nbr defn, avoid reallocation (#1810)
wpbonelli May 16, 2024
281cecc
test(apt-cnd): check conduction with and without Newton option (#1809)
emorway-usgs May 16, 2024
20144ba
docs(readasarrays): minor clarification (#1808)
langevin-usgs May 16, 2024
4e6ab47
fix(gwtgwt): improved matching of GWF flows to GWT interfaces (#1812)
mjr-deltares May 16, 2024
153f057
docs(releasenotes): update release notes for 6.5.0 (#1814)
langevin-usgs May 16, 2024
931ff3a
doc(supptechinfo): Update with new GWE chapter (#1800)
emorway-usgs May 16, 2024
0fec041
refactor(prt): appease intel fpp, update options, drop obs, revise mf…
wpbonelli May 17, 2024
a754f2f
docs(supptechinfo): add new PRT chapter (#1817)
wpbonelli May 17, 2024
ed2eec3
docs(prt): describe particle track output, misc revisions (#1818)
wpbonelli May 17, 2024
2252ed1
test: remove unneeded large marker (#1820)
wpbonelli May 17, 2024
23921d4
docs(supptechinfo): minor edits to GWE chapter (chap. 10) (#1819)
emorway-usgs May 17, 2024
b50af44
refactor(prt-prp): require exit_solve_tolerance option (#1816)
wpbonelli May 17, 2024
269ca6e
test(marks): mark tests needing developmode (#1824)
wpbonelli May 17, 2024
3160dc7
ci(large.yml): fix test selection (#1825)
wpbonelli May 18, 2024
d4c9fec
fix(prt): remove track_all option in oc, fix typo in supptechinfo (#1…
wpbonelli May 18, 2024
4c6deb1
ci: use -Doptimization=1 for arm mac gfortran test and release (#1827)
wpbonelli May 20, 2024
ccdb175
ci(release): fix dylib path to hide on macos-14 (#1828)
wpbonelli May 20, 2024
b7b8d20
test: mark swf test developmode (#1829)
wpbonelli May 20, 2024
8b2745d
test: mark some parallel tests developmode (#1831)
wpbonelli May 20, 2024
5832090
ci: fix developmode parallel test conditions (#1832)
wpbonelli May 20, 2024
3898091
docs(binaryoutput.tex): include description for gwe model binary outp…
emorway-usgs May 20, 2024
2befc97
docs(MODFLOW6References.bib): correct url links (#1834)
emorway-usgs May 20, 2024
977a7ac
docs(release): updates for 6.5.0 release (#1836)
langevin-usgs May 21, 2024
3ee1283
docs(PRT): revise mf6io and supptechinfo (#1833)
wpbonelli May 21, 2024
c291c89
ci(release): don't create empty folder structure in advance (#1837)
wpbonelli May 21, 2024
6fca5e6
docs(releasenotes): more cleanup for 6.5.0 release (#1838)
langevin-usgs May 21, 2024
0c9953f
docs(prt): improve docstrings, use LENBOUNDNAME in mf6io (#1840)
wpbonelli May 22, 2024
d36faa6
test(release): fix distribution example script check (#1841)
wpbonelli May 22, 2024
a178bb1
chore(tsp): minor code cleanups (#1839)
emorway-usgs May 23, 2024
bb4a89a
docs(release): minor clarifications in release notes (#1842)
langevin-usgs May 23, 2024
def73f5
refactor(idm): verify and store error based on length of user input n…
mjreno May 23, 2024
9ff0db7
test(release): disable individual example script checks for now (#1843)
wpbonelli May 23, 2024
baf2328
ci(release): fix input parsing in release_dispatch.yml (#1844)
wpbonelli May 23, 2024
35a17dc
ci(release): update version to 6.5.0
github-actions[bot] May 23, 2024
6e04259
fix pixi.toml, fix update_version.py version substitution in pixi.toml
wpbonelli May 23, 2024
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
Prev Previous commit
Next Next commit
feat(idm): update TDIS package for IDM (#1579)
* integrate sim-tdis with idm

* rebuild makefiles

* fix comment

* rebuild makefiles

---------

Co-authored-by: mjreno <mjreno@IGSAAA071L01144.gs.doi.net>
  • Loading branch information
mjreno and mjreno authored Feb 9, 2024
commit 67f189188950b221fa19f8b6f8540748ba663502
1 change: 1 addition & 0 deletions doc/mf6io/framework/processing_of_input.tex
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@ \subsection{Supported Components}
\textbf{Component / Subcomponent} & \textbf{File Type} \\
\hline
SIM/NAM & mfsim.nam \\
SIM/TDIS & TDIS6 \\
GWF/NAM & GWF name file \\
GWT/NAM & GWT name file \\
GWF/CHD & CHD6 \\
125 changes: 63 additions & 62 deletions make/makefile
Original file line number Diff line number Diff line change
@@ -5,36 +5,36 @@ include ./makedefaults

# Define the source file directories
SOURCEDIR1=../src
SOURCEDIR2=../src/Model
SOURCEDIR3=../src/Model/TransportModel
SOURCEDIR4=../src/Model/GroundWaterFlow
SOURCEDIR5=../src/Model/Geometry
SOURCEDIR2=../src/Exchange
SOURCEDIR3=../src/Timing
SOURCEDIR4=../src/Model
SOURCEDIR5=../src/Model/Connection
SOURCEDIR6=../src/Model/ModelUtilities
SOURCEDIR7=../src/Model/GroundWaterTransport
SOURCEDIR8=../src/Model/Connection
SOURCEDIR9=../src/Distributed
SOURCEDIR10=../src/Utilities
SOURCEDIR11=../src/Utilities/Idm
SOURCEDIR12=../src/Utilities/Idm/mf6blockfile
SOURCEDIR13=../src/Utilities/Idm/selector
SOURCEDIR14=../src/Utilities/Vector
SOURCEDIR15=../src/Utilities/Matrix
SOURCEDIR16=../src/Utilities/Observation
SOURCEDIR17=../src/Utilities/ArrayRead
SOURCEDIR18=../src/Utilities/OutputControl
SOURCEDIR19=../src/Utilities/Libraries
SOURCEDIR20=../src/Utilities/Libraries/blas
SOURCEDIR21=../src/Utilities/Libraries/rcm
SOURCEDIR22=../src/Utilities/Libraries/sparsekit
SOURCEDIR23=../src/Utilities/Libraries/sparskit2
SOURCEDIR24=../src/Utilities/Libraries/daglib
SOURCEDIR25=../src/Utilities/Memory
SOURCEDIR26=../src/Utilities/TimeSeries
SOURCEDIR27=../src/Timing
SOURCEDIR28=../src/Solution
SOURCEDIR29=../src/Solution/PETSc
SOURCEDIR30=../src/Solution/LinearMethods
SOURCEDIR31=../src/Exchange
SOURCEDIR7=../src/Model/GroundWaterFlow
SOURCEDIR8=../src/Model/Geometry
SOURCEDIR9=../src/Model/TransportModel
SOURCEDIR10=../src/Model/GroundWaterTransport
SOURCEDIR11=../src/Solution
SOURCEDIR12=../src/Solution/LinearMethods
SOURCEDIR13=../src/Solution/PETSc
SOURCEDIR14=../src/Distributed
SOURCEDIR15=../src/Utilities
SOURCEDIR16=../src/Utilities/TimeSeries
SOURCEDIR17=../src/Utilities/Idm
SOURCEDIR18=../src/Utilities/Idm/selector
SOURCEDIR19=../src/Utilities/Idm/mf6blockfile
SOURCEDIR20=../src/Utilities/ArrayRead
SOURCEDIR21=../src/Utilities/Memory
SOURCEDIR22=../src/Utilities/Matrix
SOURCEDIR23=../src/Utilities/Vector
SOURCEDIR24=../src/Utilities/Observation
SOURCEDIR25=../src/Utilities/OutputControl
SOURCEDIR26=../src/Utilities/Libraries
SOURCEDIR27=../src/Utilities/Libraries/rcm
SOURCEDIR28=../src/Utilities/Libraries/sparskit2
SOURCEDIR29=../src/Utilities/Libraries/sparsekit
SOURCEDIR30=../src/Utilities/Libraries/blas
SOURCEDIR31=../src/Utilities/Libraries/daglib

VPATH = \
${SOURCEDIR1} \
@@ -88,36 +88,10 @@ $(OBJDIR)/TableTerm.o \
$(OBJDIR)/Table.o \
$(OBJDIR)/MemoryHelper.o \
$(OBJDIR)/CharString.o \
$(OBJDIR)/InputDefinition.o \
$(OBJDIR)/Memory.o \
$(OBJDIR)/List.o \
$(OBJDIR)/LongLineReader.o \
$(OBJDIR)/DevFeature.o \
$(OBJDIR)/MemoryList.o \
$(OBJDIR)/TimeSeriesRecord.o \
$(OBJDIR)/MathUtil.o \
$(OBJDIR)/BlockParser.o \
$(OBJDIR)/MemoryManager.o \
$(OBJDIR)/TimeSeries.o \
$(OBJDIR)/ats.o \
$(OBJDIR)/GeomUtil.o \
$(OBJDIR)/TimeSeriesLink.o \
$(OBJDIR)/TimeSeriesFileList.o \
$(OBJDIR)/tdis.o \
$(OBJDIR)/HashTable.o \
$(OBJDIR)/VectorBase.o \
$(OBJDIR)/Sparse.o \
$(OBJDIR)/DisvGeom.o \
$(OBJDIR)/ArrayReaders.o \
$(OBJDIR)/TimeSeriesManager.o \
$(OBJDIR)/SmoothingFunctions.o \
$(OBJDIR)/MemoryManagerExt.o \
$(OBJDIR)/MatrixBase.o \
$(OBJDIR)/ListReader.o \
$(OBJDIR)/Connections.o \
$(OBJDIR)/InputDefinition.o \
$(OBJDIR)/TimeArray.o \
$(OBJDIR)/ObsOutput.o \
$(OBJDIR)/DiscretizationBase.o \
$(OBJDIR)/simtdisidm.o \
$(OBJDIR)/simnamidm.o \
$(OBJDIR)/gwt1idm.o \
$(OBJDIR)/gwt1ic1idm.o \
@@ -144,18 +118,46 @@ $(OBJDIR)/gwf3chd8idm.o \
$(OBJDIR)/gwtgwtidm.o \
$(OBJDIR)/gwfgwtidm.o \
$(OBJDIR)/gwfgwfidm.o \
$(OBJDIR)/TimeArraySeries.o \
$(OBJDIR)/ObsOutputList.o \
$(OBJDIR)/Observe.o \
$(OBJDIR)/LongLineReader.o \
$(OBJDIR)/DevFeature.o \
$(OBJDIR)/MemoryList.o \
$(OBJDIR)/IdmSimDfnSelector.o \
$(OBJDIR)/IdmGwtDfnSelector.o \
$(OBJDIR)/IdmGwfDfnSelector.o \
$(OBJDIR)/IdmExgDfnSelector.o \
$(OBJDIR)/TimeSeriesRecord.o \
$(OBJDIR)/MathUtil.o \
$(OBJDIR)/BlockParser.o \
$(OBJDIR)/MemoryManager.o \
$(OBJDIR)/IdmDfnSelector.o \
$(OBJDIR)/TimeSeries.o \
$(OBJDIR)/SourceCommon.o \
$(OBJDIR)/MemoryManagerExt.o \
$(OBJDIR)/ats.o \
$(OBJDIR)/GeomUtil.o \
$(OBJDIR)/TimeSeriesLink.o \
$(OBJDIR)/TimeSeriesFileList.o \
$(OBJDIR)/tdis.o \
$(OBJDIR)/HashTable.o \
$(OBJDIR)/VectorBase.o \
$(OBJDIR)/Sparse.o \
$(OBJDIR)/DisvGeom.o \
$(OBJDIR)/ArrayReaders.o \
$(OBJDIR)/TimeSeriesManager.o \
$(OBJDIR)/SmoothingFunctions.o \
$(OBJDIR)/MatrixBase.o \
$(OBJDIR)/ListReader.o \
$(OBJDIR)/Connections.o \
$(OBJDIR)/TimeArray.o \
$(OBJDIR)/ObsOutput.o \
$(OBJDIR)/DiscretizationBase.o \
$(OBJDIR)/TimeArraySeries.o \
$(OBJDIR)/ObsOutputList.o \
$(OBJDIR)/Observe.o \
$(OBJDIR)/TimeArraySeriesLink.o \
$(OBJDIR)/ObsUtility.o \
$(OBJDIR)/ObsContainer.o \
$(OBJDIR)/BudgetFileReader.o \
$(OBJDIR)/IdmDfnSelector.o \
$(OBJDIR)/TimeArraySeriesManager.o \
$(OBJDIR)/PackageMover.o \
$(OBJDIR)/Obs3.o \
@@ -164,7 +166,6 @@ $(OBJDIR)/Budget.o \
$(OBJDIR)/BudgetTerm.o \
$(OBJDIR)/sort.o \
$(OBJDIR)/SfrCrossSectionUtils.o \
$(OBJDIR)/SourceCommon.o \
$(OBJDIR)/BoundaryPackage.o \
$(OBJDIR)/VirtualBase.o \
$(OBJDIR)/STLVecInt.o \
1 change: 1 addition & 0 deletions msvs/mf6core.vfproj
Original file line number Diff line number Diff line change
@@ -286,6 +286,7 @@
<File RelativePath="..\src\Solution\SolutionGroup.f90"/></Filter>
<Filter Name="Timing">
<File RelativePath="..\src\Timing\ats.f90"/>
<File RelativePath="..\src\Timing\simtdisidm.f90"/>
<File RelativePath="..\src\Timing\tdis.f90"/></Filter>
<Filter Name="Utilities">
<Filter Name="ArrayRead">
10 changes: 3 additions & 7 deletions src/SimulationCreate.f90
Original file line number Diff line number Diff line change
@@ -50,14 +50,8 @@ end subroutine simulation_cr
subroutine simulation_da()
! -- modules
use MemoryManagerModule, only: mem_deallocate
use MemoryManagerExtModule, only: memorylist_remove
use SimVariablesModule, only: idm_context
! -- local
! ------------------------------------------------------------------------------
!
! -- Deallocate input memory
call memorylist_remove('SIM', 'NAM', idm_context)
call memorylist_remove(component='SIM', context=idm_context)
!
! -- variables
deallocate (model_names)
@@ -183,11 +177,13 @@ subroutine timing_create()
! -- dummy
! -- locals
character(len=LENMEMPATH) :: input_mempath
character(len=LENMEMPATH) :: tdis_input_mempath
character(len=:), pointer :: tdis6
logical :: terminate = .true.
!
! -- set input memory path
input_mempath = create_mem_path('SIM', 'NAM', idm_context)
tdis_input_mempath = create_mem_path('SIM', 'TDIS', idm_context)
!
write (iout, '(/1x,a)') 'READING SIMULATION TIMING'
!
@@ -196,7 +192,7 @@ subroutine timing_create()
!
! -- create timing
if (tdis6 /= '') then
call tdis_cr(tdis6)
call tdis_cr(tdis6, tdis_input_mempath)
else
call store_error('TIMING block variable TDIS6 is unset'// &
' in simulation control input.', terminate)
Loading
Loading