Skip to content

Commit

Permalink
Update URL
Browse files Browse the repository at this point in the history
  • Loading branch information
WeiqunZhang committed Nov 3, 2023
1 parent 58de1d9 commit fffde7d
Show file tree
Hide file tree
Showing 15 changed files with 32 additions and 36 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/cuda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ concurrency:

jobs:
cuda_eb_3d:
if: ${{ github.repository == 'AMReX-Codes/incflo' || github.event_name != 'schedule' }}
if: ${{ github.repository == 'AMReX-Fluids/incflo' || github.event_name != 'schedule' }}
name: CUDA EB 3D
runs-on: ubuntu-20.04
env: {CXXFLAGS: "-Werror -Wall -Wextra -Wpedantic -Wnull-dereference -Wfloat-conversion -Wshadow -Woverloaded-virtual -Wnon-virtual-dtor -Wlogical-op -Wmisleading-indentation -Wduplicated-cond -Wduplicated-branches -Wmissing-include-dirs"}
Expand All @@ -25,7 +25,7 @@ jobs:
- name: Checkout AMReX-Hydro
uses: actions/checkout@v3
with:
repository: AMReX-Codes/AMReX-Hydro
repository: AMReX-Fluids/AMReX-Hydro
path: AMReX-Hydro
- name: Checkout AMReX
uses: actions/checkout@v3
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
du -hs ~/.cache/ccache
cuda_no_eb_2d:
if: ${{ github.repository == 'AMReX-Codes/incflo' || github.event_name != 'schedule' }}
if: ${{ github.repository == 'AMReX-Fluids/incflo' || github.event_name != 'schedule' }}
name: CUDA NO EB 2D
runs-on: ubuntu-20.04
env: {CXXFLAGS: "-Werror -Wall -Wextra -Wpedantic -Wnull-dereference -Wfloat-conversion -Wshadow -Woverloaded-virtual -Wnon-virtual-dtor -Wlogical-op -Wmisleading-indentation -Wduplicated-cond -Wduplicated-branches -Wmissing-include-dirs"}
Expand All @@ -91,7 +91,7 @@ jobs:
- name: Checkout AMReX-Hydro
uses: actions/checkout@v3
with:
repository: AMReX-Codes/AMReX-Hydro
repository: AMReX-Fluids/AMReX-Hydro
path: AMReX-Hydro
- name: Checkout AMReX
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
make html
- name: Deploy
if: github.event_name == 'push' && github.repository == 'AMReX-Codes/incflo' && github.ref == 'refs/heads/development'
if: github.event_name == 'push' && github.repository == 'AMReX-Fluids/incflo' && github.ref == 'refs/heads/development'
uses: JamesIves/[email protected]
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/gcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ concurrency:

