From b3bd9e90d2f5a155850088ab6d7837bd8f2ed048 Mon Sep 17 00:00:00 2001 From: Joseph D Hughes Date: Wed, 12 Feb 2025 15:24:39 -0600 Subject: [PATCH 1/2] update mf6 version --- pixi.toml | 2 +- pymake/utils/usgsprograms.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pixi.toml b/pixi.toml index 9e80961..4f6e5bc 100644 --- a/pixi.toml +++ b/pixi.toml @@ -13,7 +13,7 @@ flaky = "*" flopy = "*" hatchling = ">=1.27.0,<2" matplotlib = "*" -meson = "1.3.0" +meson = "*" modflow-devtools = "*" networkx = "*" ninja = "*" diff --git a/pymake/utils/usgsprograms.txt b/pymake/utils/usgsprograms.txt index 7e0cb3a..7189859 100644 --- a/pymake/utils/usgsprograms.txt +++ b/pymake/utils/usgsprograms.txt @@ -1,7 +1,7 @@ target , version, current, url , dirname , srcdir , standard_switch, double_switch, shared_object -mf6 , 6.6.0 , True , https://github.com/MODFLOW-USGS/modflow6/releases/download/6.6.0/mf6.6.0_linux.zip , mf6.6.0_linux , src , True , False , False -zbud6 , 6.6.0 , True , https://github.com/MODFLOW-USGS/modflow6/releases/download/6.6.0/mf6.6.0_linux.zip , mf6.6.0_linux , utils/zonebudget/src, True , False , False -libmf6 , 6.6.0 , True , https://github.com/MODFLOW-USGS/modflow6/releases/download/6.6.0/mf6.6.0_linux.zip , mf6.6.0_linux , srcbmi , True , False , True +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 From 730efbcf2285edbee2ed97c66446de3266055838 Mon Sep 17 00:00:00 2001 From: Joseph D Hughes Date: Wed, 12 Feb 2025 17:11:36 -0600 Subject: [PATCH 2/2] update extrafiles for zbud6 --- pymake/pymake.py | 2 ++ pymake/utils/usgsprograms.txt | 52 +++++++++++++++++------------------ 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/pymake/pymake.py b/pymake/pymake.py index 71e9d0e..ffa3874 100644 --- a/pymake/pymake.py +++ b/pymake/pymake.py @@ -620,6 +620,8 @@ def _set_extrafiles(self): "../../../src/Utilities/version.f90", "../../../src/Utilities/DevFeature.f90", "../../../src/Utilities/Message.f90", + "../../../src/Utilities/GridFileReader.f90", + "../../../src/Utilities/HashTable.f90", ] # evaluate extrafiles type diff --git a/pymake/utils/usgsprograms.txt b/pymake/utils/usgsprograms.txt index 7189859..44d6766 100644 --- a/pymake/utils/usgsprograms.txt +++ b/pymake/utils/usgsprograms.txt @@ -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.dev0 , False , https://github.com/MODFLOW-USGS/modflow6/archive/refs/heads/develop.zip , modflow6-develop , src , True , False , False -zbud6dev , 6.7.0.dev0 , False , https://github.com/MODFLOW-USGS/modflow6/archive/refs/heads/develop.zip , modflow6-develop , utils/zonebudget/src, True , False , False -libmf6dev , 6.7.0.dev0 , False , https://github.com/MODFLOW-USGS/modflow6/archive/refs/heads/develop.zip , modflow6-develop , srcbmi , True , False , True \ No newline at end of file +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 \ No newline at end of file