Merge pull request #1094 from langevin-usgs/release

update master to 6.4.0

.build_rtd_docs/conf.py

@@ -6,13 +6,14 @@
 
 # -- Path setup --------------------------------------------------------------
 
+import os
+import shutil
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import sys
-import os
-import shutil
 from subprocess import Popen, PIPE
 
 sys.path.insert(0, os.path.abspath(os.path.join("..", "doc")))
@@ -118,15 +119,10 @@
     "sphinx.ext.autosectionlabel",
     "nbsphinx",
     "nbsphinx_link",
-    "recommonmark",
+    "myst_parser",
     "sphinx_markdown_tables",
 ]
 
-source_suffix = {
-    ".rst": "restructuredtext",
-    ".md": "markdown",
-}
-
 # # Tell sphinx what the pygments highlight language should be.
 # highlight_language = 'fortran'
 

.build_rtd_docs/requirements.txt → .build_rtd_docs/requirements.rtd.txt

@@ -1,10 +1,12 @@
+numpy
+bmipy
 sphinx_markdown_tables
 nbsphinx
 nbsphinx_link
 ipython
 ipykernel
 rtds_action
-recommonmark
+myst_parser
 sphinx_rtd_theme
 
 

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,28 @@
+---
+name: Bug report
+about: Create a report to help us improve MODFLOW 6
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. macOS, Linux, Windows]
+ - Version [e.g. 22]

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for MODFLOW 6
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/help.md

@@ -0,0 +1,10 @@
+---
+name: Help
+about: Where to go for help with MODFLOW 6
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+If you need help using MODFLOW 6 do not open an issue on this GitHub repository. Instead submit your question to the [MODFLOW Google Group](https://groups.google.com/g/modflow)

.github/common/fortran-format-check.sh

@@ -0,0 +1,47 @@
+#! /bin/bash
+
+SEARCHPATHS=(src srcbmi utils/zonebudget/src)
+EXCLUDEDIRS=(src/Utilities/Libraries/blas # external library blas
+             src/Utilities/Libraries/daglib # external library dag
+             src/Utilities/Libraries/rcm # external library rcm
+             src/Utilities/Libraries/sparsekit # external library sparsekit
+             src/Utilities/Libraries/sparskit2) # external library sparsekit2
+EXCLUDEFILES=(src/Utilities/InputOutput.f90) # excluded until refactored 
+
+fformatfails=()
+checkcount=0
+
+for path in "${SEARCHPATHS[@]}"; do
+  readarray -d '' files < <(find "${path}" -type f -print0 | grep -z '\.[fF]9[05]$')
+  for file in "${files[@]}"; do
+    exclude=0
+
+    for d in "${EXCLUDEDIRS[@]}"; do
+      [[ "${d}" == $(dirname "${file}") ]] && exclude=1 && break; done
+    if [[ ${exclude} == 1 ]]; then continue; fi
+
+    for f in "${EXCLUDEFILES[@]}"; do
+      [[ "${f}" == "${file}" ]] && exclude=1 && break; done
+    if [[ ${exclude} == 1 ]]; then continue; fi
+
+    ((checkcount++))
+
+    if [[ ! -z $(fprettify -d -c ./distribution/.fprettify.yaml "${file}" 2>&1) ]]; then
+      fformatfails+=("${file}")
+    fi
+  done
+done
+
+echo -e "\nFortran source files checked: ${checkcount}"
+echo -e "Fortran source files failed: ${#fformatfails[@]}\n"
+
+if [[ ${#fformatfails[@]} > 0 ]]; then
+  for f in "${fformatfails[@]}"; do echo "${f}"; done
+
+  echo -e "\nTo verify file format diff and/or warn in local environment run:"
+  echo -e " 'fprettify -d -c <path to modflow6>/distribution/.fprettify.yaml <filepath>'\n\n"
+
+  exit 1
+fi
+
+exit 0