jobs:
gcc_eb_3d_super:
if: ${{ github.repository == 'AMReX-Codes/incflo' || github.event_name != 'schedule' }}
if: ${{ github.repository == 'AMReX-Fluids/incflo' || github.event_name != 'schedule' }}
name: GCC EB 3D
runs-on: ubuntu-latest
env: {CXXFLAGS: "-Werror -Wall -Wextra -Wpedantic -Wnull-dereference -Wfloat-conversion -Wshadow -Woverloaded-virtual -Wnon-virtual-dtor -Wlogical-op -Wmisleading-indentation -Wduplicated-cond -Wduplicated-branches -Wmissing-include-dirs"}
Expand All @@ -25,7 +25,7 @@ jobs:
- name: Checkout AMReX-Hydro
uses: actions/checkout@v3
with:
repository: AMReX-Codes/AMReX-Hydro
repository: AMReX-Fluids/AMReX-Hydro
path: AMReX-Hydro
- name: Checkout AMReX
uses: actions/checkout@v3
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
mpiexec -n 2 build/incflo.ex test_3d/benchmark.uniform_velocity_sphere incflo.verbose=1 mac_proj.verbose=1 nodal_proj.verbose=1
gcc_no_eb_3d_lib:
if: ${{ github.repository == 'AMReX-Codes/incflo' || github.event_name != 'schedule' }}
if: ${{ github.repository == 'AMReX-Fluids/incflo' || github.event_name != 'schedule' }}
name: GCC NO EB 3D
runs-on: ubuntu-latest
env: {CXXFLAGS: "-Werror -Wall -Wextra -Wpedantic -Wnull-dereference -Wfloat-conversion -Wshadow -Woverloaded-virtual -Wnon-virtual-dtor -Wlogical-op -Wmisleading-indentation -Wduplicated-cond -Wduplicated-branches -Wmissing-include-dirs"}
Expand All @@ -95,7 +95,7 @@ jobs:
- name: Checkout AMReX-Hydro
uses: actions/checkout@v3
with:
repository: AMReX-Codes/AMReX-Hydro
repository: AMReX-Fluids/AMReX-Hydro
path: AMReX-Hydro
- name: Checkout AMReX
uses: actions/checkout@v3
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:
mpiexec -n 2 build/incflo.ex test_no_eb_3d/benchmark.rayleigh_taylor max_step=3 incflo.verbose=1 mac_proj.verbose=1 nodal_proj.verbose=1
gcc_eb_2d_lib:
if: ${{ github.repository == 'AMReX-Codes/incflo' || github.event_name != 'schedule' }}
if: ${{ github.repository == 'AMReX-Fluids/incflo' || github.event_name != 'schedule' }}
name: GCC EB 2D
runs-on: ubuntu-latest
env: {CXXFLAGS: "-Werror -Wall -Wextra -Wpedantic -Wnull-dereference -Wfloat-conversion -Wshadow -Woverloaded-virtual -Wnon-virtual-dtor -Wlogical-op -Wmisleading-indentation -Wduplicated-cond -Wduplicated-branches -Wmissing-include-dirs"}
Expand All @@ -180,7 +180,7 @@ jobs:
- name: Checkout AMReX-Hydro
uses: actions/checkout@v3
with:
repository: AMReX-Codes/AMReX-Hydro
repository: AMReX-Fluids/AMReX-Hydro
path: AMReX-Hydro
- name: Checkout AMReX
uses: actions/checkout@v3
Expand Down Expand Up @@ -253,7 +253,7 @@ jobs:
build/incflo.ex test_2d/benchmark.eb_flow_sphere incflo.verbose=1 mac_proj.verbose=1 nodal_proj.verbose=1
gcc_no_eb_2d_super:
if: ${{ github.repository == 'AMReX-Codes/incflo' || github.event_name != 'schedule' }}
if: ${{ github.repository == 'AMReX-Fluids/incflo' || github.event_name != 'schedule' }}
name: GCC NO EB 2D
runs-on: ubuntu-latest
env: {CXXFLAGS: "-Werror -Wall -Wextra -Wpedantic -Wnull-dereference -Wfloat-conversion -Wshadow -Woverloaded-virtual -Wnon-virtual-dtor -Wlogical-op -Wmisleading-indentation -Wduplicated-cond -Wduplicated-branches -Wmissing-include-dirs"}
Expand All @@ -265,7 +265,7 @@ jobs:
- name: Checkout AMReX-Hydro
uses: actions/checkout@v3
with:
repository: AMReX-Codes/AMReX-Hydro
repository: AMReX-Fluids/AMReX-Hydro
path: AMReX-Hydro
- name: Checkout AMReX
uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/hip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ concurrency:

