Skip to content

Commit 2f5cf6b

Browse files
jdhughes-devwpbonelli
jdhughes-dev
and
wpbonelli
authored
refactor: update usgsprograms.txt (#236)
* refactor: update usgsprograms.txt * update meson version * mf5to6 no longer built with main meson file * updates existing meson autotest * gridgen fix - enable runtime type information for dynamic cast with ifort * formatting * -frtti * set makeclean to clean in build_apps * restore ci workflow --------- Co-authored-by: wpbonelli <[email protected]>
1 parent 384e3a3 commit 2f5cf6b

9 files changed

+58
-49
lines changed

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,6 @@ venv/
8585
**/.DS_Store
8686

8787
# environment files
88-
**.env
88+
**.env
89+
90+
.trash/

‎autotest/test_build.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,14 @@
1515
test_ostag = get_ostag()
1616
test_fc_env = os.environ.get("FC")
1717
if "win" in test_ostag:
18-
meson_exclude = ("mt3dms", "vs2dt", "triangle", "gridgen", "sutra")
18+
meson_exclude = ["mt3dms", "vs2dt", "triangle", "gridgen", "sutra"]
1919
elif "win" not in test_ostag and test_fc_env in ("ifort",):
20-
meson_exclude = ("mf2000", "mf2005", "swtv4", "mflgr", "sutra")
20+
meson_exclude = ["mf2000", "mf2005", "swtv4", "mflgr", "sutra"]
2121
else:
22-
meson_exclude = ("sutra",)
22+
meson_exclude = ["sutra"]
23+
if "win" in test_ostag and test_fc_env in ("ifort",):
24+
meson_exclude += ["mf2000", "mf2005", "swtv4", "mflgr"]
25+
2326
targets_meson = [t for t in targets if t not in meson_exclude]
2427

2528
make_exclude = ("libmf6", "gridgen", "mf2000", "swtv4", "mflgr")

‎autotest/test_mf6_existing_meson.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
def targets() -> list[Path]:
1818
target = TARGET_NAME
1919
ext, shared_ext = get_binary_suffixes()
20-
executables = [target, "zbud6", "mf5to6", "libmf6"]
21-
for idx, _ in enumerate(executables[:3]):
20+
executables = [target, "zbud6", "libmf6"]
21+
for idx, _ in enumerate(executables[:-1]):
2222
executables[idx] += ext
23-
executables[3] += shared_ext
23+
executables[-1] += shared_ext
2424
return executables
2525

2626

‎pixi.lock

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pixi.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ flaky = "*"
1313
flopy = "*"
1414
hatchling = ">=1.27.0,<2"
1515
matplotlib = "*"
16-
meson = "*"
16+
meson = ">=1.8.0"
1717
modflow-devtools = "*"
1818
networkx = "*"
1919
ninja = "*"

‎pymake/pymake_build_apps.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def build_apps(
126126
shutil.rmtree(pth)
127127

128128
# set object to clean after each build
129-
pmobj.makeclean = True
129+
pmobj.makeclean = clean
130130

131131
# reset variables based on passed args
132132
if download_dir is not None:

‎pymake/utils/_compiler_switches.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@ def _set_fflags(target, fc="gfortran", argv=True, osname=None, verbose=False):
824824
"-Wunused-label",
825825
"-Wunused-variable",
826826
"-pedantic",
827-
"-std=f2008",
827+
"-std=f2018",
828828
"-Wcharacter-truncation",
829829
]
830830

@@ -897,6 +897,10 @@ def _set_cflags(target, cc="gcc", argv=True, osname=None, verbose=False):
897897
cflags += ["-lm"]
898898
else:
899899
cflags += ["-DNO_TIMER"]
900+
elif target == "gridgen":
901+
if osname in ("linux", "darwin"):
902+
if cc.startswith("i"):
903+
cflags += ["-frtti"]
900904

901905
# add additional cflags from the command line
902906
if argv:

‎pymake/utils/usgsprograms.txt

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
target , version , current, url , dirname , srcdir , standard_switch, double_switch, shared_object
2-
mf6 , 6.6.1 , True , https://github.com/MODFLOW-USGS/modflow6/releases/download/6.6.1/mf6.6.1_linux.zip , mf6.6.1_linux , src , True , False , False
3-
zbud6 , 6.6.1 , True , https://github.com/MODFLOW-USGS/modflow6/releases/download/6.6.1/mf6.6.1_linux.zip , mf6.6.1_linux , utils/zonebudget/src, True , False , False
4-
libmf6 , 6.6.1 , True , https://github.com/MODFLOW-USGS/modflow6/releases/download/6.6.1/mf6.6.1_linux.zip , mf6.6.1_linux , srcbmi , True , False , True
5-
mp7 , 7.2.001 , True , https://water.usgs.gov/water-resources/software/MODPATH/modpath_7_2_001.zip , modpath_7_2_001 , source , True , False , False
6-
mt3dms , 5.3.0 , True , https://github.com/MODFLOW-USGS/mt3dms/releases/download/2.0/mt3dms-2.0.zip , mt3dms-2.0 , true-binary , True , False , False
7-
mt3dusgs , 1.1.0 , True , https://water.usgs.gov/water-resources/software/MT3D-USGS/mt3dusgs1.1.0.zip , mt3dusgs1.1.0 , src , True , False , False
8-
vs2dt , 3.3 , True , https://water.usgs.gov/water-resources/software/VS2DI/vs2dt3_3.zip , vs2dt3_3 , include , True , False , False
9-
triangle , 1.6 , True , https://github.com/MODFLOW-USGS/triangle/releases/download/1.0/triangle-1.0.zip , triangle-1.0 , src , True , False , False
10-
gridgen , 1.0.02 , True , https://water.usgs.gov/water-resources/software/GRIDGEN/gridgen.1.0.02.zip , gridgen.1.0.02 , src , True , False , False
11-
crt , 1.3.1 , True , https://water.usgs.gov/ogw/CRT/CRT_1.3.1.zip , CRT_1.3.1 , SOURCE , True , False , False
12-
sutra , 4.0 , True , https://water.usgs.gov/water-resources/software/sutra/4.0/SUTRA_4_0_0.zip , SutraSuite , SUTRA_4_0/source , True , False , False
13-
mf2000 , 1.19.01 , True , https://water.usgs.gov/nrp/gwsoftware/modflow2000/mf2k1_19_01.tar.gz , mf2k.1_19 , src , True , False , False
14-
mf2005 , 1.12.00 , True , https://github.com/MODFLOW-USGS/mf2005/releases/download/v.1.12.00/MF2005.1_12u.zip , MF2005.1_12u , src , True , False , False
15-
mfusg , 1.5 , True , https://water.usgs.gov/water-resources/software/MODFLOW-USG/mfusg1_5.zip , mfusg1_5 , src , True , False , False
16-
zonbudusg , 1.5 , True , https://water.usgs.gov/water-resources/software/MODFLOW-USG/mfusg1_5.zip , mfusg1_5 , src/zonebudusg , True , False , False
17-
swtv4 , 4.00.05 , True , https://water.usgs.gov/water-resources/software/SEAWAT/swt_v4_00_05.zip , swt_v4_00_05 , source , False , True , False
18-
mp6 , 6.0.1 , True , https://water.usgs.gov/water-resources/software/MODPATH/modpath.6_0_01.zip , modpath.6_0 , src , True , False , False
19-
mflgr , 2.0.0 , True , https://water.usgs.gov/ogw/modflow-lgr/modflow-lgr-v2.0.0/mflgrv2_0_00.zip , mflgr.2_0 , src , True , False , False
20-
zonbud3 , 3.01 , True , https://water.usgs.gov/water-resources/software/ZONEBUDGET/zonbud3_01.exe , Zonbud.3_01 , Src , True , False , False
21-
mfnwt1.1.4 , 1.1.4 , False , https://water.usgs.gov/water-resources/software/MODFLOW-NWT/MODFLOW-NWT_1.1.4.zip , MODFLOW-NWT_1.1.4 , src , True , False , False
22-
mfnwt , 1.3.0 , True , https://water.usgs.gov/water-resources/software/MODFLOW-NWT/MODFLOW-NWT_1.3.0.zip , MODFLOW-NWT , src , True , False , False
23-
mfusg_gsi , 2.4.0 , True , https://www.gsienv.com/wp-content/uploads/2024/07/USG-Transport_Version-2.4.0.zip , USGT-v2-4-0-Source , . , True , False , False
24-
mf6dev , 6.7.0.dev1 , False , https://github.com/MODFLOW-USGS/modflow6/archive/refs/heads/develop.zip , modflow6-develop , src , True , False , False
25-
zbud6dev , 6.7.0.dev1 , False , https://github.com/MODFLOW-USGS/modflow6/archive/refs/heads/develop.zip , modflow6-develop , utils/zonebudget/src, True , False , False
26-
libmf6dev , 6.7.0.dev1 , False , https://github.com/MODFLOW-USGS/modflow6/archive/refs/heads/develop.zip , modflow6-develop , srcbmi , True , False , True
1+
target , version , current, url , dirname , srcdir , standard_switch, double_switch, shared_object
2+
mf6 , 6.6.2 , True , https://github.com/MODFLOW-USGS/modflow6/releases/download/6.6.2/mf6.6.2_linux.zip , mf6.6.2_linux , src , True , False , False
3+
zbud6 , 6.6.2 , True , https://github.com/MODFLOW-USGS/modflow6/releases/download/6.6.2/mf6.6.2_linux.zip , mf6.6.2_linux , utils/zonebudget/src, True , False , False
4+
libmf6 , 6.6.2 , True , https://github.com/MODFLOW-USGS/modflow6/releases/download/6.6.2/mf6.6.2_linux.zip , mf6.6.2_linux , srcbmi , True , False , True
5+
mp7 , 7.2.001 , True , https://water.usgs.gov/water-resources/software/MODPATH/modpath_7_2_001.zip , modpath_7_2_001 , source , True , False , False
6+
mt3dms , 5.3.0 , True , https://github.com/MODFLOW-USGS/mt3dms/releases/download/2.0/mt3dms-2.0.zip , mt3dms-2.0 , true-binary , True , False , False
7+
mt3dusgs , 1.1.0 , True , https://water.usgs.gov/water-resources/software/MT3D-USGS/mt3dusgs1.1.0.zip , mt3dusgs1.1.0 , src , True , False , False
8+
vs2dt , 3.3 , True , https://water.usgs.gov/water-resources/software/VS2DI/vs2dt3_3.zip , vs2dt3_3 , include , True , False , False
9+
triangle , 1.6 , True , https://github.com/MODFLOW-USGS/triangle/releases/download/1.0/triangle-1.0.zip , triangle-1.0 , src , True , False , False
10+
gridgen , 1.0.02 , True , https://water.usgs.gov/water-resources/software/GRIDGEN/gridgen.1.0.02.zip , gridgen.1.0.02 , src , True , False , False
11+
crt , 1.3.1 , True , https://water.usgs.gov/ogw/CRT/CRT_1.3.1.zip , CRT_1.3.1 , SOURCE , True , False , False
12+
sutra , 4.0 , True , https://water.usgs.gov/water-resources/software/sutra/4.0/SUTRA_4_0_0.zip , SutraSuite , SUTRA_4_0/source , True , False , False
13+
mf2000 , 1.19.01 , True , https://water.usgs.gov/nrp/gwsoftware/modflow2000/mf2k1_19_01.tar.gz , mf2k.1_19 , src , True , False , False
14+
mf2005 , 1.12.00 , True , https://github.com/MODFLOW-USGS/mf2005/releases/download/v.1.12.00/MF2005.1_12u.zip , MF2005.1_12u , src , True , False , False
15+
mfusg , 1.5 , True , https://water.usgs.gov/water-resources/software/MODFLOW-USG/mfusg1_5.zip , mfusg1_5 , src , True , False , False
16+
zonbudusg , 1.5 , True , https://water.usgs.gov/water-resources/software/MODFLOW-USG/mfusg1_5.zip , mfusg1_5 , src/zonebudusg , True , False , False
17+
swtv4 , 4.00.05 , True , https://water.usgs.gov/water-resources/software/SEAWAT/swt_v4_00_05.zip , swt_v4_00_05 , source , False , True , False
18+
mp6 , 6.0.1 , True , https://water.usgs.gov/water-resources/software/MODPATH/modpath.6_0_01.zip , modpath.6_0 , src , True , False , False
19+
mflgr , 2.0.0 , True , https://water.usgs.gov/ogw/modflow-lgr/modflow-lgr-v2.0.0/mflgrv2_0_00.zip , mflgr.2_0 , src , True , False , False
20+
zonbud3 , 3.01 , True , https://water.usgs.gov/water-resources/software/ZONEBUDGET/zonbud3_01.exe , Zonbud.3_01 , Src , True , False , False
21+
mfnwt1.1.4 , 1.1.4 , False , https://water.usgs.gov/water-resources/software/MODFLOW-NWT/MODFLOW-NWT_1.1.4.zip , MODFLOW-NWT_1.1.4 , src , True , False , False
22+
mfnwt , 1.3.0 , True , https://water.usgs.gov/water-resources/software/MODFLOW-NWT/MODFLOW-NWT_1.3.0.zip , MODFLOW-NWT , src , True , False , False
23+
mfusg_gsi , 2.4.0 , True , https://www.gsienv.com/wp-content/uploads/2025/04/USG_T_Version-2.5.0-2.zip , USGT_V2-5-0_Source_Code , . , True , False , False
24+
mf6dev , 6.7.0.dev2 , False , https://github.com/MODFLOW-USGS/modflow6/archive/refs/heads/develop.zip , modflow6-develop , src , True , False , False
25+
zbud6dev , 6.7.0.dev2 , False , https://github.com/MODFLOW-USGS/modflow6/archive/refs/heads/develop.zip , modflow6-develop , utils/zonebudget/src, True , False , False
26+
libmf6dev , 6.7.0.dev2 , False , https://github.com/MODFLOW-USGS/modflow6/archive/refs/heads/develop.zip , modflow6-develop , srcbmi , True , False , True

‎pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies = [
3030
"numpy",
3131
"requests",
3232
"networkx",
33-
"meson",
33+
"meson>=1.8.0",
3434
"ninja",
3535
"pydotplus",
3636
]

0 commit comments

Comments
 (0)