Skip to content

Commit 2870b26

Browse files
jdhughes-devjdhughes-dev
committed
update program links
1 parent d434b92 commit 2870b26

2 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎pymake/pymake.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ def download_setup(
360360
self.verify = verify
361361
self.timeout = timeout
362362
self.download_path = download_path
363-
self.download_dir = os.path.join(download_path, prog_dict.dirname)
363+
self.download_dir = Path(download_path) / prog_dict.dirname
364364

365365
return
366366

@@ -435,7 +435,7 @@ def _download_cleanup(self):
435435
# reset self.download
436436
self.download = None
437437

438-
if os.path.exists(self.download_dir):
438+
if self.download_dir.is_dir():
439439
ntries = 10
440440
for itries in range(ntries):
441441
# wait to delete on windows
@@ -551,7 +551,7 @@ def _set_srcdir2(self):
551551
"""
552552
if self.srcdir2 is None:
553553
if self._get_base_target() in ("libmf6",):
554-
self.srcdir2 = os.path.join(self.download_dir, "src")
554+
self.srcdir2 = self.download_dir / "src"
555555
return
556556

557557
def _set_sharedobject(self):
@@ -655,7 +655,7 @@ def _set_excludefiles(self):
655655
"""
656656
if self.excludefiles is None:
657657
if self._get_base_target() in ("libmf6",):
658-
self.excludefiles = [os.path.join(self.download_dir, "src", "mf6.f90")]
658+
self.excludefiles = [self.download_dir / "src/mf6.f90"]
659659
return
660660

661661
def build(self, target=None, srcdir=None, modify_exe_name=False):
@@ -685,7 +685,7 @@ def build(self, target=None, srcdir=None, modify_exe_name=False):
685685

686686
prog_dict = usgs_program_data.get_target(self.target)
687687
if self.srcdir is None:
688-
self.srcdir = os.path.join(self.download_dir, prog_dict.srcdir)
688+
self.srcdir = self.download_dir / prog_dict.srcdir
689689

690690
# set include_subdirs for known targets
691691
self._set_include_subdirs()

‎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.3 , True , https://github.com/MODFLOW-ORG/modflow6/releases/download/6.6.3/mf6.6.3_linux.zip , mf6.6.3_linux , src , True , False , False
3-
zbud6 , 6.6.3 , True , https://github.com/MODFLOW-ORG/modflow6/releases/download/6.6.3/mf6.6.3_linux.zip , mf6.6.3_linux , utils/zonebudget/src, True , False , False
4-
libmf6 , 6.6.3 , True , https://github.com/MODFLOW-ORG/modflow6/releases/download/6.6.3/mf6.6.3_linux.zip , mf6.6.3_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-ORG/mt3dms/releases/download/2.0/mt3dms-2.0.zip , mt3dms-2.0 , true-binary , True , False , False
7-
mt3dusgs , 1.1.0 , True , https://github.com/MODFLOW-ORG/mt3d-usgs/releases/download/1.1.0/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-ORG/triangle/releases/download/latest_build/triangle_source.zip , . , src , True , False , False
10-
gridgen , 1.0.02 , True , https://github.com/MODFLOW-ORG/gridgen/releases/download/1.0.02/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-ORG/mf2005/releases/download/v.1.12.00/MF2005.1_12u.zip , MF2005.1_12u , src , True , False , False
15-
mfusg , 1.5 , True , https://github.com/MODFLOW-ORG/mfusg/releases/download/v1.5.00/mfusg1_5.zip , mfusg1_5 , src , True , False , False
16-
zonbudusg , 1.5 , True , https://github.com/MODFLOW-ORG/mfusg/releases/download/v1.5.00/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.5.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.dev3 , False , https://github.com/MODFLOW-ORG/modflow6/archive/refs/heads/develop.zip , modflow6-develop , src , True , False , False
25-
zbud6dev , 6.7.0.dev3 , False , https://github.com/MODFLOW-ORG/modflow6/archive/refs/heads/develop.zip , modflow6-develop , utils/zonebudget/src, True , False , False
26-
libmf6dev , 6.7.0.dev3 , False , https://github.com/MODFLOW-ORG/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.3 , True , https://github.com/MODFLOW-ORG/modflow6/releases/download/6.6.3/mf6.6.3_linux.zip , mf6.6.3_linux , src , True , False , False
3+
zbud6 , 6.6.3 , True , https://github.com/MODFLOW-ORG/modflow6/releases/download/6.6.3/mf6.6.3_linux.zip , mf6.6.3_linux , utils/zonebudget/src , True , False , False
4+
libmf6 , 6.6.3 , True , https://github.com/MODFLOW-ORG/modflow6/releases/download/6.6.3/mf6.6.3_linux.zip , mf6.6.3_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-ORG/mt3dms/releases/download/2.0/mt3dms-2.0.zip , mt3dms-2.0 , true-binary , True , False , False
7+
mt3dusgs , 1.1.0 , True , https://github.com/MODFLOW-ORG/mt3d-usgs/releases/download/1.1.0/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-ORG/triangle/releases/download/v1.6/triangle_source.zip , . , src , True , False , False
10+
gridgen , 1.0.02 , True , https://github.com/MODFLOW-ORG/gridgen/releases/download/v1.0.02/gridgen_source.zip , . , 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-ORG/mf2005/releases/download/v.1.12.00/MF2005.1_12u.zip , MF2005.1_12u , src , True , False , False
15+
mfusg , 1.5 , True , https://github.com/MODFLOW-ORG/mfusg/releases/download/v1.5.00/mfusg1_5.zip , mfusg1_5 , src , True , False , False
16+
zonbudusg , 1.01 , True , https://github.com/MODFLOW-ORG/zonbudusg/releases/download/v1.01/zonbudusg_source.zip , . , src , 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+
zonbud , 3.01 , True , https://github.com/MODFLOW-ORG/zonbud/releases/download/v3.01/zonbud_source.zip , . , 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+
mfusgt , 2.6.0 , True , https://github.com/MODFLOW-ORG/mfusgt/releases/download/v2.6.0/mfusgt_source.zip , . , src , True , False , False
24+
mf6dev , 6.7.0.dev3 , False , https://github.com/MODFLOW-ORG/modflow6/archive/refs/heads/develop.zip , modflow6-develop , src , True , False , False
25+
zbud6dev , 6.7.0.dev3 , False , https://github.com/MODFLOW-ORG/modflow6/archive/refs/heads/develop.zip , modflow6-develop , utils/zonebudget/src , True , False , False
26+
libmf6dev , 6.7.0.dev3 , False , https://github.com/MODFLOW-ORG/modflow6/archive/refs/heads/develop.zip , modflow6-develop , srcbmi , True , False , True

0 commit comments

Comments
 (0)