jobs:
hip_no_eb_3d:
if: ${{ github.repository == 'AMReX-Codes/incflo' || github.event_name != 'schedule' }}
if: ${{ github.repository == 'AMReX-Fluids/incflo' || github.event_name != 'schedule' }}
name: HIP NO EB 3D
runs-on: ubuntu-20.04
env: {CXXFLAGS: "-Werror -Wall -Wextra -Wpedantic -Wnull-dereference -Wfloat-conversion -Wshadow -Woverloaded-virtual -Wextra-semi -Wunreachable-code -Wnon-virtual-dtor -Wno-deprecated-declarations -Wno-gnu-zero-variadic-macro-arguments"}
Expand All @@ -25,7 +25,7 @@ jobs:
- name: Checkout AMReX-Hydro
uses: actions/checkout@v3
with:
repository: AMReX-Codes/AMReX-Hydro
repository: AMReX-Fluids/AMReX-Hydro
path: AMReX-Hydro
- name: Checkout AMReX
uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sycl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ concurrency:

jobs:
sycl_eb_2d:
if: ${{ github.repository == 'AMReX-Codes/incflo' || github.event_name != 'schedule' }}
if: ${{ github.repository == 'AMReX-Fluids/incflo' || github.event_name != 'schedule' }}
name: SYCL EB 2D
runs-on: ubuntu-latest
env: {CXXFLAGS: "-Werror -Wall -Wextra -Wpedantic -Wnull-dereference -Wfloat-conversion -Wshadow -Woverloaded-virtual -Wextra-semi -Wunreachable-code -Wnon-virtual-dtor -Wno-sign-compare -Wno-missing-braces"}
Expand All @@ -25,7 +25,7 @@ jobs:
- name: Checkout AMReX-Hydro
uses: actions/checkout@v3
with:
repository: AMReX-Codes/AMReX-Hydro
repository: AMReX-Fluids/AMReX-Hydro
path: AMReX-Hydro
- name: Checkout AMReX
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20.0)

project( incflo
#VERSION 1.0
HOMEPAGE_URL "https://amrex-codes.github.io/incflo/"
HOMEPAGE_URL "https://amrex-fluids.github.io/incflo/"
DESCRIPTION "An adaptive mesh, variable-density incompressible Navier-Stokes solver with no subcycling in time"
LANGUAGES C CXX)

Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ your fork.
`development` on the main incflo repository.

