From f3b94df69e69b13c11b348bb1d6453a72e450c5c Mon Sep 17 00:00:00 2001 From: Joseph D Hughes Date: Tue, 28 May 2024 16:56:26 -0400 Subject: [PATCH 1/4] update(mf6): update mf6 version --- pymake/utils/usgsprograms.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pymake/utils/usgsprograms.txt b/pymake/utils/usgsprograms.txt index 900c56b..a4414d3 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.4.4 , True , https://github.com/MODFLOW-USGS/modflow6/releases/download/6.4.4/mf6.4.4_linux.zip , mf6.4.4_linux , src , True , False , False -zbud6 , 6.4.4 , True , https://github.com/MODFLOW-USGS/modflow6/releases/download/6.4.4/mf6.4.4_linux.zip , mf6.4.4_linux , utils/zonebudget/src, True , False , False -libmf6 , 6.4.4 , True , https://github.com/MODFLOW-USGS/modflow6/releases/download/6.4.4/mf6.4.4_linux.zip , mf6.4.4_linux , srcbmi , True , False , True +mf6 , 6.5.0 , True , https://github.com/MODFLOW-USGS/modflow6/releases/download/6.5.0/mf6.5.0_linux.zip , mf6.5.0_linux , src , True , False , False +zbud6 , 6.5.0 , True , https://github.com/MODFLOW-USGS/modflow6/releases/download/6.5.0/mf6.5.0_linux.zip , mf6.5.0_linux , utils/zonebudget/src, True , False , False +libmf6 , 6.5.0 , True , https://github.com/MODFLOW-USGS/modflow6/releases/download/6.5.0/mf6.5.0_linux.zip , mf6.5.0_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 @@ -22,6 +22,6 @@ mfnwt1.1.4 , 1.1.4 , False , https://water.usgs.gov/water-resources/software 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.2.2 , True , https://www.gsienv.com/wp-content/uploads/2023/11/USG-Transport_Version-2.2.2.zip , USGT-v2-2-2-Source , . , True , False , False gsflow , 2.2.1 , True , https://water.usgs.gov/water-resources/software/gsflow/gsflow_2.2.1_linux.zip , gsflow_2.2.1 , src , True , False , False -mf6dev , 6.5.0.dev0 , False , https://github.com/MODFLOW-USGS/modflow6/archive/refs/heads/develop.zip , modflow6-develop , src , True , False , False -zbud6dev , 6.5.0.dev0 , False , https://github.com/MODFLOW-USGS/modflow6/archive/refs/heads/develop.zip , modflow6-develop , utils/zonebudget/src, True , False , False -libmf6dev , 6.5.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 +mf6dev , 6.6.0.dev0 , False , https://github.com/MODFLOW-USGS/modflow6/archive/refs/heads/develop.zip , modflow6-develop , src , True , False , False +zbud6dev , 6.6.0.dev0 , False , https://github.com/MODFLOW-USGS/modflow6/archive/refs/heads/develop.zip , modflow6-develop , utils/zonebudget/src, True , False , False +libmf6dev , 6.6.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 From f7277317d3a3ab063e450aabe25220c8990d632c Mon Sep 17 00:00:00 2001 From: Joseph D Hughes Date: Tue, 28 May 2024 18:47:22 -0400 Subject: [PATCH 2/4] * update zbud6 extra files --- pymake/pymake.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pymake/pymake.py b/pymake/pymake.py index 05206aa..b715a96 100644 --- a/pymake/pymake.py +++ b/pymake/pymake.py @@ -622,6 +622,7 @@ def _set_extrafiles(self): if extrafiles is None: if self._get_base_target() in ("zbud6",): extrafiles = [ + "../../../src/Utilities/CharString.f90", "../../../src/Utilities/ArrayHandlers.f90", "../../../src/Utilities/ArrayReaders.f90", "../../../src/Utilities/BlockParser.f90", From 63fe5a9760ee45002fc30a5320a948f166ca19be Mon Sep 17 00:00:00 2001 From: Joseph D Hughes Date: Wed, 29 May 2024 11:15:22 -0400 Subject: [PATCH 3/4] * update mf6examples --- autotest/ci_setup.py | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/autotest/ci_setup.py b/autotest/ci_setup.py index e77b66d..31470b3 100644 --- a/autotest/ci_setup.py +++ b/autotest/ci_setup.py @@ -3,6 +3,7 @@ import shutil import pymake +from modflow_devtools.misc import get_model_paths temp_pth = pl.Path("temp") if not temp_pth.exists(): @@ -54,27 +55,8 @@ def examples_list(verbose=False): "sagehen", "ex-gwt-keating", ) - src_folders = [] - - for dirName, subdirList, fileList in os.walk(mf6_exdir): - useModel = True - for exclude in exclude_models: - if exclude in dirName: - useModel = False - break - if useModel: - for exclude in exclude_examples: - if exclude in dirName: - useModel = False - break - if useModel: - for file_name in fileList: - if file_name.lower() == "mfsim.nam": - if verbose: - print(f"Found directory: {dirName}") - src_folders.append(dirName) - src_folders = sorted(src_folders) + src_folders = get_model_paths(mf6_exdir) fpth = os.path.join(mf6_exdir, "mf6examples.txt") f = open(fpth, "w") for idx, folder in enumerate(src_folders): From 717f78c057adbe882499e82d0bea503bca489f7f Mon Sep 17 00:00:00 2001 From: Joseph D Hughes Date: Wed, 29 May 2024 11:24:10 -0400 Subject: [PATCH 4/4] * lint --- autotest/ci_setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/autotest/ci_setup.py b/autotest/ci_setup.py index 31470b3..268fb28 100644 --- a/autotest/ci_setup.py +++ b/autotest/ci_setup.py @@ -2,9 +2,10 @@ import pathlib as pl import shutil -import pymake from modflow_devtools.misc import get_model_paths +import pymake + temp_pth = pl.Path("temp") if not temp_pth.exists(): temp_pth.mkdir()