Skip to content

Commit

Permalink
update(mf6): update mf6 version (#174)
Browse files Browse the repository at this point in the history 
* update zbud6 extra files
* update mf6examples
* merging with failures
  • Loading branch information
@jdhughes-usgs
jdhughes-usgs authored Jun 9, 2024
1 parent 200cf7d commit 4460311
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 26 deletions.
23 changes: 3 additions & 20 deletions autotest/ci_setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
import pathlib as pl
import shutil

from modflow_devtools.misc import get_model_paths

import pymake

temp_pth = pl.Path("temp")
Expand Down Expand Up @@ -54,27 +56,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):
Expand Down
1 change: 1 addition & 0 deletions pymake/pymake.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
12 changes: 6 additions & 6 deletions pymake/utils/usgsprograms.txt
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
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

0 comments on commit 4460311

Please sign in to comment.