Skip to content

Commit e44fa04

Browse files
wpbonelliwpbonelli
authored
chore: rename (#263)
1 parent 9a1eeb7 commit e44fa04

33 files changed

+114
-114
lines changed

‎.doc/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
# Settings for GitHub actions integration
9898
if on_rtd:
9999
extensions.append("rtds_action")
100-
rtds_action_github_repo = "MODFLOW-USGS/modflow6-examples"
100+
rtds_action_github_repo = "MODFLOW-ORG/modflow6-examples"
101101
rtds_action_path = "."
102102
rtds_action_artifact_prefix = "rtd-files-for-"
103103
rtds_action_github_token = os.environ.get("GITHUB_TOKEN", None)
@@ -212,7 +212,7 @@
212212
213213
<div class="admonition note">
214214
This page was generated from
215-
<a class="reference external" href="https://github.com/MODFLOW-USGS/modflow6-examples/blob/"""
215+
<a class="reference external" href="https://github.com/MODFLOW-ORG/modflow6-examples/blob/"""
216216
+ ref
217217
+ r"""/scripts/{{ env.docname.split('/')|last|e + '.py' }}">{{ env.docname.split('/')|last|e + '.py' }}</a>.
218218
It's also available as a <a href="{{ env.docname.split('/')|last|e + '.ipynb' }}" class="reference download internal" download>notebook</a>.

‎.doc/index.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
MODFLOW 6 Examples
22
======================================================
33

4-
This site demonstrates MODFLOW 6 by constructing, running, post-processing and visualizing example scenarios with `FloPy <https://flopy.readthedocs.io>`_. Documentation is generated with Sphinx from the `MODFLOW 6 examples repository <https://github.com/MODFLOW-USGS/modflow6-examples>`_.
4+
This site demonstrates MODFLOW 6 by constructing, running, post-processing and visualizing example scenarios with `FloPy <https://flopy.readthedocs.io>`_. Documentation is generated with Sphinx from the `MODFLOW 6 examples repository <https://github.com/MODFLOW-ORG/modflow6-examples>`_.
55

66
For each example, this site includes a detailed description containing background information, explication of the modeling scenario, and any relevant citations, as well as a notebook containing the example's Python source code.
77

‎.github/workflows/ex-rtd.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
- name: Checkout MODFLOW 6
9797
uses: actions/checkout@v4
9898
with:
99-
repository: MODFLOW-USGS/modflow6
99+
repository: MODFLOW-ORG/modflow6
100100
path: modflow6
101101
ref: ${{ needs.set_options.outputs.mf6_ref }}
102102

@@ -174,7 +174,7 @@ jobs:
174174
- build
175175
runs-on: ubuntu-latest
176176
if: |
177-
github.repository_owner == 'MODFLOW-USGS' &&
177+
github.repository_owner == 'MODFLOW-ORG' &&
178178
(
179179
github.ref_name == 'master' ||
180180
github.ref_name == 'develop'

‎.github/workflows/ex-workflow.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
- name: Checkout MODFLOW 6
6262
uses: actions/checkout@v4
6363
with:
64-
repository: MODFLOW-USGS/modflow6
64+
repository: MODFLOW-ORG/modflow6
6565
path: modflow6
6666

6767
- name: Setup Python
@@ -129,13 +129,13 @@ jobs:
129129
- name: Checkout MODFLOW 6
130130
uses: actions/checkout@v4
131131
with:
132-
repository: MODFLOW-USGS/modflow6
132+
repository: MODFLOW-ORG/modflow6
133133
path: modflow6
134134

135135
- name: Checkout usgslatex
136136
uses: actions/checkout@v4
137137
with:
138-
repository: MODFLOW-USGS/usgslatex
138+
repository: MODFLOW-ORG/usgslatex
139139
path: usgslatex
140140

141141
- name: Install LaTeX and extra fonts
@@ -238,7 +238,7 @@ jobs:
238238

239239
- name: Delete latest release
240240
if: |
241-
github.repository_owner == 'MODFLOW-USGS' &&
241+
github.repository_owner == 'MODFLOW-ORG' &&
242242
github.ref_name == 'master' &&
243243
github.event_name == 'push'
244244
env:
@@ -250,7 +250,7 @@ jobs:
250250
251251
- name: Create new release
252252
if: |
253-
github.repository_owner == 'MODFLOW-USGS' &&
253+
github.repository_owner == 'MODFLOW-ORG' &&
254254
github.ref_name == 'master' &&
255255
github.event_name == 'push'
256256
uses: ncipollo/release-action@v1
@@ -264,7 +264,7 @@ jobs:
264264

265265
- name: Upload release assets
266266
if: |
267-
github.repository_owner == 'MODFLOW-USGS' &&
267+
github.repository_owner == 'MODFLOW-ORG' &&
268268
github.ref_name == 'master' &&
269269
github.event_name == 'push'
270270
uses: svenstaro/upload-release-action@v2

‎DEVELOPER.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ See the [FloPy documentation](https://flopy.readthedocs.io/en/stable/md/get_modf
6868

6969
### Update FloPy classes
7070

71-
FloPy and MODFLOW 6 versions must be kept in sync for FloPy to properly generate and consume MF6 input/output files. To update FloPy from some branch of the [MODFLOW 6 repository](https://github.com/MODFLOW-USGS/modflow6), for instance the `develop` branch:
71+
FloPy and MODFLOW 6 versions must be kept in sync for FloPy to properly generate and consume MF6 input/output files. To update FloPy from some branch of the [MODFLOW 6 repository](https://github.com/MODFLOW-ORG/modflow6), for instance the `develop` branch:
7272

7373
```shell
7474
python -m flopy.mf6.utils.generate_classes --ref develop --no-backup
@@ -123,7 +123,7 @@ Provided a file name `fname` and data directory `data_path`, the following snipp
123123

124124
```python
125125
fpath = pooch.retrieve(
126-
url=f"https://github.com/MODFLOW-USGS/modflow6-examples/raw/develop/data/{sim_name}/{fname}",
126+
url=f"https://github.com/MODFLOW-ORG/modflow6-examples/raw/develop/data/{sim_name}/{fname}",
127127
fname=fname,
128128
path=data_path,
129129
known_hash="md5:<MD5 hash of the file>",

‎README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# MODFLOW 6 Examples
22

3-
[![CI](https://github.com/MODFLOW-USGS/modflow6-examples/actions/workflows/ex-workflow.yml/badge.svg)](https://github.com/MODFLOW-USGS/modflow6-examples/actions/workflows/ex-workflow.yml)
3+
[![CI](https://github.com/MODFLOW-ORG/modflow6-examples/actions/workflows/ex-workflow.yml/badge.svg)](https://github.com/MODFLOW-ORG/modflow6-examples/actions/workflows/ex-workflow.yml)
44
[![Documentation Status](https://readthedocs.org/projects/modflow6-examples/badge/?version=latest)](https://modflow6-examples.readthedocs.io/en/latest/?badge=latest)
55

66
This repository contains MODFLOW 6 examples.
77

88
## Release contents
99

10-
When changes reach the `master` branch, this repository's contents are [rebuilt and posted as a new release](https://github.com/MODFLOW-USGS/modflow6-examples/releases) with the following assets:
10+
When changes reach the `master` branch, this repository's contents are [rebuilt and posted as a new release](https://github.com/MODFLOW-ORG/modflow6-examples/releases) with the following assets:
1111

1212
* PDF containing a description of the example scenarios
1313
* archive containing input files for the example models
@@ -26,10 +26,10 @@ When changes reach the `master` branch, this repository's contents are [rebuilt
2626
## Resources
2727

2828
* [U.S. Geological Survey MODFLOW 6 Page](https://www.usgs.gov/software/modflow-6-usgs-modular-hydrologic-model)
29-
* [MODFLOW 6 binary executables for Windows, Mac, and Linux](https://github.com/MODFLOW-USGS/modflow6-nightly-build/releases)
30-
* [MODFLOW 6 Repository](https://github.com/MODFLOW-USGS/modflow6)
31-
* [Binary executables for MODFLOW and other related programs that may be required to run these examples](https://github.com/MODFLOW-USGS/executables)
29+
* [MODFLOW 6 binary executables for Windows, Mac, and Linux](https://github.com/MODFLOW-ORG/modflow6-nightly-build/releases)
30+
* [MODFLOW 6 Repository](https://github.com/MODFLOW-ORG/modflow6)
31+
* [Binary executables for MODFLOW and other related programs that may be required to run these examples](https://github.com/MODFLOW-ORG/executables)
3232

3333
## Issues
3434

35-
Any issues with the MODFLOW 6 examples should be posted on the main [MODFLOW 6 GitHub repo](https://github.com/MODFLOW-USGS/modflow6) and flagged with the [examples](https://github.com/MODFLOW-USGS/modflow6/labels/examples) label.
35+
Any issues with the MODFLOW 6 examples should be posted on the main [MODFLOW 6 GitHub repo](https://github.com/MODFLOW-ORG/modflow6) and flagged with the [examples](https://github.com/MODFLOW-ORG/modflow6/labels/examples) label.

‎etc/requirements.usgs.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
git+https://github.com/modflowpy/flopy.git@develop
2-
git+https://github.com/MODFLOW-USGS/modflowapi.git@develop
3-
git+https://github.com/MODFLOW-USGS/modflow-devtools.git@develop
2+
git+https://github.com/MODFLOW-ORG/modflowapi.git@develop
3+
git+https://github.com/MODFLOW-ORG/modflow-devtools.git@develop

‎scripts/ex-gwe-ates.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@
229229
# Load a file stored in the data directory for building out the DISV grid
230230
fname = "disv_nodes.fem"
231231
fpath = pooch.retrieve(
232-
url=f"https://github.com/MODFLOW-USGS/modflow6-examples/raw/develop/data/{sim_name}/{fname}",
232+
url=f"https://github.com/MODFLOW-ORG/modflow6-examples/raw/develop/data/{sim_name}/{fname}",
233233
fname=fname,
234234
path=data_path,
235235
known_hash="md5:d107d2a5e01646a861e73bb3465f0747",

‎scripts/ex-gwe-geotherm.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ def build_mf6_flow_model(sim_name, silent=True):
474474
# Instantiating MODFLOW 6 discretization package
475475
fname = "Mesh.dat"
476476
fpath = pooch.retrieve(
477-
url=f"https://github.com/MODFLOW-USGS/modflow6-examples/raw/develop/data/{sim_name}/{fname}",
477+
url=f"https://github.com/MODFLOW-ORG/modflow6-examples/raw/develop/data/{sim_name}/{fname}",
478478
fname=fname,
479479
path=data_path,
480480
known_hash="md5:f3d321b7690f9f1f7dcd730c2bfe8e23",
@@ -859,7 +859,7 @@ def plot_temperature(sim, scen, time_):
859859
# aX_pth = os.path.join('..', 'data', 'ex-gwe-geotherm')
860860
fname = "spectral_Qin=100_t=50d-X.csv"
861861
aX_pth = pooch.retrieve(
862-
url=f"https://github.com/MODFLOW-USGS/modflow6-examples/raw/develop/data/{sim_name}/{fname}",
862+
url=f"https://github.com/MODFLOW-ORG/modflow6-examples/raw/develop/data/{sim_name}/{fname}",
863863
fname=fname,
864864
path=data_path,
865865
known_hash="md5:c6f08403c9863da315393ad9bf3f0f33",
@@ -868,7 +868,7 @@ def plot_temperature(sim, scen, time_):
868868

869869
fname = "spectral_Qin=100_t=50d-Y.csv"
870870
aY_pth = pooch.retrieve(
871-
url=f"https://github.com/MODFLOW-USGS/modflow6-examples/raw/develop/data/{sim_name}/{fname}",
871+
url=f"https://github.com/MODFLOW-ORG/modflow6-examples/raw/develop/data/{sim_name}/{fname}",
872872
fname=fname,
873873
path=data_path,
874874
known_hash="md5:8901f084096a8868b4d25393162fc780",
@@ -877,7 +877,7 @@ def plot_temperature(sim, scen, time_):
877877

878878
fname = "spectral_Qin=100_t=50d-Z.csv"
879879
aZ_pth = pooch.retrieve(
880-
url=f"https://github.com/MODFLOW-USGS/modflow6-examples/raw/develop/data/{sim_name}/{fname}",
880+
url=f"https://github.com/MODFLOW-ORG/modflow6-examples/raw/develop/data/{sim_name}/{fname}",
881881
fname=fname,
882882
path=data_path,
883883
known_hash="md5:c011c72c7e8af10e6bd2fcc5fb069884",

‎scripts/ex-gwe-radial.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
# Load a file stored in the data directory for building out the DISV grid
103103
fname = "Qin100_V1e-5.csv"
104104
fpath = pooch.retrieve(
105-
url=f"https://github.com/MODFLOW-USGS/modflow6-examples/raw/develop/data/{sim_name}/{fname}",
105+
url=f"https://github.com/MODFLOW-ORG/modflow6-examples/raw/develop/data/{sim_name}/{fname}",
106106
fname=fname,
107107
path=data_path,
108108
known_hash="md5:2f45f4f50998964e49c6e0337973c6ac",

‎scripts/ex-gwf-advtidal.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ def build_models():
176176
ghb_spd = {0: ghb_spd}
177177
fname = "tides.csv"
178178
fname = pooch.retrieve(
179-
url=f"https://github.com/MODFLOW-USGS/modflow6-examples/raw/master/data/{sim_name}/{fname}",
179+
url=f"https://github.com/MODFLOW-ORG/modflow6-examples/raw/master/data/{sim_name}/{fname}",
180180
fname=fname,
181181
path=data_path,
182182
known_hash="md5:425337a0bf24fa72c9e40f4e3d9f698a",
@@ -218,7 +218,7 @@ def build_models():
218218
]
219219
fname = "wellrates.csv"
220220
fpath = pooch.retrieve(
221-
url=f"https://github.com/MODFLOW-USGS/modflow6-examples/raw/master/data/{sim_name}/{fname}",
221+
url=f"https://github.com/MODFLOW-ORG/modflow6-examples/raw/master/data/{sim_name}/{fname}",
222222
fname=fname,
223223
path=data_path,
224224
known_hash="md5:6ca7366be279d679b14e8338a195422f",
@@ -252,7 +252,7 @@ def build_models():
252252
riv_spd = list(zip(rivlay, rivrow, rivcol, rivstg, rivcnd, rivrbt, rivbnd))
253253
fname = "riverstage.csv"
254254
fpath = pooch.retrieve(
255-
url=f"https://github.com/MODFLOW-USGS/modflow6-examples/raw/master/data/{sim_name}/{fname}",
255+
url=f"https://github.com/MODFLOW-ORG/modflow6-examples/raw/master/data/{sim_name}/{fname}",
256256
fname=fname,
257257
path=data_path,
258258
known_hash="md5:83f8b526ec6e6978b1d9dbd6fde231ef",
@@ -290,7 +290,7 @@ def build_models():
290290
)
291291
fname = f"recharge{ipak + 1}.csv"
292292
fpath = pooch.retrieve(
293-
url=f"https://github.com/MODFLOW-USGS/modflow6-examples/raw/master/data/{sim_name}/{fname}",
293+
url=f"https://github.com/MODFLOW-ORG/modflow6-examples/raw/master/data/{sim_name}/{fname}",
294294
fname=fname,
295295
path=data_path,
296296
known_hash=f"md5:{hashes[ipak]}",

‎scripts/ex-gwf-bcf2ss.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
# Load the wetdry array for layer 1
5858
fname = "wetdry01.txt"
5959
fpath = pooch.retrieve(
60-
url=f"https://github.com/MODFLOW-USGS/modflow6-examples/raw/master/data/{sim_name}/{fname}",
60+
url=f"https://github.com/MODFLOW-ORG/modflow6-examples/raw/master/data/{sim_name}/{fname}",
6161
fname=fname,
6262
path=data_path,
6363
known_hash="md5:3a4b357b7d2cd5175a205f3347ab973d",

‎scripts/ex-gwf-bump.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
# Load the bottom
9090
fname = "bottom.txt"
9191
fpath = pooch.retrieve(
92-
url=f"https://github.com/MODFLOW-USGS/modflow6-examples/raw/master/data/{sim_name}/{fname}",
92+
url=f"https://github.com/MODFLOW-ORG/modflow6-examples/raw/master/data/{sim_name}/{fname}",
9393
fname=fname,
9494
path=data_path,
9595
known_hash="md5:9287f9e214147d95e6ed159732079a0b",

‎scripts/ex-gwf-capture.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -61,23 +61,23 @@
6161
# Load the bottom, hydraulic conductivity, and idomain arrays
6262
fname = "bottom.txt"
6363
fpath = pooch.retrieve(
64-
url=f"https://github.com/MODFLOW-USGS/modflow6-examples/raw/master/data/{sim_name}/{fname}",
64+
url=f"https://github.com/MODFLOW-ORG/modflow6-examples/raw/master/data/{sim_name}/{fname}",
6565
fname=fname,
6666
path=data_path,
6767
known_hash="md5:201758a5b7febb0390b8b52e634be27f",
6868
)
6969
bottom = np.loadtxt(fpath)
7070
fname = "hydraulic_conductivity.txt"
7171
fpath = pooch.retrieve(
72-
url=f"https://github.com/MODFLOW-USGS/modflow6-examples/raw/master/data/{sim_name}/{fname}",
72+
url=f"https://github.com/MODFLOW-ORG/modflow6-examples/raw/master/data/{sim_name}/{fname}",
7373
fname=fname,
7474
path=data_path,
7575
known_hash="md5:6c78564ba92e850d7d51d6e957b8a3ff",
7676
)
7777
k11 = np.loadtxt(fpath)
7878
fname = "idomain.txt"
7979
fpath = pooch.retrieve(
80-
url=f"https://github.com/MODFLOW-USGS/modflow6-examples/raw/master/data/{sim_name}/{fname}",
80+
url=f"https://github.com/MODFLOW-ORG/modflow6-examples/raw/master/data/{sim_name}/{fname}",
8181
fname=fname,
8282
path=data_path,
8383
known_hash="md5:435d4490adff7a35d1d4928661e45d81",

‎scripts/ex-gwf-csub-p01.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
# Load the aquifer load time series
8888
fname = "train_load_193704231304.csv"
8989
fpath = pooch.retrieve(
90-
url=f"https://github.com/MODFLOW-USGS/modflow6-examples/raw/master/data/{sim_name}/{fname}",
90+
url=f"https://github.com/MODFLOW-ORG/modflow6-examples/raw/master/data/{sim_name}/{fname}",
9191
fname=fname,
9292
path=data_path,
9393
known_hash="md5:32dc8e7b7e39876374af43605e264725",
@@ -311,7 +311,7 @@ def plot_results(sim, silent=True):
311311
# get the observed head
312312
fname = "s201_gw_2sec.csv"
313313
fpath = pooch.retrieve(
314-
url=f"https://github.com/MODFLOW-USGS/modflow6-examples/raw/master/data/{sim_name}/{fname}",
314+
url=f"https://github.com/MODFLOW-ORG/modflow6-examples/raw/master/data/{sim_name}/{fname}",
315315
fname=fname,
316316
path=data_path,
317317
known_hash="md5:1098bcd3f4fc1bd3b38d3d55152a8fbb",

‎scripts/ex-gwf-csub-p03.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
# Load the constant time series
5454
fname = "boundary_heads.csv"
5555
fpath = pooch.retrieve(
56-
url=f"https://github.com/MODFLOW-USGS/modflow6-examples/raw/master/data/{sim_name}/{fname}",
56+
url=f"https://github.com/MODFLOW-ORG/modflow6-examples/raw/master/data/{sim_name}/{fname}",
5757
fname=fname,
5858
path=data_path,
5959
known_hash="md5:8177e15feeeedcdd59ee15745e796e59",
@@ -721,7 +721,7 @@ def export_tables(silent=True):
721721

722722
def get_obs_dataframe(file_name, hash):
723723
fpath = pooch.retrieve(
724-
url=f"https://github.com/MODFLOW-USGS/modflow6-examples/raw/master/data/{sim_name}/{file_name}",
724+
url=f"https://github.com/MODFLOW-ORG/modflow6-examples/raw/master/data/{sim_name}/{file_name}",
725725
fname=file_name,
726726
path=data_path,
727727
known_hash=f"md5:{hash}",
@@ -1160,7 +1160,7 @@ def plot_calibration(silent=True):
11601160

11611161
fname = "boundary_heads.csv"
11621162
fpath = pooch.retrieve(
1163-
url=f"https://github.com/MODFLOW-USGS/modflow6-examples/raw/master/data/{sim_name}/{fname}",
1163+
url=f"https://github.com/MODFLOW-ORG/modflow6-examples/raw/master/data/{sim_name}/{fname}",
11641164
fname=fname,
11651165
path=data_path,
11661166
known_hash="md5:8177e15feeeedcdd59ee15745e796e59",

‎scripts/ex-gwf-csub-p04.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
# Load active domain and create idomain array
9999
fname = "idomain.txt"
100100
fpath = pooch.retrieve(
101-
url=f"https://github.com/MODFLOW-USGS/modflow6-examples/raw/master/data/{sim_name}/{fname}",
101+
url=f"https://github.com/MODFLOW-ORG/modflow6-examples/raw/master/data/{sim_name}/{fname}",
102102
fname=fname,
103103
path=data_path,
104104
known_hash="md5:2f05a27b6f71e564c0d3616e3fd00ac8",

‎scripts/ex-gwf-disvmesh.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def from_argus_export(fname):
116116
# Load argus mesh and get disv grid properties
117117
fname = "argus.exp"
118118
fpath = pooch.retrieve(
119-
url=f"https://github.com/MODFLOW-USGS/modflow6-examples/raw/master/data/{sim_name}/{fname}",
119+
url=f"https://github.com/MODFLOW-ORG/modflow6-examples/raw/master/data/{sim_name}/{fname}",
120120
fname=fname,
121121
path=data_path,
122122
known_hash="md5:072a758ca3d35831acb7e1e27e7b8524",

0 commit comments

Comments
 (0)