First, let us setup your local git repo. To make your own fork of the main
repository, press the fork button on the [incflo Github page](https://github.com/AMReX-Codes/incflo).
repository, press the fork button on the [incflo Github page](https://github.com/AMReX-Fluids/incflo).

Then, clone incflo on your local computer. If you plan on doing a lot of incflo development,
we recommend configuring your clone to use ssh access so you won't have to enter your Github
password every time, which you can do using these commands:

```
git clone [email protected]:AMReX-Codes/incflo.git
git clone [email protected]:AMReX-Fluids/incflo.git
cd incflo
# Add your own fork.
Expand All @@ -78,7 +78,7 @@ machine, see
If you instead prefer to use HTTPS authentication, configure your local clone as follows:

```
git clone https://github.com/AMReX-Codes/incflo.git
git clone https://github.com/AMReX-Fluids/incflo.git
cd incflo
# Add your own fork.
Expand Down
2 changes: 1 addition & 1 deletion Docs/README.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Online documentation is available at https://amrex-codes.github.io/incflo/docs_html/.
Online documentation is available at https://amrex-fluids.github.io/incflo/docs_html/.
2 changes: 1 addition & 1 deletion Docs/sphinx_documentation/source/Debugging.rst
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,4 @@ files for different processes. For example,
Also see AMReX's documentation on :ref:`amrex:sec:basics:debugging` for further suggestions.

If you believe you've encountered a bug or incorrect behavior in incflo, please report the issue
on incflo's github page `here <https://github.com/AMReX-Codes/incflo/issues>`_ .
on incflo's github page `here <https://github.com/AMReX-Fluids/incflo/issues>`_ .
6 changes: 2 additions & 4 deletions Docs/sphinx_documentation/source/GettingStarted.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ First, make sure that git is installed on your machine.

.. code:: shell
git clone https://github.com/AMReX-Codes/AMReX-Hydro.git
git clone https://github.com/AMReX-Fluids/AMReX-Hydro.git
This will create a folder called ``AMReX-Hydro/`` on your machine.

#. Download the incflo repository by typing:

.. code:: shell
git clone https://github.com/AMReX-Codes/incflo.git
git clone https://github.com/AMReX-Fluids/incflo.git
This will create a folder called ``incflo/`` on your machine.

Expand Down Expand Up @@ -371,5 +371,3 @@ Visualizing the Results
=======================

Options for visualizing the data are discussed in the AMReX Documenation on :ref:`amrex:Chap:Visualization`.


3 changes: 1 addition & 2 deletions Docs/sphinx_documentation/source/Introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ Key software and algorithmic features of incflo include:

- Plotfile format supported by AmrVis, VisIt, ParaView, and yt.

The incflo source code can be found at https://github.com/AMReX-Codes/incflo/.
The incflo source code can be found at https://github.com/AMReX-Fluids/incflo/.
incflo heavily leverages AMReX (see https://amrex-codes.github.io/) which is supported by
ECP as part of the AMReX Co-Design Center.

4 changes: 2 additions & 2 deletions Docs/sphinx_documentation/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ def get_incflo_version():

intersphinx_mapping = {
'amrex': ('https://amrex-codes.github.io/amrex/docs_html/', None),
'hydro': ('https://amrex-codes.github.io/amrex-hydro/docs_html/', None),
'iamr': ('https://amrex-codes.github.io/IAMR/', None)
'hydro': ('https://amrex-fluids.github.io/amrex-hydro/docs_html/', None),
'iamr': ('https://amrex-fluids.github.io/IAMR/', None)
# 'incflo_tutorials': ('https://incflo-codes.github.io/incflo/tutorials_html/', None)
}

Expand Down
3 changes: 1 addition & 2 deletions Docs/sphinx_documentation/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ the variable density incompressible Navier-Stokes equations in the presence
of complex geometries. It includes adaptive mesh refinement (AMR)
but without subcycling in time.

For an AMReX-based incompressible flow code with subcycling in time, please see `IAMR <https://amrex-codes.github.io/IAMR/>`_
For an AMReX-based incompressible flow code with subcycling in time, please see `IAMR <https://amrex-fluids.github.io/IAMR/>`_

Active development in incflo is ongoing in the development branch.

Expand All @@ -23,4 +23,3 @@ Active development in incflo is ongoing in the development branch.
Fluids_Chapter
EB
Debugging

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ Clone AMReX from the official Git repository

Clone AMReX-Hydro from the official Git repository
```shell
> git clone [email protected]:AMReX-Codes/AMReX-Hydro.git
> git clone [email protected]:AMReX-Fluids/AMReX-Hydro.git
```

## Build and run an example incflo problem
Clone and build incflo
```shell
> git clone [email protected]:AMReX-Codes/incflo.git
> git clone [email protected]:AMReX-Fluids/incflo.git
> cd incflo/test_3d
> make -j4
> mpirun -np 4 incflo3d.gnu.MPI.ex benchmark.channel_cylinder-x
Expand Down
2 changes: 1 addition & 1 deletion test_3d/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ you. We assume REGTEST_SCRATCH is defined to point to this location.
```
git clone https://github.com/AMReX-Codes/amrex.git ${REGTEST_SCRATCH}/amrex
git clone https://github.com/AMReX-Codes/regression_testing.git ${REGTEST_SCRATCH}/regression_testing
git clone https://github.com/AMReX-Codes/incflo.git ${REGTEST_SCRATCH}/incflo
git clone https://github.com/AMReX-Fluids/incflo.git ${REGTEST_SCRATCH}/incflo
```
3. Move to the location where the tests will be built/run, create
Expand Down

0 comments on commit fffde7d

Please sign in to comment.