Skip to content

refactor: update usgsprograms.txt #236

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 9 commits into from
May 23, 2025
Merged

refactor: update usgsprograms.txt #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c3ff566
refactor: update usgsprograms.txt
jdhughes-dev May 21, 2025
01d73e4
update meson version
jdhughes-dev May 21, 2025
00af044
mf5to6 no longer built with main meson file
jdhughes-dev May 21, 2025
2b6a419
updates existing meson autotest
jdhughes-dev May 21, 2025
27f52ae
gridgen fix - enable runtime type information for dynamic cast with i…
jdhughes-dev May 21, 2025
437be7b
formatting
jdhughes-dev May 21, 2025
591a0b0
-frtti
wpbonelli May 23, 2025
126de8f
set makeclean to clean in build_apps
wpbonelli May 23, 2025
f1f2946
restore ci workflow
wpbonelli May 23, 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
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,6 @@ venv/
**/.DS_Store

# environment files
**.env
**.env

.trash/
9 changes: 6 additions & 3 deletions autotest/test_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,14 @@
test_ostag = get_ostag()
test_fc_env = os.environ.get("FC")
if "win" in test_ostag:
meson_exclude = ("mt3dms", "vs2dt", "triangle", "gridgen", "sutra")
meson_exclude = ["mt3dms", "vs2dt", "triangle", "gridgen", "sutra"]
elif "win" not in test_ostag and test_fc_env in ("ifort",):
meson_exclude = ("mf2000", "mf2005", "swtv4", "mflgr", "sutra")
meson_exclude = ["mf2000", "mf2005", "swtv4", "mflgr", "sutra"]
else:
meson_exclude = ("sutra",)
meson_exclude = ["sutra"]
if "win" in test_ostag and test_fc_env in ("ifort",):
meson_exclude += ["mf2000", "mf2005", "swtv4", "mflgr"]

targets_meson = [t for t in targets if t not in meson_exclude]

make_exclude = ("libmf6", "gridgen", "mf2000", "swtv4", "mflgr")
Expand Down
6 changes: 3 additions & 3 deletions autotest/test_mf6_existing_meson.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
def targets() -> list[Path]:
target = TARGET_NAME
ext, shared_ext = get_binary_suffixes()
executables = [target, "zbud6", "mf5to6", "libmf6"]
for idx, _ in enumerate(executables[:3]):
executables = [target, "zbud6", "libmf6"]
for idx, _ in enumerate(executables[:-1]):
executables[idx] += ext
executables[3] += shared_ext
executables[-1] += shared_ext
return executables


Expand Down
24 changes: 12 additions & 12 deletions pixi.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pixi.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ flaky = "*"
flopy = "*"
hatchling = ">=1.27.0,<2"
matplotlib = "*"
meson = "*"
meson = ">=1.8.0"
modflow-devtools = "*"
networkx = "*"
ninja = "*"
Expand Down
2 changes: 1 addition & 1 deletion pymake/pymake_build_apps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ def build_apps(
shutil.rmtree(pth)

# set object to clean after each build
pmobj.makeclean = True
pmobj.makeclean = clean

# reset variables based on passed args
if download_dir is not None:
Expand Down
6 changes: 5 additions & 1 deletion pymake/utils/_compiler_switches.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@ def _set_fflags(target, fc="gfortran", argv=True, osname=None, verbose=False):
"-Wunused-label",
"-Wunused-variable",
"-pedantic",
"-std=f2008",
"-std=f2018",
"-Wcharacter-truncation",
]

Expand Down Expand Up @@ -897,6 +897,10 @@ def _set_cflags(target, cc="gcc", argv=True, osname=None, verbose=False):
cflags += ["-lm"]
else:
cflags += ["-DNO_TIMER"]
elif target == "gridgen":
if osname in ("linux", "darwin"):
if cc.startswith("i"):
cflags += ["-frtti"]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this leaves the compile command like -fno-rtti ... -frtti but it works. need to figure out why -fno-rtti is getting in in the first place.


# add additional cflags from the command line
if argv:
Expand Down
52 changes: 26 additions & 26 deletions pymake/utils/usgsprograms.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
target , version , current, url , dirname , srcdir , standard_switch, double_switch, shared_object
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
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
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
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
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
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
vs2dt , 3.3 , True , https://water.usgs.gov/water-resources/software/VS2DI/vs2dt3_3.zip , vs2dt3_3 , include , True , False , False
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
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
crt , 1.3.1 , True , https://water.usgs.gov/ogw/CRT/CRT_1.3.1.zip , CRT_1.3.1 , SOURCE , True , False , False
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
mf2000 , 1.19.01 , True , https://water.usgs.gov/nrp/gwsoftware/modflow2000/mf2k1_19_01.tar.gz , mf2k.1_19 , src , True , False , False
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
mfusg , 1.5 , True , https://water.usgs.gov/water-resources/software/MODFLOW-USG/mfusg1_5.zip , mfusg1_5 , src , True , False , False
zonbudusg , 1.5 , True , https://water.usgs.gov/water-resources/software/MODFLOW-USG/mfusg1_5.zip , mfusg1_5 , src/zonebudusg , True , False , False
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
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
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
zonbud3 , 3.01 , True , https://water.usgs.gov/water-resources/software/ZONEBUDGET/zonbud3_01.exe , Zonbud.3_01 , Src , True , False , False
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
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
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
mf6dev , 6.7.0.dev1 , False , https://github.com/MODFLOW-USGS/modflow6/archive/refs/heads/develop.zip , modflow6-develop , src , True , False , False
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
libmf6dev , 6.7.0.dev1 , False , https://github.com/MODFLOW-USGS/modflow6/archive/refs/heads/develop.zip , modflow6-develop , srcbmi , True , False , True
target , version , current, url , dirname , srcdir , standard_switch, double_switch, shared_object
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
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
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
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
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
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
vs2dt , 3.3 , True , https://water.usgs.gov/water-resources/software/VS2DI/vs2dt3_3.zip , vs2dt3_3 , include , True , False , False
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
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
crt , 1.3.1 , True , https://water.usgs.gov/ogw/CRT/CRT_1.3.1.zip , CRT_1.3.1 , SOURCE , True , False , False
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
mf2000 , 1.19.01 , True , https://water.usgs.gov/nrp/gwsoftware/modflow2000/mf2k1_19_01.tar.gz , mf2k.1_19 , src , True , False , False
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
mfusg , 1.5 , True , https://water.usgs.gov/water-resources/software/MODFLOW-USG/mfusg1_5.zip , mfusg1_5 , src , True , False , False
zonbudusg , 1.5 , True , https://water.usgs.gov/water-resources/software/MODFLOW-USG/mfusg1_5.zip , mfusg1_5 , src/zonebudusg , True , False , False
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
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
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
zonbud3 , 3.01 , True , https://water.usgs.gov/water-resources/software/ZONEBUDGET/zonbud3_01.exe , Zonbud.3_01 , Src , True , False , False
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
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
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
mf6dev , 6.7.0.dev2 , False , https://github.com/MODFLOW-USGS/modflow6/archive/refs/heads/develop.zip , modflow6-develop , src , True , False , False
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
libmf6dev , 6.7.0.dev2 , False , https://github.com/MODFLOW-USGS/modflow6/archive/refs/heads/develop.zip , modflow6-develop , srcbmi , True , False , True
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies = [
"numpy",
"requests",
"networkx",
"meson",
"meson>=1.8.0",
"ninja",
"pydotplus",
]
Expand Down
Loading